rpms/openoffice.org/devel openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch, 1.2, 1.3 openoffice.org.spec, 1.1428, 1.1429

[Caolan McNamara (caolanm)]

Author: caolanm

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

Modified Files:
	openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch 
	openoffice.org.spec 
Log Message:
Resolves: rhbz#432654 workaround unopkg quirks

openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch:

Index: openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch	8 Jan 2008 14:51:51 -0000	1.2
+++ openoffice.org-2.3.1.ooo83878.unopkg.enablelinking.patch	13 Feb 2008 20:24:31 -0000	1.3
@@ -367,3 +367,19 @@
      bool option_verbose);
  
  //==============================================================================
+Index: source/pkgchk/unopkg/unopkg_misc.cxx
+===================================================================
+RCS file: /cvs/framework/desktop/source/pkgchk/unopkg/unopkg_misc.cxx,v
+retrieving revision 1.12
+diff -u -r1.12 unopkg_misc.cxx
+--- openoffice.org.orig/desktop/source/pkgchk/unopkg/unopkg_misc.cxx	23 Nov 2007 13:24:35 -0000	1.12
++++ openoffice.org/desktop/source/pkgchk/unopkg/unopkg_misc.cxx	13 Feb 2008 20:22:38 -0000
+@@ -458,7 +458,7 @@
+     }
+     else 
+     {
+-        if (! s_lockfile.check( 0 ))
++        if (!shared && !s_lockfile.check( 0 ))
+         {
+             if (bGui)
+             {


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1428
retrieving revision 1.1429
diff -u -r1.1428 -r1.1429
--- openoffice.org.spec	13 Feb 2008 13:47:43 -0000	1.1428
+++ openoffice.org.spec	13 Feb 2008 20:24:31 -0000	1.1429
@@ -1311,6 +1311,8 @@
 $RPM_BUILD_ROOT/%{instdir}/program/configimport -e file://$RPM_BUILD_ROOT/%{instdir}/share/registry %{PATCH5}
 #rhbz#151356 set a consistent bootstrap value, unfortunately upstream finally picked a different one
 sed -i -e s/org2/org2.0/ $RPM_BUILD_ROOT/%{instdir}/program/bootstraprc
+#give a consistent javasettingsunopkginstall.xml
+$RPM_BUILD_ROOT/%{instdir}/program/unopkg list --shared '-env:JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY=1' '-env:UNO_JAVA_JFW_INSTALL_DATA=$$ORIGIN/../share/config/javasettingsunopkginstall.xml > /dev/null 2>&1 || :
 
 #add the debugging libsalalloc_malloc.so.3 library
 cp -f solver/680/unxlng*.pro/lib/libsalalloc_malloc.so.3 $RPM_BUILD_ROOT/%{instdir}/program
@@ -2871,6 +2873,7 @@
 %changelog
 * Wed Feb 13 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-7.2
 - some multilib helping
+- Resolves: rhbz#432654 workaround unopkg quirks
 
 * Wed Feb 13 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-7.1
 - Resolves: rhbz#432368 parallel build is err... "a little" aggressive