|
|
@@ -1,6 +1,6 @@
|
|
|
%define emacsversion 24.0.50
|
|
|
-%define bzrdate 20110222
|
|
|
-%define emacsrelease 4%{?bzrdate:.%bzrdate}%{?_dist_release}
|
|
|
+%define bzrdate 20110318
|
|
|
+%define emacsrelease 5%{?bzrdate:.%bzrdate}%{?_dist_release}
|
|
|
|
|
|
%define _noVersionedDependencies 1
|
|
|
%define prereq_ge() %(LC_ALL="C" rpm -q --queryformat 'PreReq:%%{NAME} >= %%{VERSION}' %1| grep -v "is not")
|
|
|
@@ -42,23 +42,10 @@ Patch11: emacs-23.0.60-locallisppath.patch
|
|
|
Patch20: emacs-23.1.90-fixed-resolution.patch
|
|
|
|
|
|
# Fixed in upstream CVS. (from Fedora)
|
|
|
-#Patch30: emacs-23.1-scroll.patch
|
|
|
-#Patch31: emacs-23.1-indian.patch
|
|
|
-#Patch32: emacs-23.1-memmove.patch
|
|
|
-# Accepted by upstream.
|
|
|
-#Patch33: emacs-23.2-m17ncheck.patch
|
|
|
-# Fix rhbz#595546
|
|
|
-# Upstream: http://emacsbugs.donarmstrong.com/cgi/bugreport.cgi?bug=6158
|
|
|
-#Patch34: emacs-23.2-hideshow-comment.patch
|
|
|
-# Reported upstream http://debbugs.gnu.org/cgi/bugreport.cgi?bug=4129
|
|
|
-#Patch35: emacs-23.2-spacing.patch
|
|
|
|
|
|
# security patches (from Debian)
|
|
|
|
|
|
# security patches (from Ubuntu)
|
|
|
-# # http://www.vupen.com/english/advisories/2010/0734
|
|
|
-# # https://code.launchpad.net/~ubuntu-branches/ubuntu/karmic/emacs23/karmic-security
|
|
|
-# Patch501: emacs23-CVE-2010-0825-fix-movemail-race.diff
|
|
|
|
|
|
# patches from Mandrake
|
|
|
Patch1001: emacs-21.1-bzip2.patch.bz2
|
|
|
@@ -118,15 +105,6 @@ GNU Emacs は拡張性が高く、さまざまなカスタマイズが可能な
|
|
|
%patch11 -p1
|
|
|
%patch20 -p1
|
|
|
|
|
|
-#%patch30 -p1 -b .scroll
|
|
|
-#%patch31 -p1
|
|
|
-#%patch32 -p1 -b .memmove
|
|
|
-#%patch33 -p1 -b .m17ncheck
|
|
|
-#%patch34 -p0 -b .hideshow-comment
|
|
|
-#%patch35 -p1 -b .spacing
|
|
|
-
|
|
|
-#%patch501 -p1 -b .movemail
|
|
|
-
|
|
|
%patch1001 -p1
|
|
|
|
|
|
autoconf
|
|
|
@@ -145,14 +123,9 @@ export PATH="$PATH:/sbin:/usr/sbin"
|
|
|
--with-freetype --with-xft \
|
|
|
--enable-font-backend \
|
|
|
--without-gpm \
|
|
|
- --with-libotf \
|
|
|
-%if %{?_dist_release} == "vl5"
|
|
|
- --without-m17n-flt \
|
|
|
-%endif
|
|
|
-%if %{?_dist_release} == "vl6"
|
|
|
- --with-m17n-flt \
|
|
|
- --with-dbus --with-gconf \
|
|
|
-%endif
|
|
|
+ --with-libotf \
|
|
|
+ --with-m17n-flt \
|
|
|
+ --with-dbus --with-gconf \
|
|
|
;
|
|
|
|
|
|
%__make bootstrap
|
|
|
@@ -393,6 +366,9 @@ unset PRIORITY
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Tue Feb 22 2011 Munehiro Yamamoto <munepi@vinelinux.org> 24.0.50-5.20110318
|
|
|
+- emacs24 24.0.50 (20110318) snapshot
|
|
|
+
|
|
|
* Tue Feb 22 2011 Munehiro Yamamoto <munepi@vinelinux.org> 24.0.50-4.20110222
|
|
|
- emacs24 24.0.50 (20110222) snapshot
|
|
|
- updated site-start.el
|
munepi