|
|
@@ -1,6 +1,6 @@
|
|
|
-%define emacsversion 24.2
|
|
|
+%define emacsversion 24.3
|
|
|
#% define bzrdate 20110817
|
|
|
-%define emacsrelease 1%{?bzrdate:.%bzrdate}%{?_dist_release}
|
|
|
+%define emacsrelease 2%{?bzrdate:.%bzrdate}%{?_dist_release}
|
|
|
%define vine_default_major_version %(echo %_dist_release|%__sed s/vl//)
|
|
|
|
|
|
%define _noVersionedDependencies 1
|
|
|
@@ -17,9 +17,9 @@ Name: emacs
|
|
|
#Provides: emacs-snapshot
|
|
|
Version: %{emacsversion}
|
|
|
Release: %{emacsrelease}
|
|
|
-Source0: ftp://ftp.gnu.org/pub/gnu/emacs/emacs-%{version}.tar.xz
|
|
|
+#Source0: ftp://ftp.gnu.org/pub/gnu/emacs/emacs-%{version}.tar.xz
|
|
|
#Source0: ftp://ftp.gnu.org/pub/gnu/emacs/emacs-%{version}%{?bzrdate:.bzr%bzrdate}.tar.xz
|
|
|
-#Source0: ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-%{emacsversion}.tar.gz
|
|
|
+Source0: ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-%{emacsversion}.tar.xz
|
|
|
Source1: emacs-snapshot.sh
|
|
|
|
|
|
Source10: site-start.el.emacs24
|
|
|
@@ -32,27 +32,37 @@ Source50: emacs24.desktop.in
|
|
|
|
|
|
## Enable Japanese Menu
|
|
|
## http://www11.atwiki.jp/s-irie/pages/13.html
|
|
|
-Source100: menu-tree-el-%{menutreeelversion}.tar.gz
|
|
|
-Source110: menu-tree-init.el.emacs24
|
|
|
+# Source100: menu-tree-el-%{menutreeelversion}.tar.gz
|
|
|
+# Source101: menu-tree-init.el.emacs24
|
|
|
+Source102: coding-system-init.el.emacs24
|
|
|
|
|
|
## default settings for Vine Linux
|
|
|
Source150: vine-default-base.el
|
|
|
-Source151: vine-default-faces.el
|
|
|
|
|
|
## Vine Patch(es)
|
|
|
-#Patch10: emacs-21.1-ppc-nocombreloc.patch
|
|
|
-Patch11: emacs-23.0.60-locallisppath.patch
|
|
|
-Patch20: emacs-23.1.90-fixed-resolution.patch
|
|
|
+Patch11: emacs-24.2.90-locallisppath.patch
|
|
|
+#Patch20: emacs-23.1.90-fixed-resolution.patch
|
|
|
Patch30: emacs-24.0.90-libs-termcap.patch
|
|
|
|
|
|
-# Fixed in upstream CVS. (from Fedora)
|
|
|
+# patches from Fedora
|
|
|
+# rhbz#713600
|
|
|
+Patch107: emacs-spellchecker.patch
|
|
|
+# Fix for emacs bug #922519
|
|
|
+Patch110: emacs-style-change-cb.patch
|
|
|
+# Fix for emacs bug #562719
|
|
|
+Patch111: emacs-bell-dont-work.patch
|
|
|
+# Fix for emacs bug #929353
|
|
|
+Patch112: emacs-gtk-warning.patch
|
|
|
+# Fix for emacs bug #948838
|
|
|
+Patch113: emacs-help-update.patch
|
|
|
+# Fix for emacs bug #13460.
|
|
|
+Patch150: emacs-24.3-hunspell.patch
|
|
|
+# Fix for emacs bug #827033
|
|
|
+Patch151: emacs-24.3-hunspell.2.patch
|
|
|
|
|
|
# security patches (from Debian)
|
|
|
|
|
|
-# security patches (from Ubuntu)
|
|
|
-
|
|
|
-# patches from Mandrake
|
|
|
-Patch1001: emacs-21.1-bzip2.patch.bz2
|
|
|
+#Patch1001: emacs-21.1-bzip2.patch.bz2
|
|
|
|
|
|
License: GPLv3+
|
|
|
Group: Applications/Editors/Emacs
|
|
|
@@ -110,20 +120,35 @@ GNU Emacs は拡張性が高く、さまざまなカスタマイズが可能な
|
|
|
|
|
|
%setup -q -n emacs-%{version}
|
|
|
|
|
|
-%ifarch ppc
|
|
|
-#%patch10 -p1
|
|
|
-%endif
|
|
|
-
|
|
|
%patch11 -p1
|
|
|
-%patch20 -p1
|
|
|
-%patch30 -p1
|
|
|
+#%patch20 -p1
|
|
|
+#%patch30 -p1
|
|
|
+
|
|
|
+%patch107 -p1 -b .spellchecker
|
|
|
+%patch110 -p1 -b .style-change-cb.patch
|
|
|
+%patch111 -p1 -b .bell-dont-work.patch
|
|
|
+%patch112 -p1 -b .gtk-warning.patch
|
|
|
+%patch113 -p1 -b .help-update.patch
|
|
|
+%patch150 -p1 -b .hunspell
|
|
|
+%patch151 -p1 -b .hunspell.2
|
|
|
|
|
|
-%patch1001 -p1
|
|
|
+#%patch1001 -p1
|
|
|
+
|
|
|
+
|
|
|
+# Avoid trademark issues
|
|
|
+grep -v "tetris.elc" lisp/Makefile.in > lisp/Makefile.in.new \
|
|
|
+ && %__mv lisp/Makefile.in.new lisp/Makefile.in || exit 1
|
|
|
+%__rm -f lisp/play/tetris.el lisp/play/tetris.elc || exit 1
|
|
|
|
|
|
#autoconf
|
|
|
autoreconf -i -I m4
|
|
|
|
|
|
%build
|
|
|
+# Remove unpatched files as all files in the lisp directory are
|
|
|
+# installed.
|
|
|
+%__rm lisp/textmodes/ispell.el.hunspell || exit 1
|
|
|
+%__rm lisp/textmodes/ispell.el.hunspell.2 || exit 1
|
|
|
+%__rm lisp/textmodes/ispell.el.spellchecker || exit 1
|
|
|
|
|
|
export CFLAGS="-DMAIL_USE_LOCKF $RPM_OPT_FLAGS"
|
|
|
#to find installinfo
|
|
|
@@ -149,16 +174,6 @@ export PATH="$PATH:/sbin:/usr/sbin"
|
|
|
%__make %{?_smp_mflags}
|
|
|
|
|
|
|
|
|
-#%define recompile src/emacs -batch --no-init-file --no-site-file -f batch-byte-compile
|
|
|
-
|
|
|
-# recompile patched .el files
|
|
|
-#%{recompile} lisp/mail/mh-utils.el lisp/progmodes/make-mode.el
|
|
|
-
|
|
|
-# bytecompile python-mode, ssl, php-mode and rpm-spec-mode
|
|
|
-#cp %SOURCE12 %SOURCE14 %SOURCE16 %SOURCE17 .
|
|
|
-##%%{recompile} rpm-spec-mode.el php-mode.el ssl.el po-mode.el
|
|
|
-
|
|
|
-
|
|
|
%install
|
|
|
[ "${RPM_BUILD_ROOT}" != "/" ] && %__rm -rf ${RPM_BUILD_ROOT}
|
|
|
|
|
|
@@ -175,14 +190,12 @@ ARCHDIR=${RPM_ARCH}-vine-linux
|
|
|
|
|
|
%__mkdir_p $RPM_BUILD_ROOT%{_datadir}/emacs-%{version}/etc
|
|
|
%__mkdir_p $RPM_BUILD_ROOT%{_datadir}/emacs-%{version}/site-lisp
|
|
|
-# cp %{SOURCE100} $RPM_BUILD_ROOT%{_datadir}/emacs-%{version}/site-lisp/menu-tree.el
|
|
|
-# nkf -w %{SOURCE100} > $RPM_BUILD_ROOT%{_datadir}/emacs-%{version}/site-lisp/menu-tree-utf8.el
|
|
|
-%__tar zxvf %{SOURCE100}
|
|
|
-%__cp -a menu-tree-el-%{menutreeelversion}/menu-tree.el $RPM_BUILD_ROOT%{_datadir}/emacs-%{version}/site-lisp/
|
|
|
-nkf -w --overwrite $RPM_BUILD_ROOT%{_datadir}/emacs-%{version}/site-lisp/menu-tree.el
|
|
|
+# %__tar zxvf %{SOURCE100}
|
|
|
+# %__cp -a menu-tree-el-%{menutreeelversion}/menu-tree.el $RPM_BUILD_ROOT%{_datadir}/emacs-%{version}/site-lisp/
|
|
|
+# nkf -w --overwrite $RPM_BUILD_ROOT%{_datadir}/emacs-%{version}/site-lisp/menu-tree.el
|
|
|
|
|
|
## vine default
|
|
|
-%__cp -a %{SOURCE150} %{SOURCE151} \
|
|
|
+%__cp -a %{SOURCE150} \
|
|
|
$RPM_BUILD_ROOT%{_datadir}/emacs-%{version}/site-lisp/
|
|
|
|
|
|
# The elisp reference manual
|
|
|
@@ -206,10 +219,14 @@ nkf -w --overwrite $RPM_BUILD_ROOT%{_datadir}/emacs-%{version}/site-lisp/menu-tr
|
|
|
%__install -m 755 -d ${RPM_BUILD_ROOT}/etc/emacs-%{version}/site-start.d
|
|
|
|
|
|
# install coding-system init.el
|
|
|
-%__install -m644 %{SOURCE110} \
|
|
|
- $RPM_BUILD_ROOT/%{_datadir}/emacs-%{version}/site-lisp/menu-tree-init.el
|
|
|
-%__ln_s -f %{_datadir}/emacs-%{version}/site-lisp/menu-tree-init.el \
|
|
|
- ${RPM_BUILD_ROOT}/etc/emacs-%{version}/site-start.d/60menu-tree-init.el
|
|
|
+# %__install -m644 %{SOURCE101} \
|
|
|
+# $RPM_BUILD_ROOT/%{_datadir}/emacs-%{version}/site-lisp/menu-tree-init.el
|
|
|
+# %__ln_s -f %{_datadir}/emacs-%{version}/site-lisp/menu-tree-init.el \
|
|
|
+# ${RPM_BUILD_ROOT}/etc/emacs-%{version}/site-start.d/60menu-tree-init.el
|
|
|
+%__install -m644 %{SOURCE102} \
|
|
|
+ $RPM_BUILD_ROOT/%{_datadir}/emacs-%{version}/site-lisp/coding-system-init.el
|
|
|
+%__ln_s -f %{_datadir}/emacs-%{version}/site-lisp/coding-system-init.el \
|
|
|
+ ${RPM_BUILD_ROOT}/etc/emacs-%{version}/site-start.d/60coding-system-init.el
|
|
|
|
|
|
## install system-wide configure file
|
|
|
%__install -m755 -d ${RPM_BUILD_ROOT}/etc/emacs
|
|
|
@@ -258,12 +275,12 @@ echo "/usr/bin/ctags
|
|
|
/usr/share/icons/hicolor/scalable/apps/emacs.svg
|
|
|
/usr/share/icons/hicolor/scalable/mimetypes/emacs-document.svg" |
|
|
|
%__sed -e "s#[^\n]*#mv ${RPM_BUILD_ROOT}\0 ${RPM_BUILD_ROOT}\0.emacs-%{version}#"|
|
|
|
- awk '{system($_)}'
|
|
|
+ awk '{system($_)}'
|
|
|
|
|
|
find $DIR $BIN $LIB -type d |
|
|
|
%__sed -e "s#^${RPM_BUILD_ROOT}#%dir #" > rpm-files
|
|
|
|
|
|
-find $DIR $BIN $LIB -type f |
|
|
|
+find $DIR $BIN $LIB -type f -o -type l |
|
|
|
%__sed -e "
|
|
|
s#^${RPM_BUILD_ROOT}\(.*movemail\)#%attr(2755, root, mail) \1#
|
|
|
s#^${RPM_BUILD_ROOT}##
|
|
|
@@ -385,6 +402,23 @@ unset PRIORITY
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Sat May 11 2013 Munehiro Yamamoto <munepi@vinelinux.org> 24.3-2
|
|
|
+- dropped some obsolete patches
|
|
|
+- disable menu-tree-el
|
|
|
+ - added coding-system-init.el instead of menu-tree-init.el
|
|
|
+
|
|
|
+* Sat Mar 30 2013 Munehiro Yamamoto <munepi@vinelinux.org> 24.3-1
|
|
|
+- new upstream release
|
|
|
+
|
|
|
+* Thu Feb 7 2013 Munehiro Yamamoto <munepi@vinelinux.org> 24.2.93-1
|
|
|
+- updated to 24.2.93 (24.3 pretest)
|
|
|
+
|
|
|
+* Mon Jan 14 2013 Munehiro Yamamoto <munepi@vinelinux.org> 24.2.92-1
|
|
|
+- updated to 24.2.92 (24.3 pretest)
|
|
|
+
|
|
|
+* Sun Nov 25 2012 Munehiro Yamamoto <munepi@vinelinux.org> 24.2.90-1
|
|
|
+- updated to 24.2.90 (24.3 pretest)
|
|
|
+
|
|
|
* Mon Aug 27 2012 Munehiro Yamamoto <munepi@vinelinux.org> 24.2-1
|
|
|
- new upstream release
|
|
|
|
|
|
@@ -433,7 +467,7 @@ unset PRIORITY
|
|
|
* Sun Jun 05 2011 Munehiro Yamamoto <munepi@vinelinux.org> 24.0.50-9.20110604
|
|
|
- emacs24 24.0.50 (20110604) snapshot
|
|
|
|
|
|
-* Thu Apr 13 2011 Munehiro Yamamoto <munepi@vinelinux.org> 24.0.50-8.20110413
|
|
|
+* Wed Apr 13 2011 Munehiro Yamamoto <munepi@vinelinux.org> 24.0.50-8.20110413
|
|
|
- emacs24 24.0.50 (20110413) snapshot
|
|
|
|
|
|
* Tue Apr 05 2011 Munehiro Yamamoto <munepi@vinelinux.org> 24.0.50-7.20110318
|
|
|
@@ -550,7 +584,7 @@ unset PRIORITY
|
|
|
* Tue Sep 01 2009 Munehiro Yamamoto <munepi@vinelinux.org> 23.1-4
|
|
|
- rebuilt to add signature
|
|
|
|
|
|
-* Fri Aug 19 2009 Munehiro Yamamoto <munepi@vinelinux.org> 23.1-3
|
|
|
+* Wed Aug 19 2009 Munehiro Yamamoto <munepi@vinelinux.org> 23.1-3
|
|
|
- added BuildRequires: nkf
|
|
|
- updated menu-tree-init.el.emacs23
|
|
|
- fixed menu-tree encoding <BTS:VineLinux:766>
|
|
|
@@ -652,7 +686,7 @@ unset PRIORITY
|
|
|
CVE-2008-1694: fix insecure temporary file creation in vcdiff script
|
|
|
leading to possible symlink attacks
|
|
|
|
|
|
-* Tue Jun 25 2008 Daisuke SUZUKI <daisuke@linux.or.jp> 22.2-2
|
|
|
+* Wed Jun 25 2008 Daisuke SUZUKI <daisuke@linux.or.jp> 22.2-2
|
|
|
- update menu-tree.el
|
|
|
- add 60menu-tree-init.el to sed coding-system and load menu-tree
|
|
|
- build with xorg-x11-7.3
|
|
|
@@ -840,7 +874,7 @@ unset PRIORITY
|
|
|
- [emacs-20.5-1]
|
|
|
- add desktop-link files for desktop menu.
|
|
|
|
|
|
-* Thu Dec 24 1999 MATSUBAYASHI 'Shaolin' Kohji <shaolin@rins.st.ryukoku.ac.jp>
|
|
|
+* Fri Dec 24 1999 MATSUBAYASHI 'Shaolin' Kohji <shaolin@rins.st.ryukoku.ac.jp>
|
|
|
- [emacs-20.4-16]
|
|
|
- replaced Y2K savvy timezone.{el,elc} with one from brand-new apel-10.0
|
|
|
|
|
|
@@ -862,7 +896,7 @@ unset PRIORITY
|
|
|
- Modified info-dir.
|
|
|
- Removed -c option from %setup.
|
|
|
|
|
|
-* Sun Sep 20 1999 Kazuhisa TAKEI<takei@hh.iij4u.or.jp>
|
|
|
+* Mon Sep 20 1999 Kazuhisa TAKEI<takei@hh.iij4u.or.jp>
|
|
|
- fixed XIM support patch
|
|
|
* Sun Sep 19 1999 Kazuhisa TAKEI<takei@hh.iij4u.or.jp>
|
|
|
- fixed postinst bug and fontset patch
|
munepi