|
@@ -1,6 +1,6 @@
|
|
-%define emacsversion 23.2
|
|
|
|
|
|
+%define emacsversion 23.2.92
|
|
#% define cvsdate 20100104
|
|
#% define cvsdate 20100104
|
|
-%define emacsrelease 5%{?cvsdate:.%cvsdate}%{?_dist_release}
|
|
|
|
|
|
+%define emacsrelease 1%{?cvsdate:.%cvsdate}%{?_dist_release}
|
|
|
|
|
|
%define _noVersionedDependencies 1
|
|
%define _noVersionedDependencies 1
|
|
%define prereq_ge() %(LC_ALL="C" rpm -q --queryformat 'PreReq:%%{NAME} >= %%{VERSION}' %1| grep -v "is not")
|
|
%define prereq_ge() %(LC_ALL="C" rpm -q --queryformat 'PreReq:%%{NAME} >= %%{VERSION}' %1| grep -v "is not")
|
|
@@ -14,8 +14,8 @@ Summary(ja): GNU Emacs エディタ
|
|
Name: emacs
|
|
Name: emacs
|
|
Version: %{emacsversion}
|
|
Version: %{emacsversion}
|
|
Release: %{emacsrelease}
|
|
Release: %{emacsrelease}
|
|
-Source0: ftp://ftp.gnu.org/pub/gnu/emacs/emacs-%{version}%{?cvsdate:.cvs%cvsdate}.tar.bz2
|
|
|
|
-#Source0: ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-%{emacsversion}.tar.gz
|
|
|
|
|
|
+#Source0: ftp://ftp.gnu.org/pub/gnu/emacs/emacs-%{version}%{?cvsdate:.cvs%cvsdate}.tar.bz2
|
|
|
|
+Source0: ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-%{emacsversion}.tar.gz
|
|
|
|
|
|
## Sources from Rawhide 21.2-11
|
|
## Sources from Rawhide 21.2-11
|
|
Source10: site-start.el.emacs23
|
|
Source10: site-start.el.emacs23
|
|
@@ -54,12 +54,12 @@ Patch20: emacs-23.1.90-fixed-resolution.patch
|
|
#Patch31: emacs-23.1-indian.patch
|
|
#Patch31: emacs-23.1-indian.patch
|
|
#Patch32: emacs-23.1-memmove.patch
|
|
#Patch32: emacs-23.1-memmove.patch
|
|
# Accepted by upstream.
|
|
# Accepted by upstream.
|
|
-Patch33: emacs-23.2-m17ncheck.patch
|
|
|
|
|
|
+#Patch33: emacs-23.2-m17ncheck.patch
|
|
# Fix rhbz#595546
|
|
# Fix rhbz#595546
|
|
# Upstream: http://emacsbugs.donarmstrong.com/cgi/bugreport.cgi?bug=6158
|
|
# Upstream: http://emacsbugs.donarmstrong.com/cgi/bugreport.cgi?bug=6158
|
|
Patch34: emacs-23.2-hideshow-comment.patch
|
|
Patch34: emacs-23.2-hideshow-comment.patch
|
|
# Reported upstream http://debbugs.gnu.org/cgi/bugreport.cgi?bug=4129
|
|
# Reported upstream http://debbugs.gnu.org/cgi/bugreport.cgi?bug=4129
|
|
-Patch35: emacs-23.2-spacing.patch
|
|
|
|
|
|
+#Patch35: emacs-23.2-spacing.patch
|
|
|
|
|
|
# security patches (from Debian)
|
|
# security patches (from Debian)
|
|
|
|
|
|
@@ -132,9 +132,9 @@ GNU Emacs は拡張性が高く、さまざまなカスタマイズが可能な
|
|
#%patch30 -p1 -b .scroll
|
|
#%patch30 -p1 -b .scroll
|
|
#%patch31 -p1
|
|
#%patch31 -p1
|
|
#%patch32 -p1 -b .memmove
|
|
#%patch32 -p1 -b .memmove
|
|
-%patch33 -p1 -b .m17ncheck
|
|
|
|
|
|
+#%patch33 -p1 -b .m17ncheck
|
|
%patch34 -p0 -b .hideshow-comment
|
|
%patch34 -p0 -b .hideshow-comment
|
|
-%patch35 -p1 -b .spacing
|
|
|
|
|
|
+#%patch35 -p1 -b .spacing
|
|
|
|
|
|
#%patch501 -p1 -b .movemail
|
|
#%patch501 -p1 -b .movemail
|
|
|
|
|
|
@@ -276,7 +276,9 @@ echo "/usr/bin/b2m
|
|
/usr/bin/emacs
|
|
/usr/bin/emacs
|
|
/usr/bin/emacsclient
|
|
/usr/bin/emacsclient
|
|
/usr/bin/gctags
|
|
/usr/bin/gctags
|
|
-/usr/bin/grep-changelog"|
|
|
|
|
|
|
+/usr/bin/grep-changelog
|
|
|
|
+/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}#"|
|
|
%__sed -e "s#[^\n]*#mv ${RPM_BUILD_ROOT}\0 ${RPM_BUILD_ROOT}\0.emacs-%{version}#"|
|
|
awk '{system($_)}'
|
|
awk '{system($_)}'
|
|
|
|
|
|
@@ -421,6 +423,12 @@ unset PRIORITY
|
|
%{_localstatedir}/games/emacs/*
|
|
%{_localstatedir}/games/emacs/*
|
|
|
|
|
|
%changelog
|
|
%changelog
|
|
|
|
+* Sat Jan 22 2011 Munehiro Yamamoto <munepi@vinelinux.org> 23.2.92-1
|
|
|
|
+- updated to 23.2.92 (23.3 pretest)
|
|
|
|
+- dropped upstreamed patches
|
|
|
|
+ - emacs-23.2-m17ncheck.patch
|
|
|
|
+ - emacs-23.2-spacing.patch
|
|
|
|
+
|
|
* Sun Dec 05 2010 Munehiro Yamamoto <munepi@vinelinux.org> 23.2-5
|
|
* Sun Dec 05 2010 Munehiro Yamamoto <munepi@vinelinux.org> 23.2-5
|
|
- applied new vine-default system
|
|
- applied new vine-default system
|
|
- updated site-start.el
|
|
- updated site-start.el
|