Fix version in changelog

emacs-bz11580-eudc-bbdb.patch

@@ -0,0 +1,47 @@
+From: Sergio Durigan Junior <sergiodj@riseup.net>
+Date: Tue, 02 Oct 2012 05:10:16 +0000
+Subject: Bugfix for EUDCB-BBDB queries.
+
+* net/eudcb-bbdb.el (eudc-bbdb-format-record-as-result): Fix
+querying BBDB for entries without a last name.
+
+2012-10-02  Sergio Durigan Junior  <sergiodj@riseup.net>
+
+	* net/eudcb-bbdb.el (eudc-bbdb-format-record-as-result): Fix
+	querying BBDB for entries without a last name (Bug#11580).
+
+Index: emacs-23.3/lisp/net/eudcb-bbdb.el
+===================================================================
+--- emacs-23.3.orig/lisp/net/eudcb-bbdb.el
++++ emacs-23.3/lisp/net/eudcb-bbdb.el
+@@ -169,18 +169,18 @@ The record is filtered according to `eud
+ 				  (symbol-name attr)))
+ 			 'record))))
+        (t
+-	(setq val "Unknown BBDB attribute")))
+-      (if val
+-	(cond
+-	 ((memq attr '(phones addresses))
+-	  (setq eudc-rec (append val eudc-rec)))
+-	 ((and (listp val)
+-	  (= 1 (length val)))
+-	  (setq eudc-rec (cons (cons attr (car val)) eudc-rec)))
+-	 ((> (length val) 0)
+-	  (setq eudc-rec (cons (cons attr val) eudc-rec)))
+-	 (t
+-	  (error "Unexpected attribute value")))))
++	(error "Unknown BBDB attribute")))
++      (cond
++       ((or (not val) (equal val ""))) ; do nothing
++       ((memq attr '(phones addresses))
++	(setq eudc-rec (append val eudc-rec)))
++       ((and (listp val)
++	     (= 1 (length val)))
++	(setq eudc-rec (cons (cons attr (car val)) eudc-rec)))
++       ((> (length val) 0)
++	(setq eudc-rec (cons (cons attr val) eudc-rec)))
++       (t
++	(error "Unexpected attribute value"))))
+     (nreverse eudc-rec)))
+ 
+ 

emacs-cve-2012-3479.patch

@@ -0,0 +1,33 @@
+*** emacs-24.1/lisp/files.el~	2012-08-13 10:54:50.256181658 +0800
+--- emacs-24.1/lisp/files.el	2012-08-13 10:54:58.076181990 +0800
+***************
+*** 3107,3117 ****
+  	      ;; Obey `enable-local-eval'.
+  	      ((eq var 'eval)
+  	       (when enable-local-eval
+! 		 (push elt all-vars)
+! 		 (or (eq enable-local-eval t)
+! 		     (hack-one-local-variable-eval-safep (eval (quote val)))
+! 		     (safe-local-variable-p var val)
+! 		     (push elt unsafe-vars))))
+  	      ;; Ignore duplicates (except `mode') in the present list.
+  	      ((and (assq var all-vars) (not (eq var 'mode))) nil)
+  	      ;; Accept known-safe variables.
+--- 3107,3122 ----
+  	      ;; Obey `enable-local-eval'.
+  	      ((eq var 'eval)
+  	       (when enable-local-eval
+! 		 (let ((safe (or (hack-one-local-variable-eval-safep
+! 				  (eval (quote val)))
+! 				 ;; In case previously marked safe (bug#5636).
+! 				 (safe-local-variable-p var val))))
+! 		   ;; If not safe and e-l-v = :safe, ignore totally.
+! 		   (when (or safe (not (eq enable-local-variables :safe)))
+! 		     (push elt all-vars)
+! 		     (or (eq enable-local-eval t)
+! 			 safe
+! 			 (push elt unsafe-vars))))))
+  	      ;; Ignore duplicates (except `mode') in the present list.
+  	      ((and (assq var all-vars) (not (eq var 'mode))) nil)
+  	      ;; Accept known-safe variables.
+

emacs.spec

@@ -3,7 +3,7 @@ Summary: GNU Emacs text editor
 Name: emacs
 Epoch: 1
 Version: 24.1
-Release: 2%{?dist}
+Release: 7%{?dist}
 License: GPLv3+
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
@@ -31,7 +31,12 @@ Patch7: emacs-spellchecker.patch
 # rhbz#830162
 Patch8: emacs-locate-library.patch
 
-BuildRequires: atk-devel, cairo-devel, freetype-devel, fontconfig-devel, dbus-devel, giflib-devel, glibc-devel, gtk3-devel, libpng-devel
+# rhbz#847702
+Patch9: emacs-cve-2012-3479.patch
+# Fix for Emacs bug #11580.
+Patch10: emacs-bz11580-eudc-bbdb.patch
+
+BuildRequires: atk-devel, cairo-devel, freetype-devel, fontconfig-devel, dbus-devel, giflib-devel, glibc-devel, gtk2-devel, libpng-devel
 BuildRequires: libjpeg-devel, libtiff-devel, libX11-devel, libXau-devel, libXdmcp-devel, libXrender-devel, libXt-devel
 BuildRequires: libXpm-devel, ncurses-devel, xorg-x11-proto-devel, zlib-devel, gnutls-devel
 BuildRequires: librsvg2-devel, m17n-lib-devel, libotf-devel, ImageMagick-devel, libselinux-devel
@@ -47,7 +52,7 @@ BuildRequires: util-linux
 %endif
 Requires: desktop-file-utils
 # Emacs doesn't run without these fonts, rhbz#732422
-Requires: xorg-x11-fonts-misc
+Requires: dejavu-sans-mono-fonts
 Requires(preun): %{_sbindir}/alternatives
 Requires(posttrans): %{_sbindir}/alternatives
 Requires: emacs-common = %{epoch}:%{version}-%{release}
@@ -152,6 +157,8 @@ packages that add functionality to Emacs.
 %patch0 -p1 -b .glibc-open-macro
 %patch7 -p1 -b .spellchecker
 %patch8 -p1 -b .locate-library
+%patch9 -p1 -b .cve-2012-3479
+%patch10 -p1 -b .emacs-bz11580-eudc-bbdb
 
 # Install site-lisp files
 cp %SOURCE7 %SOURCE10 site-lisp
@@ -208,7 +215,7 @@ mkdir build-gtk && cd build-gtk
 ln -s ../configure .
 
 %configure --with-dbus --with-gif --with-jpeg --with-png --with-rsvg \
-           --with-tiff --with-xft --with-xpm --with-x-toolkit=gtk3 --with-gpm=no \
+           --with-tiff --with-xft --with-xpm --with-x-toolkit=gtk --with-gpm=no \
 	   --with-wide-int
 make bootstrap
 %{setarch} make %{?_smp_mflags}
@@ -436,6 +443,23 @@ update-desktop-database &> /dev/null || :
 %dir %{_datadir}/emacs/site-lisp/site-start.d
 
 %changelog
+* Tue Nov 06 2012 Sergio Durigan Junior <sergiodj@riseup.net> - 1:24.1-7
+- Fix for Emacs bug #11580, 'Fix querying BBDB for entries without a last
+  name'.
+
+* Mon Oct 22 2012 Karel Klíč <kklic@redhat.com> - 1:24.1-6
+- Rebuild
+
+* Mon Oct 22 2012 Karel Klíč <kklic@redhat.com> - 1:24.1-5
+- Change xorg-x11-fonts-misc dependency to dejavu-sans-mono-fonts, rhbz#732422
+
+* Mon Aug 13 2012 Karel Klíč <kklic@redhat.com> - 1:24.1-4
+- Fix CVE-2012-3479: Evaluation of 'eval' forms in file-local variable
+  sections, when 'enable-local-variables' set to ':safe'
+
+* Fri Jul 13 2012 Karel Klíč <kklic@redhat.com> - 1:24.1-3
+- Revert the switch from GTK 3 to GTK 2 for this release
+
 * Wed Jul 11 2012 Karel Klíč <kklic@redhat.com> - 1:24.1-2
 - Fix org-mode to work without emacs-el installed.
   rhbz#830162