rpms/openoffice.org/devel openoffice.org.spec, 1.1440.2.30, 1.1440.2.31

[Caolan McNamara (caolanm)]

Author: caolanm

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

Modified Files:
      Tag: openoffice_org-2_4_0-9_1_999_fc9
	openoffice.org.spec 
Log Message:
tweak pre-launchers


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1440.2.30
retrieving revision 1.1440.2.31
diff -u -r1.1440.2.30 -r1.1440.2.31
--- openoffice.org.spec	24 Mar 2008 16:11:39 -0000	1.1440.2.30
+++ openoffice.org.spec	25 Mar 2008 12:18:11 -0000	1.1440.2.31
@@ -1187,10 +1187,10 @@
 
 #start of jakub based suggestion on prelink optimization 
 cd ../../../../desktop/util
-`( (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`
-`( (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/simpress) && (grep -h ^lib ../$OUTPATH.pro/misc/pagein-impress| 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/sdraw) && (grep -h ^lib ../$OUTPATH.pro/misc/pagein-draw| 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 ../$OUTPATH.pro/obj/main.o ../$OUTPATH.pro/obj/copyright_ascii_ooo.o -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 ../$OUTPATH.pro/obj/main.o ../$OUTPATH.pro/obj/copyright_ascii_ooo.o -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`
+`( (echo $LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsoffice ../$OUTPATH.pro/obj/main.o ../$OUTPATH.pro/obj/copyright_ascii_ooo.o -o ../$OUTPATH.pro/bin/simpress) && (grep -h ^lib ../$OUTPATH.pro/misc/pagein-impress| 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 ../$OUTPATH.pro/obj/main.o ../$OUTPATH.pro/obj/copyright_ascii_ooo.o -o ../$OUTPATH.pro/bin/sdraw) && (grep -h ^lib ../$OUTPATH.pro/misc/pagein-draw| cut -c 4- | cut -d "." -f 1 | awk '{ print "-l"$0 }') | xargs ) | xargs`
 #end of jakub based suggestion on prelink optimization
 echo build end time is `date`, diskspace: `df -h . | tail -n 1`
 
@@ -1212,8 +1212,6 @@
     echo - ---dump log end---
     dmake openoffice_en-US
 fi
-cp -f ../../desktop/$OUTPATH.pro/lib/libsoffice.so $RPM_BUILD_ROOT/%{instdir}/program
-cp -f ../../desktop/$OUTPATH.pro/bin/soffice $RPM_BUILD_ROOT/%{instdir}/program/soffice.bin
 cp -f ../../desktop/$OUTPATH.pro/bin/swriter $RPM_BUILD_ROOT/%{instdir}/program/swriter.bin
 cp -f ../../desktop/$OUTPATH.pro/bin/scalc $RPM_BUILD_ROOT/%{instdir}/program/scalc.bin
 cp -f ../../desktop/$OUTPATH.pro/bin/simpress $RPM_BUILD_ROOT/%{instdir}/program/simpress.bin