rpms/openoffice.org/devel openoffice.org.spec,1.331,1.332

[fedora-cvs-commits at redhat.com]

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6216

Modified Files:
	openoffice.org.spec 
Log Message:
rh#158977# clear execstack requirement


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.331
retrieving revision 1.332
diff -u -r1.331 -r1.332
--- openoffice.org.spec	20 Jul 2005 15:10:42 -0000	1.331
+++ openoffice.org.spec	21 Jul 2005 09:31:43 -0000	1.332
@@ -1,5 +1,5 @@
 %define ooo2ver 119
-%define ooo_rpm_release 1
+%define ooo_rpm_release 2
 %define build_fc4 0
 %define build_fc5 1
 
@@ -92,7 +92,7 @@
 BuildRequires: 	boost-devel >= 1.31.0, python-devel, mozilla-devel >= 1.7.5
 BuildRequires: 	expat-devel, libxml2-devel, openldap-devel, neon-devel >= 0.24 
 BuildRequires: 	libidn-devel, startup-notification-devel, libwpd-devel >= 0.8.0
-BuildRequires:	desktop-file-utils >= 0.9, libjpeg-devel, pam-devel
+BuildRequires:	desktop-file-utils >= 0.9, libjpeg-devel, pam-devel, prelink
 BuildRequires:	perl-Archive-Zip, evolution-data-server-devel, libxslt >= 1.1.14
 %if ! %{internalxmlsec}
 BuildRequires:	xmlsec1-nss-devel >= 1.2.8-2
@@ -914,6 +914,9 @@
 cd ../..
 
 %install
+rh#158977# clear execstack requirement
+execstack -c $RPM_BUILD_ROOT/%{instdir}/program/libgcc3_uno.so
+
 # We don't need to carry around all the letter templates for all the languages 
 # in each langpack! In addition, all the bitmaps are the same!
 pushd $RPM_BUILD_ROOT/%{instdir}/share/template
@@ -3015,6 +3018,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Thu Jul 20 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.119-2
+- re-experiment with execshield GNU_STACK non X
+
 * Wed Jul 20 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.119-1
 - experiment with security flags
 - drop integrated cmcfixes11.workspace