rpms/xemacs/devel xemacs.spec,1.20,1.21

Ville Skytta (scop) fedora-extras-commits at redhat.com
Sun Mar 19 09:47:31 UTC 2006


Author: scop

Update of /cvs/extras/rpms/xemacs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27976/devel

Modified Files:
	xemacs.spec 
Log Message:
* Sat Mar 18 2006 Ville Skyttä <ville.skytta at iki.fi> - 21.4.19-3
- Build without -fstack-protector by default for now (#183643).



Index: xemacs.spec
===================================================================
RCS file: /cvs/extras/rpms/xemacs/devel/xemacs.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- xemacs.spec	11 Feb 2006 13:11:48 -0000	1.20
+++ xemacs.spec	19 Mar 2006 09:47:31 -0000	1.21
@@ -2,13 +2,14 @@
 %bcond_with     xaw3d
 %bcond_without  debug
 %bcond_without  mule
+%bcond_with     stackprot
 
 %define pkgdir  %{_datadir}/xemacs
 %define exectop %{_libdir}/xemacs-%{version}
 
 Name:           xemacs
 Version:        21.4.19
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Different version of Emacs
 
 Group:          Applications/Editors
@@ -186,7 +187,12 @@
 
 
 %build
-export CFLAGS="${CFLAGS:-$RPM_OPT_FLAGS -fno-strict-aliasing}"
+CFLAGS="${CFLAGS:-$RPM_OPT_FLAGS -fno-strict-aliasing}"
+%if ! %{with stackprot}
+CFLAGS="$(echo $CFLAGS | sed -e 's/-fstack-protector\s*//g')"
+CFLAGS="$(echo $CFLAGS | sed -e 's/--param=ssp-buffer-size=[0-9]\+\s*//')"
+%endif
+export CFLAGS
 
 # XEmacs still uses Autoconf 2.13 and doesn't know --sbindir, --sysconfdir,
 #   --includedir, --libexecdir, --localstatedir, --sharedstatedir
@@ -449,6 +455,9 @@
 
 
 %changelog
+* Sat Mar 18 2006 Ville Skyttä <ville.skytta at iki.fi> - 21.4.19-3
+- Build without -fstack-protector by default for now (#183643).
+
 * Thu Feb  2 2006 Ville Skyttä <ville.skytta at iki.fi> - 21.4.19-2
 - 21.4.19, X paths patch mostly applied upstream.
 




More information about the fedora-extras-commits mailing list