|
@@ -1,6 +1,6 @@
|
|
|
-%define emacsversion 24.0.50
|
|
|
-%define bzrdate 20110604
|
|
|
-%define emacsrelease 9%{?bzrdate:.%bzrdate}%{?_dist_release}
|
|
|
+%define emacsversion 24.0.90
|
|
|
+#% define bzrdate 20110817
|
|
|
+%define emacsrelease 2%{?bzrdate:.%bzrdate}%{?_dist_release}
|
|
|
%define vine_default_major_version %(echo %_dist_release|%__sed s/vl//)
|
|
|
|
|
|
%define _noVersionedDependencies 1
|
|
@@ -16,8 +16,8 @@ Name: emacs24
|
|
|
Provides: emacs-snapshot
|
|
|
Version: %{emacsversion}
|
|
|
Release: %{emacsrelease}
|
|
|
-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://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
|
|
|
Source1: emacs-snapshot.sh
|
|
|
|
|
|
Source10: site-start.el.emacs24
|
|
@@ -41,6 +41,7 @@ Source151: vine-default-faces.el
|
|
|
#Patch10: emacs-21.1-ppc-nocombreloc.patch
|
|
|
Patch11: emacs-23.0.60-locallisppath.patch
|
|
|
Patch20: emacs-23.1.90-fixed-resolution.patch
|
|
|
+Patch30: emacs-24.0.90-libs-termcap.patch
|
|
|
|
|
|
# Fixed in upstream CVS. (from Fedora)
|
|
|
|
|
@@ -76,13 +77,15 @@ BuildRequires: atk-devel
|
|
|
BuildRequires: dbus-devel GConf2-devel
|
|
|
BuildRequires: alsa-lib-devel
|
|
|
BuildRequires: gnutls-devel
|
|
|
-BuildRequires: gtk2-devel, cairo-devel
|
|
|
-BuildRequires: freetype-devel, fontconfig-devel
|
|
|
+BuildRequires: gtk3-devel, cairo-devel
|
|
|
+BuildRequires: freetype2-devel, fontconfig-devel
|
|
|
BuildRequires: libpng-devel, libjpeg-devel, libtiff-devel, libungif-devel
|
|
|
BuildRequires: librsvg2-devel, libotf-devel
|
|
|
+BuildRequires: ImageMagick-devel
|
|
|
+BuildRequires: libxml2-devel > 2.6.17
|
|
|
BuildRequires: m17n-lib-devel
|
|
|
BuildRequires: libX11-devel, libXau-devel, libXdmcp-devel, libXrender-devel
|
|
|
-BuildRequires: libXt-devel, libXpm-devel, ncurses-devel
|
|
|
+BuildRequires: libSM-devel, libXt-devel, libXpm-devel, ncurses-devel
|
|
|
BuildRequires: xorg-x11-proto-devel, zlib-devel
|
|
|
BuildRequires: texinfo
|
|
|
BuildRequires: nkf
|
|
@@ -105,6 +108,7 @@ GNU Emacs は拡張性が高く、さまざまなカスタマイズが可能な
|
|
|
|
|
|
%patch11 -p1
|
|
|
%patch20 -p1
|
|
|
+%patch30 -p1
|
|
|
|
|
|
%patch1001 -p1
|
|
|
|
|
@@ -120,7 +124,7 @@ export PATH="$PATH:/sbin:/usr/sbin"
|
|
|
%configure --with-pop --with-sound \
|
|
|
--libexecdir=%{_libdir} --infodir=%{infodir} \
|
|
|
--disable-rename \
|
|
|
- --with-toolkit=gtk \
|
|
|
+ --with-x-toolkit=gtk3 \
|
|
|
--with-freetype --with-xft \
|
|
|
--enable-font-backend \
|
|
|
--without-gpm \
|
|
@@ -353,7 +357,8 @@ unset PRIORITY
|
|
|
|
|
|
%files -f rpm-files
|
|
|
%defattr(-,root,root)
|
|
|
-%doc INSTALL INSTALL.BZR README BUGS ChangeLog COPYING
|
|
|
+%doc INSTALL README BUGS ChangeLog COPYING
|
|
|
+#%doc INSTALL.BZR
|
|
|
%dir %{_sysconfdir}/emacs-%{version}
|
|
|
%dir %{_sysconfdir}/emacs-%{version}/site-start.d
|
|
|
%{_sysconfdir}/emacs-%{version}/site-start.d/*.el
|
|
@@ -368,6 +373,18 @@ unset PRIORITY
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Thu Oct 6 2011 Munehiro Yamamoto <munepi@vinelinux.org> 24.0.90-2
|
|
|
+- set --with-x-toolkit=gtk3 (%%configure)
|
|
|
+ - added BuildRequires: gtk3-devel
|
|
|
+
|
|
|
+* Mon Sep 26 2011 Munehiro Yamamoto <munepi@vinelinux.org> 24.0.90-1
|
|
|
+- updated to 24.0.90 (24.1 pretest)
|
|
|
+- applied emacs-24.0.90-libs-termcap.patch
|
|
|
+
|
|
|
+* Sat Jul 09 2011 Munehiro Yamamoto <munepi@vinelinux.org> 24.0.50-10.20110817
|
|
|
+- emacs24 24.0.50 (20110817) snapshot
|
|
|
+- added BuildRequires: ImageMagick-devel, libSM-devel, libxml2-devel > 2.6.17
|
|
|
+
|
|
|
* Sun Jun 05 2011 Munehiro Yamamoto <munepi@vinelinux.org> 24.0.50-9.20110604
|
|
|
- emacs24 24.0.50 (20110604) snapshot
|
|
|
|