rpms/openoffice.org/devel openoffice.org.spec,1.1553,1.1554

[Caolan McNamara (caolanm)]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Log Message:
libsoffice -> libsofficeapp


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1553
retrieving revision 1.1554
diff -u -r1.1553 -r1.1554
--- openoffice.org.spec	3 Jul 2008 19:47:28 -0000	1.1553
+++ openoffice.org.spec	3 Jul 2008 22:06:35 -0000	1.1554
@@ -1371,10 +1371,10 @@
 
 #start of jakub based suggestion on prelink optimization 
 cd ../../../../desktop/util
-`( (echo $LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN:$ORIGIN/../basis-link/program:$ORIGIN/../basis-link/ure-link/lib' -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:$ORIGIN/../basis-link/program:$ORIGIN/../basis-link/ure-link/lib' -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:$ORIGIN/../basis-link/program:$ORIGIN/../basis-link/ure-link/lib' -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:$ORIGIN/../basis-link/program:$ORIGIN/../basis-link/ure-link/lib' -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`
+`( (echo $LINK -Wl,-z,combreloc -Wl,-z,defs -Wl,-rpath,'$ORIGIN:$ORIGIN/../basis-link/program:$ORIGIN/../basis-link/ure-link/lib' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsofficeapp ../$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:$ORIGIN/../basis-link/program:$ORIGIN/../basis-link/ure-link/lib' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsofficeapp ../$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:$ORIGIN/../basis-link/program:$ORIGIN/../basis-link/ure-link/lib' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsofficeapp ../$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:$ORIGIN/../basis-link/program:$ORIGIN/../basis-link/ure-link/lib' -Wl,-export-dynamic -Wl,--noinhibit-exec $SOLARLIB -L../$OUTPATH.pro/lib -lsofficeapp ../$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`
 
@@ -2283,7 +2283,7 @@
 %{basisinstdir}/program/simplecanvas.uno.so
 %{basisinstdir}/program/slideshow.uno.so
 %{basisinstdir}/program/setofficelang*
-%{basisinstdir}/program/libsoffice.so
+%{basisinstdir}/program/libsofficeapp.so
 %{basisinstdir}/program/spadmin.bin
 %{basisinstdir}/program/stringresource%{SOPOST}.uno.so
 %{basisinstdir}/program/svtmisc.uno.so