rpms/openoffice.org/devel openoffice.org-multiliblauncher.sh, 1.2, 1.3 openoffice.org.spec, 1.1456, 1.1457

[Caolan McNamara (caolanm)]

Author: caolanm

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

Modified Files:
	openoffice.org-multiliblauncher.sh openoffice.org.spec 
Log Message:
fix up rpath


Index: openoffice.org-multiliblauncher.sh
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-multiliblauncher.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openoffice.org-multiliblauncher.sh	24 Mar 2008 15:44:19 -0000	1.2
+++ openoffice.org-multiliblauncher.sh	28 Mar 2008 09:44:00 -0000	1.3
@@ -10,7 +10,7 @@
 		SECONDARY_LIB_DIR="/usr/lib64"
 		;;
 esac
-if [ ! -x $OOO_LIB_DIR/openoffice.org/program/LAUNCHER ]; then
+if [ ! -x $OOO_LIB_DIR/openoffice.org3.0/program/LAUNCHER ]; then
     OOO_LIB_DIR="$SECONDARY_LIB_DIR"
 fi
-exec $OOO_LIB_DIR/openoffice.org/program/LAUNCHER "$@"
+exec $OOO_LIB_DIR/openoffice.org3.0/program/LAUNCHER "$@"


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1456
retrieving revision 1.1457
diff -u -r1.1456 -r1.1457
--- openoffice.org.spec	27 Mar 2008 15:13:51 -0000	1.1456
+++ openoffice.org.spec	28 Mar 2008 09:44:00 -0000	1.1457
@@ -1,5 +1,5 @@
 %define oootag DEV300
-%define ooomilestone 4
+%define ooomilestone 5
 %define rh_rpm_release 1
 
 # undef to get english only and no-langpacks for a faster smoketest build
@@ -1207,10 +1207,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 ../$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`
+`( (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`
 #end of jakub based suggestion on prelink optimization
 echo build end time is `date`, diskspace: `df -h . | tail -n 1`
 
@@ -1321,7 +1321,11 @@
 popd
 
 #add our custom configuration options
-#default GTK fpicker
+#enable gtk file dialog as the default
+rm -rf $RPM_BUILD_ROOT/%{basisinstdir}/share/registry/modules/org/openoffice/Office/Common/Common-UseOOoFileDialogs.xcu
+#remove dictooo stuff which we disabled in configure
+rm -rf $RPM_BUILD_ROOT/%{basisinstdir}/share/registry/modules/org/openoffice/Office/Common/Common-dicooo.xcu
+#default autorecovery settings
 #$RPM_BUILD_ROOT/%{basisinstdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{basisinstdir}/share/registry %{PATCH2}
 #don't prompt user to agree to license
 #$RPM_BUILD_ROOT/%{basisinstdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{basisinstdir}/share/registry %{PATCH3}
@@ -1462,12 +1466,6 @@
 tar xzf %{SOURCE3} -C $RPM_BUILD_ROOT/%{basisinstdir}/share
 tar xzf %{SOURCE4} -C $RPM_BUILD_ROOT/%{basisinstdir}/share
 
-#enable gtk file dialog as the default
-rm -rf $RPM_BUILD_ROOT/%{basisinstdir}/share/registry/modules/org/openoffice/Office/Common/Common-UseOOoFileDialogs.xcu
-
-#remove dictooo stuff which we disabled in configure
-rm -rf $RPM_BUILD_ROOT/%{basisinstdir}/share/registry/modules/org/openoffice/Office/Common/Common-dicooo.xcu
-
 #remove evolution 1 address book driver
 rm -f $RPM_BUILD_ROOT/%{basisinstdir}/program/libevoab1.so
 
@@ -2856,6 +2854,9 @@
 %{python_py_sitearch}/unohelper.py*
 
 %changelog
+* Fri Mar 28 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.5.1
+- fix up launchers
+
 * Tue Mar 27 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.4.1
 - extend selinux bodge to ia64 
 - drop integrated workspace.notes2.patch