|
|
@@ -1,6 +1,6 @@
|
|
|
-%define emacsversion 24.3
|
|
|
+%define emacsversion 24.3.90
|
|
|
#% define bzrdate 20110817
|
|
|
-%define emacsrelease 5%{?bzrdate:.%bzrdate}%{?_dist_release}
|
|
|
+%define emacsrelease 1%{?bzrdate:.%bzrdate}%{?_dist_release}
|
|
|
%define vine_default_major_version %(echo %_dist_release|%__sed s/vl//)
|
|
|
|
|
|
%define _noVersionedDependencies 1
|
|
|
@@ -40,25 +40,13 @@ Source102: coding-system-init.el.emacs24
|
|
|
Source150: vine-default-base.el
|
|
|
|
|
|
## Vine Patch(es)
|
|
|
-Patch11: emacs-24.2.90-locallisppath.patch
|
|
|
+Patch11: emacs-24.3.90-locallisppath.patch
|
|
|
#Patch20: emacs-23.1.90-fixed-resolution.patch
|
|
|
Patch30: emacs-24.0.90-libs-termcap.patch
|
|
|
|
|
|
# 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)
|
|
|
|
|
|
@@ -90,11 +78,11 @@ BuildRequires: atk-devel
|
|
|
BuildRequires: dbus-devel GConf2-devel
|
|
|
BuildRequires: alsa-lib-devel
|
|
|
BuildRequires: gnutls-devel
|
|
|
-%if %{?_dist_release} >= "vl7"
|
|
|
-BuildRequires: gtk3-devel
|
|
|
-%else
|
|
|
+#if %{?_dist_release} >= "vl7"
|
|
|
+#BuildRequires: gtk3-devel
|
|
|
+#else
|
|
|
BuildRequires: gtk2-devel
|
|
|
-%endif
|
|
|
+#endif
|
|
|
BuildRequires: cairo-devel
|
|
|
BuildRequires: freetype2-devel, fontconfig-devel
|
|
|
BuildRequires: libpng-devel, libjpeg-devel, libtiff-devel, libungif-devel
|
|
|
@@ -125,12 +113,6 @@ GNU Emacs は拡張性が高く、さまざまなカスタマイズが可能な
|
|
|
#%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
|
|
|
|
|
|
@@ -144,12 +126,6 @@ grep -v "tetris.elc" lisp/Makefile.in > lisp/Makefile.in.new \
|
|
|
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
|
|
|
export PATH="$PATH:/sbin:/usr/sbin"
|
|
|
@@ -157,11 +133,7 @@ export PATH="$PATH:/sbin:/usr/sbin"
|
|
|
%configure --with-pop --with-sound \
|
|
|
--libexecdir=%{_libdir} --infodir=%{infodir} \
|
|
|
--disable-rename \
|
|
|
-%if %{?_dist_release} >= "vl7"
|
|
|
- --with-x-toolkit=gtk3 \
|
|
|
-%else
|
|
|
--with-x-toolkit=gtk \
|
|
|
-%endif
|
|
|
--with-freetype --with-xft \
|
|
|
--enable-font-backend \
|
|
|
--without-gpm \
|
|
|
@@ -169,6 +141,7 @@ export PATH="$PATH:/sbin:/usr/sbin"
|
|
|
--with-m17n-flt \
|
|
|
--with-dbus --with-gconf \
|
|
|
;
|
|
|
+# --with-x-toolkit=gtk3 \
|
|
|
|
|
|
%__make bootstrap
|
|
|
%__make %{?_smp_mflags}
|
|
|
@@ -177,8 +150,6 @@ export PATH="$PATH:/sbin:/usr/sbin"
|
|
|
%install
|
|
|
[ "${RPM_BUILD_ROOT}" != "/" ] && %__rm -rf ${RPM_BUILD_ROOT}
|
|
|
|
|
|
-ARCHDIR=${RPM_ARCH}-vine-linux
|
|
|
-
|
|
|
%makeinstall libexecdir=$RPM_BUILD_ROOT%{_libdir} \
|
|
|
infodir=${RPM_BUILD_ROOT}%{infodir}
|
|
|
|
|
|
@@ -402,6 +373,9 @@ unset PRIORITY
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Sun Apr 27 2014 Munehiro Yamamoto <munepi@vinelinux.org> 24.3.90-1
|
|
|
+- updated to 24.3.90
|
|
|
+
|
|
|
* Tue Feb 25 2014 NAKAMURA Kenta <kenta@vinelinux.org> 24.3-5
|
|
|
- rebuilt with gnutls-3.2
|
|
|
|
munepi