rpms/openoffice.org/devel openoffice.org-1.9.128.ooo54479.systemicu.patch, 1.4, 1.5 openoffice.org.spec, 1.531, 1.532

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

Modified Files:
	openoffice.org-1.9.128.ooo54479.systemicu.patch 
	openoffice.org.spec 
Log Message:
roll back on jaxp api change for now

openoffice.org-1.9.128.ooo54479.systemicu.patch:
 config_office/configure.in                              |   52 ++++++++--------
 config_office/set_soenv.in                              |    6 -
 i18npool/inc/collator_unicode.hxx                       |    1 
 i18npool/prj/build.lst                                  |    2 
 i18npool/source/breakiterator/breakiterator_unicode.cxx |   14 ++--
 i18npool/source/breakiterator/makefile.mk               |    8 +-
 i18npool/source/collator/collator_unicode.cxx           |    7 +-
 inc/collator_unicode.hxx                                |    0 
 linguistic/source/hhconvdic.cxx                         |    2 
 prj/build.lst                                           |    0 
 scp2/prj/build.lst                                      |    2 
 scp2/source/ooo/file_library_ooo.scp                    |    4 +
 scp2/source/ooo/makefile.mk                             |    6 +
 scp2/source/ooo/shortcut_ooo.scp                        |   30 ---------
 source/breakiterator/breakiterator_unicode.cxx          |    0 
 source/breakiterator/makefile.mk                        |    0 
 source/collator/collator_unicode.cxx                    |    0 
 source/hhconvdic.cxx                                    |    0 
 vcl/prj/build.lst                                       |    2 
 19 files changed, 65 insertions(+), 71 deletions(-)

Index: openoffice.org-1.9.128.ooo54479.systemicu.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.128.ooo54479.systemicu.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- openoffice.org-1.9.128.ooo54479.systemicu.patch	7 Nov 2005 12:18:22 -0000	1.4
+++ openoffice.org-1.9.128.ooo54479.systemicu.patch	9 Nov 2005 09:07:47 -0000	1.5
@@ -360,7 +360,7 @@
 diff -u -r1.20 breakiterator_unicode.cxx
 --- openoffice.org.orgi/i18npool/source/breakiterator/breakiterator_unicode.cxx	17 Oct 2005 15:42:30 -0000	1.20
 +++ openoffice.org/i18npool/source/breakiterator/breakiterator_unicode.cxx	5 Nov 2005 16:14:56 -0000
-@@ -42,7 +42,9 @@
+@@ -42,7 +42,9 @@ U_CDECL_BEGIN
  extern const char OpenOffice_icu_dat[];
  U_CDECL_END
  
@@ -371,14 +371,18 @@
  using namespace ::com::sun::star::lang;
  using namespace ::rtl;
  
-@@ -90,12 +92,12 @@
+@@ -90,12 +92,14 @@ void SAL_CALL BreakIterator_Unicode::loa
              if ( !U_SUCCESS(status) ) throw ERROR;
  
              status = U_ZERO_ERROR;
 -            aBreakIterator = new RuleBasedBreakIterator(udata_open("OpenOffice", "brk", 
-+            aBreakIterator = new RuleBasedBreakIterator(udata_open("OpenOffice_icu/OpenOffice", "brk", 
-                     OUStringToOString(OUString::createFromAscii(rule)+OUString::createFromAscii("_")+rLocale.Language,
-                     RTL_TEXTENCODING_ASCII_US).getStr(), &status), status);
+-                    OUStringToOString(OUString::createFromAscii(rule)+OUString::createFromAscii("_")+rLocale.Language,
+-                    RTL_TEXTENCODING_ASCII_US).getStr(), &status), status);
++
++            UDataMemory *pData = udata_open("OpenOffice_icu/OpenOffice", "brk", 
++                OUStringToOString(OUString::createFromAscii(rule)+OUString::createFromAscii("_")+rLocale.Language,
++                RTL_TEXTENCODING_ASCII_US).getStr(), &status);
++            aBreakIterator = pData ? new RuleBasedBreakIterator(pData, status) : 0;
              if (!U_SUCCESS(status) ) {
                  status = U_ZERO_ERROR;
 -                aBreakIterator = new RuleBasedBreakIterator(udata_open("OpenOffice", "brk", rule, &status), status);


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.531
retrieving revision 1.532
diff -u -r1.531 -r1.532
--- openoffice.org.spec	8 Nov 2005 15:43:44 -0000	1.531
+++ openoffice.org.spec	9 Nov 2005 09:07:48 -0000	1.532
@@ -1,6 +1,6 @@
 %define oootag SRC680
 %define ooomilestone 138
-%define rh_rpm_release 2
+%define rh_rpm_release 3
 
 %define build_fc5 1
 %define build_fc4 0
@@ -870,7 +870,7 @@
 %patch49 -p1 -b .workspace.cmcfixes20.patch
 %patch50 -p1 -b .ooo56536.sw.rtfcrash.patch
 %patch51 -p1 -b .workspace.cmcfixes21.patch
-%patch52 -p1 -b .workspace.jaxpapi.patch
+# %patch52 -p1 -b .workspace.jaxpapi.patch
 
 %if %{includingexternals}
 #start ludicrous workaround
@@ -951,7 +951,7 @@
 export JAVACOMPILER=`pwd`/solenv/bin/gcj
 %endif
 
-rm -rf external/common/jaxp.jar external/common/parser.jar
+#rm -rf external/common/jaxp.jar external/common/parser.jar
 
 %if ! %{internaljavabits}
 export XML_CLASSPATH=/usr/share/java/xalan-j2.jar:/usr/share/java/xerces-j2.jar
@@ -3241,9 +3241,8 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
-* Tue Nov 08 2005 Caolan McNamara <caolanm at redhat.com> - 1:2.0.1-0.138.2
-- add workspace.jaxpapi.patch
-- ditch buildtime external/common/jaxp.jar external/common/parser.jar
+* Wed Nov 08 2005 Caolan McNamara <caolanm at redhat.com> - 1:2.0.1-0.138.3
+- fix problem with icu rule searching with null locale
 
 * Fri Nov 04 2005 Caolan McNamara <caolanm at redhat.com> - 1:2.0.1-0.138.1
 - drop integrated openoffice.org-1.9.74.ooo41875.mktemp.patch