[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/openoffice.org/devel openoffice.org.spec,1.413,1.414



Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Log Message:
pic libsoffice.so hack and drop libzip


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.413
retrieving revision 1.414
diff -u -r1.413 -r1.414
--- openoffice.org.spec	24 Aug 2005 10:52:27 -0000	1.413
+++ openoffice.org.spec	24 Aug 2005 11:12:28 -0000	1.414
@@ -941,8 +941,12 @@
 cd ../..
 
 #start of jakub based suggestion on prelink optimization 
-cd desktop/util 
-`(cat ../$OUTPATH.pro/misc/soffice.cmd | sed -e "s/bin\/soffice/lib\/libsoffice.so -shared/" && grep ^lib ../$OUTPATH.pro/misc/pagein-common | cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs | xargs`
+cd desktop/source/app
+sed -e "s/OBJ/SLO/" makefile.mk > makefile.mk.prelink
+mv -f makefile.mk.prelink makefile.mk
+dmake
+cd ../../util
+`(cat ../$OUTPATH.pro/misc/soffice.cmd | sed -e "s/obj/slo/g" | sed -e "s/bin\/soffice/lib\/libsoffice.so -shared/" && grep ^lib ../$OUTPATH.pro/misc/pagein-common | cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs | xargs`
 $LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsoffice -o ../$OUTPATH.pro/bin/soffice
 `( (echo $LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsoffice -o ../$OUTPATH.pro/bin/swriter) && (grep -h ^lib ../$OUTPATH.pro/misc/pagein-writer | cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs ) | xargs`
 `( (echo $LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsoffice -o ../$OUTPATH.pro/bin/scalc) && (grep -h ^lib ../$OUTPATH.pro/misc/pagein-calc| cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs ) | xargs`
@@ -2301,7 +2305,6 @@
 %{instdir}/program/libxsltdlg680*.so
 %{instdir}/program/libxsltfilter680*.so
 %{instdir}/program/libxstor.so
-%{instdir}/program/libzip680*.so
 %{instdir}/program/localebe1.uno.so
 %{instdir}/program/migrationoo2.uno.so
 %{instdir}/program/namingservice.uno.so


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]