|
|
@@ -1,6 +1,6 @@
|
|
|
%define emacsversion 22.3
|
|
|
#%%define cvsdate 20060403
|
|
|
-%define emacsrelese 10%{?_dist_release}
|
|
|
+%define emacsrelese 13%{?_dist_release}
|
|
|
|
|
|
%define _noVersionedDependencies 1
|
|
|
%define prereq_ge() %(LC_ALL="C" rpm -q --queryformat 'PreReq:%%{NAME} >= %%{VERSION}' %1| grep -v "is not")
|
|
|
@@ -52,9 +52,15 @@ Patch11: emacs-22.1-locallisppath.patch
|
|
|
# remove this patch, if python-2.2 arrives
|
|
|
Patch13: no-python-mode.patch
|
|
|
Patch20: emacs-22.0.50-fixed-resolution.patch
|
|
|
+Patch30: emacs-22.3-gcc44.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: emacs22-CVE-2010-0825-fix-movemail-race.diff
|
|
|
+
|
|
|
# patches from Mandrake
|
|
|
Patch1001: emacs-21.1-bzip2.patch.bz2
|
|
|
|
|
|
@@ -72,7 +78,8 @@ Obsoletes: emacs21 <= 21.2-0vl7
|
|
|
Obsoletes: emacs22 <= 22.0.50
|
|
|
Provides: emacs22 = %{version}
|
|
|
Provides: emacsen = 0.1
|
|
|
-%prereq_ge emacsen-common
|
|
|
+Requires(post): emacsen-common
|
|
|
+Requires(postun): emacsen-common
|
|
|
|
|
|
# Emcws
|
|
|
#Requires: libcanna
|
|
|
@@ -109,6 +116,12 @@ Emacs は拡張性が高く、さまざまなカスタマイズが可能な高
|
|
|
#%patch12 -p1
|
|
|
%patch20 -p1
|
|
|
|
|
|
+%if %{?_dist_release} == "vl6"
|
|
|
+%patch30 -p1 -b .gcc44
|
|
|
+%endif
|
|
|
+
|
|
|
+%patch501 -p1 -b .movemail
|
|
|
+
|
|
|
%patch1001 -p1
|
|
|
|
|
|
autoconf
|
|
|
@@ -374,6 +387,16 @@ fi
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Fri Apr 02 2010 Munehiro Yamamoto <munepi@vinelinux.org> 22.3-13
|
|
|
+- new toolchain build for VineSeed
|
|
|
+ - applied emacs-22.3-gcc44.patch
|
|
|
+
|
|
|
+* Thu Apr 01 2010 Munehiro Yamamoto <munepi@vinelinux.org> 22.3-12
|
|
|
+- applied security fix emacs23-CVE-2010-0825-fix-movemail-race.diff from Ubuntu
|
|
|
+
|
|
|
+* Wed Feb 10 2010 Munehiro Yamamoto <munepi@vinelinux.org> 22.3-11
|
|
|
+- added Requires(post): emacsen-common, Requires(postun): emacsen-common
|
|
|
+
|
|
|
* Mon Jan 18 2010 Munehiro Yamamoto <munepi@vinelinux.org> 22.3-10
|
|
|
- updated vine-default-base.el (See [vine-users:079919])
|
|
|
- renamed emacs22.desktop to emacs22.desktop.in
|
munepi