rpms/openoffice.org/devel openoffice.org-1.9.87.rh151357.patch, NONE, 1.1 openoffice.org.spec, 1.105, 1.106

Tue Mar 22 08:35:34 UTC 2005

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1332

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-1.9.87.rh151357.patch 
Log Message:
respin

openoffice.org-1.9.87.rh151357.patch:
 desktop/source/app/langselect.cxx |    4 ++++
 source/app/langselect.cxx         |    0 
 2 files changed, 4 insertions(+)

--- NEW FILE openoffice.org-1.9.87.rh151357.patch ---
Index: source/app/langselect.cxx
===================================================================
RCS file: /cvs/framework/desktop/source/app/langselect.cxx,v
retrieving revision 1.13
diff -u -p -r1.13 langselect.cxx
--- openoffice.org.orig/desktop/source/app/langselect.cxx	27 Jan 2005 12:27:15 -0000	1.13
+++ openoffice.org/desktop/source/app/langselect.cxx	21 Mar 2005 19:35:47 -0000
@@ -238,6 +238,9 @@ Sequence< OUString > LanguageSelection::
 
 sal_Bool LanguageSelection::isInstalledLanguage(OUString& usLocale, sal_Bool bExact)
 {
+#if 1
+    return true;
+#else
     sal_Bool bInstalled = sal_False;
     Sequence< OUString > seqLanguages = getInstalledLanguages();
     for (sal_Int32 i=0; i<seqLanguages.getLength(); i++)
@@ -266,6 +269,7 @@ sal_Bool LanguageSelection::isInstalledL
         }
     }
     return bInstalled;
+#endif
 }
 
 OUString LanguageSelection::getFirstInstalledLanguage()


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- openoffice.org.spec	21 Mar 2005 16:21:41 -0000	1.105
+++ openoffice.org.spec	22 Mar 2005 08:35:32 -0000	1.106
@@ -8,7 +8,7 @@
 Summary:        OpenOffice.org comprehensive office suite.
 Name:           openoffice.org
 Version:        1.9.%{ooo2ver}
-Release: 	1
+Release: 	2
 Epoch:		1
 License:	LGPL/SISSL
 Group:		Applications/Productivity
@@ -53,6 +53,7 @@
 Patch21: openoffice.org-1.9.87.warnnoterroronmissing.patch
 Patch22: openoffice.org-1.9.87.NONE.sysui.parallel.patch
 Patch23: openoffice.org-1.9.87.ooo43538.sfx2.patch
+Patch24: openoffice.org-1.9.87.rh151357.patch
 
 %define instdir %{_libdir}/openoffice.org%{version}
 
@@ -555,6 +556,7 @@
 %patch21 -p1 -b .warnnoterroronmissing.patch
 %patch22 -p1 -b .sysui.parallel.patch
 %patch23 -p1 -b .ooo43538.sfx2.patch
+%patch24 -p1 -b .rh151357.patch
 cd solenv/bin
 tar xvzf %{SOURCE2} Archive-Zip-1.13/lib
 cd ../..
@@ -1406,6 +1408,35 @@
 %{instdir}/program/libemboleobj.so
 %{instdir}/program/libevoab1.so
 %{instdir}/program/libevtatt.so
+%{instdir}/program/crash_report    
+%{instdir}/program/crash_report.bin
+%{instdir}/program/libegi680*.so    
+%{instdir}/program/libeme680*.so
+%{instdir}/program/libemp680*.so    
+%{instdir}/program/libepb680*.so
+%{instdir}/program/libepg680*.so    
+%{instdir}/program/libepp680*.so
+%{instdir}/program/libeps680*.so    
+%{instdir}/program/libept680*.so
+%{instdir}/program/libera680*.so    
+%{instdir}/program/libeti680*.so
+%{instdir}/program/libexp680*.so    
+%{instdir}/program/libfwm680*.so
+%{instdir}/program/libicd680*.so
+%{instdir}/program/libicg680*.so
+%{instdir}/program/libidx680*.so
+%{instdir}/program/libime680*.so
+%{instdir}/program/libipb680*.so
+%{instdir}/program/libipd680*.so
+%{instdir}/program/libips680*.so
+%{instdir}/program/libipt680*.so
+%{instdir}/program/libipx680*.so
+%{instdir}/program/libira680*.so
+%{instdir}/program/libitg680*.so
+%{instdir}/program/libiti680*.so
+%{instdir}/program/libofficebean.so
+%{instdir}/program/libportaudio.so.*
+%{instdir}/program/libsndfile.so.*
 %{instdir}/program/libfile680*.so
 %{instdir}/program/libfileacc.so
 %{instdir}/program/libfilterconfig1.so
@@ -2140,6 +2171,10 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Tue Mar 22 2005 Caolan McNamara <caolanm at redhat.com> 1:1.9.87-2
+- unpackaged libraries
+- try out more lenient LOCALE acceptence for rh#151357#
+
 * Sat Mar 19 2005 Caolan McNamara <caolanm at redhat.com> 1:1.9.87-1
 - bump to latest version
 - rh#151356# stick to 2.0 pathname to keep user settings during pre-release cycle


