rpms/openoffice.org/devel openoffice.org-multiliblauncher.sh, 1.3, 1.4 openoffice.org.spec, 1.1475, 1.1476

Caolan McNamara (caolanm) fedora-extras-commits at redhat.com
Mon Apr 14 08:17:50 UTC 2008 

Author: caolanm

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

Modified Files:
	openoffice.org-multiliblauncher.sh openoffice.org.spec 
Log Message:
make brand split work sanely


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


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1475
retrieving revision 1.1476
diff -u -r1.1475 -r1.1476
--- openoffice.org.spec	14 Apr 2008 06:51:38 -0000	1.1475
+++ openoffice.org.spec	14 Apr 2008 08:17:15 -0000	1.1476
@@ -1731,12 +1731,19 @@
 
 cp -f %{PATCH1} $RPM_BUILD_ROOT/%{_bindir}/unopkg
 sed -i -e "s/LAUNCHER/unopkg/g" $RPM_BUILD_ROOT/%{_bindir}/unopkg
+sed -i -e "s/BRAND/openoffice.org3\.0/g" $RPM_BUILD_ROOT/%{_bindir}/unopkg
 chmod a+x $RPM_BUILD_ROOT/%{_bindir}/unopkg
 
 cp -f %{PATCH1} $RPM_BUILD_ROOT/%{_bindir}/openoffice.org
 sed -i -e "s/LAUNCHER/soffice/g" $RPM_BUILD_ROOT/%{_bindir}/openoffice.org
+sed -i -e "s/BRAND/openoffice.org3\.0/g" $RPM_BUILD_ROOT/%{_bindir}/openoffice.org
 chmod a+x $RPM_BUILD_ROOT/%{_bindir}/openoffice.org
 
+cp -f %{PATCH1} $RPM_BUILD_ROOT/%{_bindir}/broffice.org
+sed -i -e "s/LAUNCHER/soffice/g" $RPM_BUILD_ROOT/%{_bindir}/broffice.org
+sed -i -e "s/BRAND/broffice.org3\.0/g" $RPM_BUILD_ROOT/%{_bindir}/broffice.org
+chmod a+x $RPM_BUILD_ROOT/%{_bindir}/broffice.org
+
 cp $RPM_BUILD_ROOT/%{_bindir}/openoffice.org $RPM_BUILD_ROOT/%{_bindir}/openoffice.org-2.0
 cp $RPM_BUILD_ROOT/%{_bindir}/openoffice.org $RPM_BUILD_ROOT/%{_bindir}/openoffice.org-1.9
 
@@ -1782,6 +1789,10 @@
   "mv \$1 \`echo \$1 | sed s/officeorg$ICONPRODUCTVERSION/officeorg/\`" -- {} \;
 find . -name "openoffice.org$LONGICONPRODUCTVERSION*" -exec bash -c \
   "mv \$1 \`echo \$1 | sed s/.org$LONGICONPRODUCTVERSION/.org/\`" -- {} \;
+find . -name "brofficeorg$ICONPRODUCTVERSION*" -exec bash -c \
+  "mv \$1 \`echo \$1 | sed s/brofficeorg$ICONPRODUCTVERSION/officeorg/\`" -- {} \;
+find . -name "broffice.org$LONGICONPRODUCTVERSION*" -exec bash -c \
+  "mv \$1 \`echo \$1 | sed s/.org$LONGICONPRODUCTVERSION/.org/\`" -- {} \;
 find . -type l -print -exec ls -lag '{}' \; | gawk '{q="'\''" ; file=$0 ; \
     getline; \
     split($0, ls, " -> "); \
@@ -1793,6 +1804,10 @@
   ./mime-info/openoffice.org.keys
 sed -i -e s/openoffice.org$LONGICONPRODUCTVERSION/openoffice.org/g \
   ./mime-info/openoffice.org.keys
+sed -i -e s/brofficeorg$ICONPRODUCTVERSION/brofficeorg/g \
+  ./mime-info/broffice.org.keys
+sed -i -e s/broffice.org$LONGICONPRODUCTVERSION/broffice.org/g \
+  ./mime-info/broffice.org.keys
 #relocate the rest of them
 cp -r icons $RPM_BUILD_ROOT/%{_datadir}
 cp -r mime-info $RPM_BUILD_ROOT/%{_datadir}
@@ -1810,6 +1825,8 @@
     sed -i -e "s/$ICONPRODUCTVERSION//g" $file
     # rhbz#156677 remove the version from Name=
     sed -i -e "s/$LONGICONPRODUCTVERSION //g" $file
+    # use broffice.org launcher
+    sed -i -e "s/openoffice/broffice/g" $file
 done
 echo "StartupNotify=true" >> base.desktop
 echo "TryExec=oobase" >> base.desktop
@@ -2435,12 +2452,6 @@
 %{basisinstdir}/share/xslt/import/wordml
 #spellchecking lib
 %{basisinstdir}/program/liblnth%{SOPOST}.so
-#launchers
-%{_bindir}/openoffice.org-1.9
-%{_bindir}/openoffice.org-2.0
-%{_bindir}/openoffice.org
-%{_bindir}/ooffice
-%{_bindir}/ooviewdoc
 %{_bindir}/unopkg
 #gnome integration
 %{basisinstdir}/program/gnome-set-default-application
@@ -2493,6 +2504,13 @@
 %{basisinstdir}/program/stocservices.uno.so
 #vba
 %{basisinstdir}/program/oovbaapi.rdb
+#share unopkg
+%dir %{oooinstdir}
+%dir %{oooinstdir}/program
+%{oooinstdir}/program/unopkg
+%{oooinstdir}/program/unopkg.bin
+%{oooinstdir}/program/bootstraprc
+%{oooinstdir}/program/fundamentalrc
 
 %post core
 update-mime-database %{_datadir}/mime > /dev/null
@@ -2535,7 +2553,6 @@
 %{oooinstdir}/THIRDPARTYLICENSEREADME.html
 %dir %{oooinstdir}/program
 %{oooinstdir}/program/about.bmp
-%{oooinstdir}/program/bootstraprc
 %{oooinstdir}/program/crash_report
 %{oooinstdir}/program/intro.bmp
 %dir %{oooinstdir}/program/resource
@@ -2544,8 +2561,6 @@
 %{oooinstdir}/program/soffice.bin
 %{oooinstdir}/program/sofficerc
 %{oooinstdir}/program/spadmin
-%{oooinstdir}/program/unopkg
-%{oooinstdir}/program/unopkg.bin
 %{oooinstdir}/program/versionrc
 %dir %{oooinstdir}/share
 %dir %{oooinstdir}/share/config
@@ -2569,10 +2584,15 @@
 %{oooinstdir}/share/registry/data/org/openoffice/Setup.xcu
 %{oooinstdir}/share/uno_packages
 %{oooinstdir}/share/xdg/
-%{oooinstdir}/program/fundamentalrc
 %{oooinstdir}/program/redirectrc
 %{oooinstdir}/basis-link
 %{_datadir}/applications/openoffice.org-extensionmgr.desktop
+#launchers
+%{_bindir}/openoffice.org-1.9
+%{_bindir}/openoffice.org-2.0
+%{_bindir}/openoffice.org
+%{_bindir}/ooffice
+%{_bindir}/ooviewdoc
 
 %post brand
 update-desktop-database -q %{_datadir}/applications
@@ -2627,6 +2647,8 @@
 %{brinstdir}/program/redirectrc
 %{brinstdir}/basis-link
 %{_datadir}/applications/broffice.org-extensionmgr.desktop
+#launchers
+%{_bindir}/broffice.org
 
 %post -n broffice.org-brand
 update-desktop-database -q %{_datadir}/applications
@@ -3261,6 +3283,8 @@
 - Resolves: rhbz#441128 openoffice.org-3.0.0.ooo88033.svx.a11ycrash.patch
 - migrate system extensions automatically
 - Resolves: rhbz#358021 split up into brand layers and add BrOffice.org
+- try and share unopkg and make a broffice.org launcher to allow both to
+  be installed at the same time
 
 * Mon Apr 07 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.5.3
 - Resolves: rhbz#441112 openoffice.org-3.0.0.ooo85691.vcl.tooltipcolor.patch

More information about the fedora-extras-commits mailing list