rpms/emacs/devel emacs.spec,1.60,1.61

[fedora-cvs-commits at redhat.com]

Author: petersen

Update of /cvs/dist/rpms/emacs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16611

Modified Files:
	emacs.spec 
Log Message:
- avoid building with -fstack-protector on i386 to prevent crashing
  (Jonathan Kamens, #174730)
- require xorg-x11-fonts-ISO8859-1-75dpi instead of xorg-x11-fonts-75dpi
  for modular X (#174614)



Index: emacs.spec
===================================================================
RCS file: /cvs/dist/rpms/emacs/devel/emacs.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- emacs.spec	9 Dec 2005 22:40:19 -0000	1.60
+++ emacs.spec	14 Dec 2005 08:23:54 -0000	1.61
@@ -11,7 +11,7 @@
 Summary: GNU Emacs text editor
 Name: emacs
 Version: 21.4
-Release: 10.1
+Release: 11
 License: GPL
 URL: http://www.gnu.org/software/emacs/
 Group: Applications/Editors
@@ -60,7 +60,7 @@
 Buildrequires: autoconf, gtk2-devel
 %endif
 Buildrequires: libX11-devel, libpng-devel, libjpeg-devel, libungif-devel, libtiff-devel
-Requires: xorg-x11-fonts-75dpi
+Requires: xorg-x11-fonts-ISO8859-1-75dpi
 %ifarch %{ix86}
 BuildRequires: setarch
 %endif
@@ -283,6 +283,12 @@
 
 %build
 export CFLAGS="-DMAIL_USE_LOCKF $RPM_OPT_FLAGS"
+
+# stack-protector causes crashing on i386 (#174730)
+%ifarch %{ix86}
+CFLAGS=`echo $CFLAGS | sed -e "s/ -fstack-protector//"`
+%endif
+
 %configure --with-pop --with-sound \
 %if ! %{emacs21}
   --with-gtk --without-xim
@@ -529,6 +535,12 @@
 %endif
 
 %changelog
+* Wed Dec 14 2005 Jens Petersen <petersen at redhat.com> - 21.4-11
+- avoid building with -fstack-protector on i386 to prevent crashing
+  (Jonathan Kamens, #174730)
+- require xorg-x11-fonts-ISO8859-1-75dpi instead of xorg-x11-fonts-75dpi
+  for modular X (#174614)
+
 * Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
 - rebuilt