rpms/openoffice.org/devel openoffice.org.spec,1.1380,1.1381

Caolan McNamara (caolanm) fedora-extras-commits at redhat.com
Fri Jan 11 10:46:23 UTC 2008


Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7643

Modified Files:
	openoffice.org.spec 
Log Message:
no longer need to manually unexecstack libgcc3_uno


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1380
retrieving revision 1.1381
diff -u -r1.1380 -r1.1381
--- openoffice.org.spec	11 Jan 2008 10:34:22 -0000	1.1380
+++ openoffice.org.spec	11 Jan 2008 10:45:44 -0000	1.1381
@@ -57,7 +57,7 @@
 Source5:        http://www.openoffice.org/nonav/issues/showattachment.cgi/36775/ooo64726.sdf
 Source6:        http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll
 BuildRequires:	tcsh, zip, findutils, autoconf, flex, bison, ant, icu, gcc-c++
-BuildRequires:  perl-Compress-Zlib, binutils, unixODBC-devel, xalan-j2, prelink
+BuildRequires:  perl-Compress-Zlib, binutils, unixODBC-devel, xalan-j2
 BuildRequires:	gdb, %{java_devel}, zlib-devel, vigra-devel, hsqldb, libXt-devel
 BuildRequires:	freetype-devel, gtk2-devel, gnome-vfs2-devel, cups-devel, bsh
 BuildRequires:	libcurl-devel, boost-devel, python-devel, expat-devel
@@ -1313,9 +1313,6 @@
 #add the debugging libsalalloc_malloc.so.3 library
 cp -f solver/680/unxlng*.pro/lib/libsalalloc_malloc.so.3 $RPM_BUILD_ROOT/%{instdir}/program
 
-#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




More information about the fedora-extras-commits mailing list