|
|
@@ -1,4 +1,4 @@
|
|
|
-%define emacsversion 23.1.94
|
|
|
+%define emacsversion 23.1.96
|
|
|
#% define cvsdate 20100104
|
|
|
%define emacsrelease 1%{?cvsdate:.%cvsdate}%{?_dist_release}
|
|
|
|
|
|
@@ -86,14 +86,21 @@ Requires(postun): emacsen-common
|
|
|
#BuildPreReq: Canna-devel
|
|
|
|
|
|
BuildRequires: autoconf
|
|
|
-BuildRequires: libpng >= 1.2.5
|
|
|
+BuildRequires: atk-devel
|
|
|
BuildRequires: gtk2-devel, cairo-devel
|
|
|
BuildRequires: freetype-devel, fontconfig-devel
|
|
|
+BuildRequires: dbus-devel GConf2-devel
|
|
|
BuildRequires: libpng-devel, libjpeg-devel, libtiff-devel, libungif-devel
|
|
|
-BuildRequires: librsvg2-devel, m17n-lib-devel, libotf-devel
|
|
|
+#BuildRequires: librsvg2-devel, m17n-lib-devel, libotf-devel
|
|
|
+##!! For vl5, m17n-lib-devel (plus)
|
|
|
+BuildRequires: librsvg2-devel, libotf-devel
|
|
|
+%if %{?_dist_release} == "vl6"
|
|
|
+BuildRequires: m17n-lib-devel
|
|
|
+%endif
|
|
|
BuildRequires: libX11-devel, libXau-devel, libXdmcp-devel, libXrender-devel
|
|
|
BuildRequires: libXt-devel, libXpm-devel, ncurses-devel
|
|
|
BuildRequires: xorg-x11-proto-devel, zlib-devel
|
|
|
+BuildRequires: alsa-lib-devel
|
|
|
BuildRequires: texinfo
|
|
|
BuildRequires: nkf
|
|
|
|
|
|
@@ -137,10 +144,13 @@ export PATH="$PATH:/sbin:/usr/sbin"
|
|
|
--with-toolkit=gtk \
|
|
|
--with-freetype --with-xft \
|
|
|
--enable-font-backend \
|
|
|
- --without-gpm
|
|
|
+ --with-libotf --with-m17n-flt \
|
|
|
+ --without-gpm \
|
|
|
+ --with-dbus --with-gconf \
|
|
|
+ ;
|
|
|
|
|
|
-make bootstrap
|
|
|
-make
|
|
|
+%__make bootstrap
|
|
|
+%__make %{?_smp_mflags}
|
|
|
|
|
|
|
|
|
#%define recompile src/emacs -batch --no-init-file --no-site-file -f batch-byte-compile
|
|
|
@@ -161,6 +171,9 @@ ARCHDIR=${RPM_ARCH}-vine-linux
|
|
|
%makeinstall libexecdir=$RPM_BUILD_ROOT%{_libdir} \
|
|
|
infodir=${RPM_BUILD_ROOT}%{infodir}
|
|
|
|
|
|
+## This is a duplicate of the file in FLAVOR/site-lisp
|
|
|
+%__rm -f $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/subdirs.el || exit 1
|
|
|
+
|
|
|
(cd $RPM_BUILD_ROOT%{_mandir}/man1/; mv ctags.1 gctags.1)
|
|
|
(cd $RPM_BUILD_ROOT%{_bindir}/; mv ctags gctags)
|
|
|
|
|
|
@@ -384,6 +397,22 @@ unset PRIORITY
|
|
|
%{_localstatedir}/games/emacs/*
|
|
|
|
|
|
%changelog
|
|
|
+* Wed Apr 21 2010 Munehiro Yamamoto <munepi@vinelinux.org> 23.1.96-1
|
|
|
+- updated to 23.1.96 (23.2 pretest)
|
|
|
+
|
|
|
+* Sun Apr 18 2010 Munehiro Yamamoto <munepi@vinelinux.org> 23.1.95-2
|
|
|
+- removed /usr/share/emacs/site-lisp/subdirs.el
|
|
|
+
|
|
|
+* Sat Apr 03 2010 Munehiro Yamamoto <munepi@vinelinux.org> 23.1.95-1
|
|
|
+- updated to 23.1.95 (23.2 pretest)
|
|
|
+- added BuildRequires:
|
|
|
+ - atk-devel
|
|
|
+ - dbus-devel
|
|
|
+ - GConf2-devel
|
|
|
+ - alsa-lib-devel
|
|
|
+- added some configure options:
|
|
|
+ --with-libotf --with-m17n-flt --with-dbus --with-gconf
|
|
|
+
|
|
|
* Sun Mar 21 2010 Munehiro Yamamoto <munepi@vinelinux.org> 23.1.94-1
|
|
|
- updated to 23.1.94
|
|
|
|
munepi