rpms/openoffice.org/devel openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch, 1.1, 1.1.2.1 openoffice.org-1.9.97.rh156067.noversionedsysui.patch, 1.3, NONE

Caolan McNamara (caolanm) fedora-extras-commits at redhat.com
Thu Mar 6 19:06:26 UTC 2008


Author: caolanm

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

Modified Files:
      Tag: openoffice_org-2_4_0-9_1_999_fc9
	openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch 
Removed Files:
      Tag: openoffice_org-2_4_0-9_1_999_fc9
	openoffice.org-1.9.97.rh156067.noversionedsysui.patch 
Log Message:
merge to branch

openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch:

Index: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch	14 Feb 2008 11:05:57 -0000	1.1
+++ openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch	6 Mar 2008 19:06:15 -0000	1.1.2.1
@@ -17,7 +17,7 @@
 +        set -- $@ '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1'
 +    fi
 +    echo $@ | grep -q env:UNO_JAVA_JFW_INSTALL_DATA
-+    if [ $? -ne 0 ]; then
++    if [ $? -ne 0 -a -w $sd_prog/../share/config/javasettingsunopkginstall.xml ];
 +        set -- $@ '-env:UNO_JAVA_JFW_INSTALL_DATA=$$ORIGIN/../share/config/javasettingsunopkginstall.xml'
 +    fi
 +    echo $@ | grep -q env:UserInstallation


--- openoffice.org-1.9.97.rh156067.noversionedsysui.patch DELETED ---




More information about the fedora-extras-commits mailing list