Browse Source

apel:
- add patch0 for (original) git master
- add patch1 to update to ikazuhiro's branch (2014-03-15)
https://github.com/ikazuhiro/apel/commits/master
- add patch2 from debian package
(Prevent an error of fontset-pixel-size for Emacs 23.)
- add patch3 from debian package
(use new style backquotes to use on emacs-24.3.90)

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@8426 ec354946-7b23-47d6-9f5a-488ba84defc7

daisuke 10 years ago
parent
commit
2d88377ec6
1 changed files with 24 additions and 8 deletions
  1. 24 8
      a/apel/apel-vl.spec

+ 24 - 8
a/apel/apel-vl.spec

@@ -1,23 +1,27 @@
 %define _noVersionedDependencies        1
 
 %define       origver       10.8
-%define       origname      apel	
+%define       origname      apel
 
 Summary:      A Portable Emacs Library
 Summary(ja):  Emacs 用の 基礎的な関数を提供するライブラリ
 Name:         %{origname}
 Version:      %{origver}
-Release:      2%{?_dist_release}
+Release:      3%{?_dist_release}
 
 Source0:      http://kanji.zinbun.kyoto-u.ac.jp/~tomo/lemi/dist/apel/apel-%{origver}.tar.gz
 Source1:      apel-install.sh
 Source2:      apel-remove.sh
 Source3:      apel-init.el
 
-Patch10:      apel-10.3-APEL-ELS.diff
+Patch0:	      apel-10.8-20120427.patch
+Patch1:       apel-10.8-ikazuhiro-branch.patch
+Patch2:       apel-10.8-prevent-fontset-error.patch
+Patch3:       apel-10.8-use-new-style-backquotes.patch
 
 License:      1993-1999 Free Software Foundation, Inc., Dan Rich, Morioka Tomohiko, Kobayashi Shuhei
 Group:        Applications/Editors/Emacs
+Url:	      http://git.chise.org/elisp/apel/
 BuildRoot:    %{_tmppath}/%{name}-%{version}-root
 BuildArch:    noarch
 
@@ -28,7 +32,7 @@ Conflicts:    semi <= 1.14.5-0vl2
 
 Vendor:       Project Vine
 Distribution: Vine Linux
-Packager:     shaolin
+Packager:     shaolin, daisuke
 
 
 %description
@@ -59,7 +63,10 @@ Emacs 環境のための基礎的な関数やマクロを提供します.
 %prep
 %setup -q -n %{origname}-%{origver}
 
-%patch10 -p1
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 
 %install
@@ -68,8 +75,8 @@ Emacs 環境のための基礎的な関数やマクロを提供します.
 [ "${RPM_BUILD_ROOT}" != "/" ] && mkdir -p ${RPM_BUILD_ROOT}
 
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/emacs/site-lisp/%{origname}
-mkdir -p $RPM_BUILD_ROOT/%{_libdir}/emacsen-common/packages/install
-mkdir -p $RPM_BUILD_ROOT/%{_libdir}/emacsen-common/packages/remove
+mkdir -p $RPM_BUILD_ROOT/%{_prefix}/lib/emacsen-common/packages/install
+mkdir -p $RPM_BUILD_ROOT/%{_prefix}/lib/emacsen-common/packages/remove
 
 #
 # install el files
@@ -133,6 +140,15 @@ fi
 
  
 %changelog
+* Tue May 06 2014 Daisuke SUZUKI <daisuke@linux.or.jp> 10.8-3
+- add patch0 for (original) git master
+- add patch1 to update to ikazuhiro's branch (2014-03-15)
+  https://github.com/ikazuhiro/apel/commits/master
+- add patch2 from debian package
+  (Prevent an error of fontset-pixel-size for Emacs 23.)
+- add patch3 from debian package
+  (use new style backquotes to use on emacs-24.3.90)
+
 * Fri Apr 22 2011 IWAI, Masaharu <iwai@alib.jp> 10.8-2
 - drop defining prereq_ge macro: using Requires(post,preun) tag
 - add Requires: emacsen
@@ -208,7 +224,7 @@ fi
 - 1.13.7-5
 - added patch (see emacs-mime-ja: 00303) to format texinfo correctly
 
-* Thu Dec 24 1999 MATSUBAYASHI 'Shaolin' Kohji
+* Fri Dec 24 1999 MATSUBAYASHI 'Shaolin' Kohji
 - 1.13.7-4
 - updated in sync with apel-10.0 / clime-1.13.6 release