|
|
@@ -1,6 +1,6 @@
|
|
|
-%define emacsversion 23.3
|
|
|
+%define emacsversion 23.4
|
|
|
#% define rcversion rc1
|
|
|
-%define emacsrelease 5%{?rcversion:.%rcversion}%{?_dist_release}
|
|
|
+%define emacsrelease 1%{?rcversion:.%rcversion}%{?_dist_release}
|
|
|
%define vine_default_major_version %(echo %_dist_release|%__sed s/vl//)
|
|
|
|
|
|
%define _noVersionedDependencies 1
|
|
|
@@ -15,7 +15,7 @@ Summary(ja): GNU Emacs エディタ
|
|
|
Name: emacs
|
|
|
Version: %{emacsversion}
|
|
|
Release: %{emacsrelease}
|
|
|
-Source0: ftp://ftp.gnu.org/pub/gnu/emacs/emacs-%{version}b.tar.bz2
|
|
|
+Source0: ftp://ftp.gnu.org/pub/gnu/emacs/emacs-%{version}.tar.bz2
|
|
|
#Source0: ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-%{emacsversion}%{?rcversion:-%rcversion}.tar.gz
|
|
|
|
|
|
## Sources from Rawhide 21.2-11
|
|
|
@@ -70,7 +70,7 @@ Patch38: emacs-23.1-103228_103227.patch
|
|
|
# Upstream implemented the change in revno. 101105
|
|
|
Patch40: emacs-23.1-xdg.patch
|
|
|
# http://lists.gnu.org/archive/html/emacs-devel/2012-01/msg00387.html
|
|
|
-Patch41: emacs-23.3-ede-cve-2012-0035.patch
|
|
|
+#Patch41: emacs-23.3-ede-cve-2012-0035.patch
|
|
|
|
|
|
# security patches (from Debian)
|
|
|
|
|
|
@@ -150,7 +150,7 @@ GNU Emacs は拡張性が高く、さまざまなカスタマイズが可能な
|
|
|
%patch37 -p1 -b .xgselect
|
|
|
%patch38 -p0 -b .svn17
|
|
|
%patch40 -p1 -b .xdg
|
|
|
-%patch41 -p1 -b .ede-cve-2012-0035
|
|
|
+#%patch41 -p1 -b .ede-cve-2012-0035
|
|
|
|
|
|
#%patch501 -p1 -b .movemail
|
|
|
|
|
|
@@ -440,6 +440,9 @@ unset PRIORITY
|
|
|
%{_localstatedir}/games/emacs/*
|
|
|
|
|
|
%changelog
|
|
|
+* Mon Jan 30 2012 Munehiro Yamamoto <munepi@vinelinux.org> 23.4-1
|
|
|
+- update to 23.4
|
|
|
+
|
|
|
* Sat Jan 21 2012 Munehiro Yamamoto <munepi@vinelinux.org> 23.3-5
|
|
|
- added patch41 to handle CVE-2012-0035: CEDET global-ede-mode file loading
|
|
|
vulnerability (rhbz#773024)
|
munepi