updated emacs23-vl.spec

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@5462 ec354946-7b23-47d6-9f5a-488ba84defc7

e/emacs/emacs23-vl.spec

@@ -1,6 +1,6 @@
 %define emacsversion 23.3
 #% define rcversion rc1
-%define emacsrelease 4%{?rcversion:.%rcversion}%{?_dist_release}
+%define emacsrelease 5%{?rcversion:.%rcversion}%{?_dist_release}
 %define vine_default_major_version %(echo %_dist_release|%__sed s/vl//)
 
 %define _noVersionedDependencies 1
@@ -69,7 +69,8 @@ Patch37: emacs-23.3-xgselect.patch
 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
 
 # security patches (from Debian)
 
@@ -101,7 +102,7 @@ Requires(post):    emacsen-common
 Requires(postun):    emacsen-common
 
 BuildRequires: autoconf
-%if %{?_dist_release} == "vl6"
+%if %{?_dist_release} == "vl6" || %{?_dist_release} == "vl7"
 BuildRequires: atk-devel
 BuildRequires: dbus-devel GConf2-devel
 BuildRequires: alsa-lib-devel
@@ -111,7 +112,7 @@ BuildRequires: freetype-devel, fontconfig-devel
 BuildRequires: libpng-devel, libjpeg-devel, libtiff-devel, libungif-devel
 ##!! For vl5, m17n-lib-devel (plus)
 BuildRequires: librsvg2-devel, libotf-devel
-%if %{?_dist_release} == "vl6"
+%if %{?_dist_release} == "vl6" || %{?_dist_release} == "vl7"
 BuildRequires: m17n-lib-devel
 %endif
 BuildRequires: libX11-devel, libXau-devel, libXdmcp-devel, libXrender-devel
@@ -149,6 +150,7 @@ GNU Emacs は拡張性が高く、さまざまなカスタマイズが可能な
 %patch37 -p1 -b .xgselect
 %patch38 -p0 -b .svn17
 %patch40 -p1 -b .xdg
+%patch41 -p1 -b .ede-cve-2012-0035
 
 #%patch501 -p1 -b .movemail
 
@@ -166,14 +168,15 @@ export PATH="$PATH:/sbin:/usr/sbin"
 %configure --with-pop --with-sound \
     --libexecdir=%{_libdir} --infodir=%{infodir} \
     --disable-rename \
-    --with-x-toolkit=gtk \
-    --with-xft \
+    --with-toolkit=gtk \
+    --with-freetype --with-xft \
+    --enable-font-backend \
     --without-gpm \
-    --with-libotf \
+	--with-libotf \
 %if %{?_dist_release} == "vl5"
       --without-m17n-flt \
 %endif
-%if %{?_dist_release} == "vl6"
+%if %{?_dist_release} == "vl6" || %{?_dist_release} == "vl7"
       --with-m17n-flt \
       --with-dbus --with-gconf \
 %endif
@@ -437,6 +440,10 @@ unset PRIORITY
 %{_localstatedir}/games/emacs/*
 
 %changelog
+* 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)
+
 * Fri Jan 06 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 23.3-4
 - update to 23.3b
 - add patch36: Check for _NET_WM_STATE_HIDDEN (rhbz#711739)