Thu Mar 31 13:18:15 UTC 2005

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

Modified Files:
	openoffice.org-1.9.87.rh151357.patch 
	openoffice.org-1.9.88.NONE.gcc3gcj4.patch openoffice.org.spec 
Added Files:
	openoffice.org-1.9.88.ooo46217.allowfallbacktoenUSfromotherenglish.patch 
	openoffice.org-1.9.88.rh133741.alwaysgtk.patch 
	openoffice.org-1.9.88.rh150650.gcjneedstoresolveallrequirements.patch 
	openoffice.org-1.9.89.ooo46228.parallel.solenv.patch 
	openoffice.org-1.9.89.ooo46316.parallel.vcl.patch 
	openoffice.org-1.9.89.ooo46389.parallel.framework.patch 
Removed Files:
	openoffice.org-1.9.87.NONE.sysui.parallel.patch 
	openoffice.org-1.9.87.NONE.wizards.broken.patch 
Log Message:
try out some cool things

openoffice.org-1.9.88.ooo46217.allowfallbacktoenUSfromotherenglish.patch:
 source/rc/resmgr.cxx       |    0 
 tools/source/rc/resmgr.cxx |   19 +++++++++++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

--- NEW FILE openoffice.org-1.9.88.ooo46217.allowfallbacktoenUSfromotherenglish.patch ---
Index: source/rc/resmgr.cxx
===================================================================
RCS file: /cvs/util/tools/source/rc/resmgr.cxx,v
retrieving revision 1.37
diff -u -p -r1.37 resmgr.cxx
--- openoffice.org.orig/tools/source/rc/resmgr.cxx	18 Mar 2005 17:45:56 -0000	1.37
+++ openoffice.org/tools/source/rc/resmgr.cxx	29 Mar 2005 14:56:58 -0000
@@ -372,6 +372,21 @@ void ResMgrContainer::init()
     #endif
 }
 
+namespace 
+{
+    bool IsAmericanEnglish(const com::sun::star::lang::Locale &rLocale)
+    {
+        if ( 
+             rLocale.Language.equalsIgnoreAsciiCaseAscii("en") && 
+             rLocale.Country.equalsIgnoreAsciiCaseAscii("US")
+           )
+        {
+            return true;
+        }
+        return false;
+    }
+}
+
 InternalResMgr* ResMgrContainer::getResMgr( const OUString& rPrefix,
                                             com::sun::star::lang::Locale& rLocale,
                                             bool bForceNewInstance
@@ -414,7 +429,7 @@ InternalResMgr* ResMgrContainer::getResM
             }
             break;
         }
-        if( nTries == 0 && !aLocale.Language.equalsIgnoreAsciiCaseAscii( "en" ) )
+        if( nTries == 0 && !IsAmericanEnglish(aLocale) )
         {
             // locale fallback failed
             // fallback to en-US locale
@@ -503,7 +518,7 @@ InternalResMgr* ResMgrContainer::getNext
         aLocale.Variant = OUString();
     else if( aLocale.Country.getLength() )
         aLocale.Country = OUString();
-    else if( ! aLocale.Language.equalsIgnoreAsciiCaseAscii( "en" ) )
+    else if( !IsAmericanEnglish(aLocale) )
     {
         aLocale.Language = OUString( RTL_CONSTASCII_USTRINGPARAM( "en" ) );
         aLocale.Country = OUString( RTL_CONSTASCII_USTRINGPARAM( "US" ) );

openoffice.org-1.9.88.rh133741.alwaysgtk.patch:
 desktop/scripts/soffice.sh |    2 ++
 scripts/soffice.sh         |    0 
 2 files changed, 2 insertions(+)

--- NEW FILE openoffice.org-1.9.88.rh133741.alwaysgtk.patch ---
Index: scripts/soffice.sh
===================================================================
RCS file: /cvs/framework/desktop/scripts/soffice.sh,v
retrieving revision 1.13
diff -u -p -r1.13 soffice.sh
--- openoffice.org.orig/desktop/scripts/soffice.sh	26 Nov 2004 14:48:50 -0000	1.13
+++ openoffice.org/desktop/scripts/soffice.sh	29 Mar 2005 11:05:17 -0000
@@ -55,6 +55,8 @@
 #
 #*************************************************************************
 
+export SAL_USE_VCLPLUGIN=gtk
+
 #
 # STAR_PROFILE_LOCKING_DISABLED=1
 # export STAR_PROFILE_LOCKING_DISABLED

openoffice.org-1.9.88.rh150650.gcjneedstoresolveallrequirements.patch:
 bin/modules/installer/globals.pm        |    0 
 solenv/bin/modules/installer/globals.pm |    2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openoffice.org-1.9.88.rh150650.gcjneedstoresolveallrequirements.patch ---
Index: bin/modules/installer/globals.pm
===================================================================
RCS file: /cvs/tools/solenv/bin/modules/installer/globals.pm,v
retrieving revision 1.28
diff -u -p -r1.28 globals.pm
--- openoffice.org.orig/solenv/bin/modules/installer/globals.pm	24 Feb 2005 16:20:17 -0000	1.28
+++ openoffice.org/solenv/bin/modules/installer/globals.pm	31 Mar 2005 12:30:01 -0000
@@ -200,7 +200,7 @@ BEGIN
 
 	@environmentvariables = ( "SOLARVERSION", "GUI", "WORK_STAMP", "OUTPATH", "LOCAL_OUT", "LOCAL_COMMON_OUT" );
 	@packagelistitems = ("module", "solarispackagename", "packagename", "copyright", "vendor", "description" );
-	@regcompjars = ( "unoil.jar", "java_uno.jar", "ridl.jar", "jurt.jar", "juh.jar", "xmerge.jar" );
+	@regcompjars = ( "unoil.jar", "java_uno.jar", "ridl.jar", "jurt.jar", "juh.jar", "xmerge.jar", "commonwizards.jar" );
 	@regcompregisterlibs = ( "javavm.uno", "javaloader.uno" );
 	@languagepackfeature =();
 	$msiassemblyfiles = "";

openoffice.org-1.9.89.ooo46228.parallel.solenv.patch:
 inc/tg_sdi.mk        |    0 
 solenv/inc/tg_sdi.mk |    2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openoffice.org-1.9.89.ooo46228.parallel.solenv.patch ---
Index: inc/tg_sdi.mk
===================================================================
RCS file: /cvs/tools/solenv/inc/tg_sdi.mk,v
retrieving revision 1.9
diff -u -p -r1.9 tg_sdi.mk
--- openoffice.org.orig/solenv/inc/tg_sdi.mk	25 Jun 2004 16:13:33 -0000	1.9
+++ openoffice.org/solenv/inc/tg_sdi.mk	29 Mar 2005 18:10:50 -0000
@@ -106,7 +106,7 @@ $(SDI$(TNR)TARGET): $(SVSDI$(TNR)DEPEND)
 	-fz$(MISC)$/$(SDI$(TNR)NAME).sid	\
 	$(SDI$(TNR)NAME).sdi -I$(MISC) -I$(SVSDIINC) -I$(INC) -I$(INCLUDE) -I$(SOLARVER)$/$(UPD)$/$(INPATH)$/inc )
 
-$(HIDSID$(TNR)PARTICLE): $(MISC)$/$(SDI$(TNR)NAME).sid
+$(HIDSID$(TNR)PARTICLE): $(SDI$(TNR)TARGET) $(MISC)$/$(SDI$(TNR)NAME).sid
 	@echo ------------------------------
 	@echo Making: $@
 	@+-$(RM) $@.$(ROUT).tmp $@

openoffice.org-1.9.89.ooo46316.parallel.vcl.patch:
 util/makefile.mk     |    0 
 vcl/util/makefile.mk |    7 +++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

--- NEW FILE openoffice.org-1.9.89.ooo46316.parallel.vcl.patch ---
Index: util/makefile.mk
===================================================================
RCS file: /cvs/gsl/vcl/util/makefile.mk,v
retrieving revision 1.65
diff -u -p -r1.65 makefile.mk
--- openoffice.org.orig/vcl/util/makefile.mk	13 Jan 2005 18:16:05 -0000	1.65
+++ openoffice.org/vcl/util/makefile.mk	30 Mar 2005 19:19:14 -0000
@@ -276,7 +276,8 @@ LIB2FILES= \
             $(SLB)$/salapp.lib
 SHL2TARGET=vclplug_gen$(UPD)$(DLLPOSTFIX)
 SHL2IMPLIB=ipure_x
-SHL2LIBS=  $(LIB2TARGET)
+SHL2LIBS=$(LIB2TARGET)
+SHL2DEPN=$(SHL1IMPLIBN) $(SHL1TARGETN)
 
 # libs for generic plugin
 SHL2STDLIBS=\
@@ -344,7 +345,8 @@ LIB3FILES= \
             $(SLB)$/dapp.lib
 SHL3TARGET=vclplug_dummy$(UPD)$(DLLPOSTFIX)
 SHL3IMPLIB=idummy_plug_
-SHL3LIBS=  $(LIB3TARGET)
+SHL3LIBS=$(LIB3TARGET)
+SHL3DEPN=$(SHL1IMPLIBN) $(SHL1TARGETN)
 
 # libs for dummy plugin
 SHL3STDLIBS=\
@@ -373,6 +375,7 @@ LIB4FILES=\
 SHL4TARGET=vclplug_gtk$(UPD)$(DLLPOSTFIX)
 SHL4IMPLIB=igtk_plug_
 SHL4LIBS=$(LIB4TARGET)
+SHL4DEPN=$(SHL1IMPLIBN) $(SHL1TARGETN) $(SHL2IMPLIBN) $(SHL2TARGETN)
 # libs for gtk plugin
 SHL4STDLIBS+=$(PKGCONFIG_LIBS:s/ -lpangoxft-1.0//)
 # hack for faked SO environment

openoffice.org-1.9.89.ooo46389.parallel.framework.patch:
 framework/util/makefile.mk |    1 +
 util/makefile.mk           |    0 
 2 files changed, 1 insertion(+)

--- NEW FILE openoffice.org-1.9.89.ooo46389.parallel.framework.patch ---
Index: util/makefile.mk
===================================================================
RCS file: /cvs/framework/framework/util/makefile.mk,v
retrieving revision 1.94
diff -u -p -r1.94 makefile.mk
--- openoffice.org.orig/framework/util/makefile.mk	23 Mar 2005 14:13:26 -0000	1.94
+++ openoffice.org/framework/util/makefile.mk	31 Mar 2005 10:33:02 -0000
@@ -185,6 +185,7 @@ SHL2STDLIBS=    \
 				$(SALLIB)
 
 SHL2DEF=        $(MISC)$/$(SHL2TARGET).def
+SHL2DEPN=       $(SHL1IMPLIBN) $(SHL1TARGETN)
 
 DEF2NAME=       $(SHL2TARGET)
 

openoffice.org-1.9.87.rh151357.patch:
 desktop/source/app/langselect.cxx   |   10 +++++-----
 desktop/source/app/langselect.hxx   |    2 +-
 desktop/source/migration/wizard.cxx |   19 +------------------
 source/app/langselect.cxx           |    0 
 source/app/langselect.hxx           |    0 
 source/migration/wizard.cxx         |    0 
 6 files changed, 7 insertions(+), 24 deletions(-)

Index: openoffice.org-1.9.87.rh151357.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.87.rh151357.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-1.9.87.rh151357.patch	22 Mar 2005 08:35:32 -0000	1.1
+++ openoffice.org-1.9.87.rh151357.patch	31 Mar 2005 13:18:13 -0000	1.2
@@ -1,25 +1,102 @@
 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)
+retrieving revision 1.14
+diff -u -p -r1.14 langselect.cxx
+--- openoffice.org.orig/desktop/source/app/langselect.cxx	11 Mar 2005 10:47:45 -0000	1.14
++++ openoffice.org/desktop/source/app/langselect.cxx	29 Mar 2005 09:01:28 -0000
+@@ -118,7 +118,7 @@ Locale LanguageSelection::IsoStringToLoc
+ bool LanguageSelection::prepareLanguage()
  {
-+#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
-         }
+     // get the selected UI language as string
+-    OUString aLocaleString = getLanguageString();
++    OUString aLocaleString = getLanguageString(true);
+     if ( aLocaleString.getLength() > 0 )
+     {
+         OUString sConfigSrvc = OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider");
+@@ -199,7 +199,7 @@ void LanguageSelection::setDefaultLocale
      }
-     return bInstalled;
-+#endif
  }
  
- OUString LanguageSelection::getFirstInstalledLanguage()
+-OUString LanguageSelection::getLanguageString()
++OUString LanguageSelection::getLanguageString(bool bAllowUnInstalled)
+ {
+     // did we already find a language?
+     if (bFoundLanguage)
+@@ -208,7 +208,7 @@ OUString LanguageSelection::getLanguageS
+     OUString aUserLanguage = getUserLanguage();
+     if (aUserLanguage.getLength() > 0 )
+     {
+-        if (isInstalledLanguage(aUserLanguage))
++        if (bAllowUnInstalled || isInstalledLanguage(aUserLanguage))
+         {
+             // all is well
+             bFoundLanguage = sal_True;
+@@ -225,7 +225,7 @@ OUString LanguageSelection::getLanguageS
+     aUserLanguage = getSystemLanguage();
+     if (aUserLanguage.getLength() > 0 )
+     {
+-        if (isInstalledLanguage(aUserLanguage, sal_False))
++        if (bAllowUnInstalled || isInstalledLanguage(aUserLanguage, sal_False))
+         {
+             // great, system default language is available
+             bFoundLanguage = sal_True;
+@@ -235,7 +235,7 @@ OUString LanguageSelection::getLanguageS
+     }
+     // fallback 1: en-US
+     OUString usFB = usFallbackLanguage;
+-    if (isInstalledLanguage(usFB))
++    if (bAllowUnInstalled || isInstalledLanguage(usFB))
+     {
+         bFoundLanguage = sal_True;
+         aFoundLanguage = usFallbackLanguage;
+Index: source/app/langselect.hxx
+===================================================================
+RCS file: /cvs/framework/desktop/source/app/langselect.hxx,v
+retrieving revision 1.8
+diff -u -p -r1.8 langselect.hxx
+--- openoffice.org.orig/desktop/source/app/langselect.hxx	11 Mar 2005 10:47:59 -0000	1.8
++++ openoffice.org/desktop/source/app/langselect.hxx	29 Mar 2005 09:01:28 -0000
+@@ -96,7 +96,7 @@ private:
+ 
+ public:
+     static com::sun::star::lang::Locale IsoStringToLocale(const rtl::OUString& str);
+-    static rtl::OUString getLanguageString();
++    static rtl::OUString getLanguageString(bool bAllowUnInstalled=false);
+     static bool prepareLanguage();
+ };
+ 
+Index: source/migration/wizard.cxx
+===================================================================
+RCS file: /cvs/framework/desktop/source/migration/wizard.cxx,v
+retrieving revision 1.3
+diff -u -p -r1.3 wizard.cxx
+--- openoffice.org.orig/desktop/source/migration/wizard.cxx	11 Mar 2005 10:50:09 -0000	1.3
++++ openoffice.org/desktop/source/migration/wizard.cxx	29 Mar 2005 09:01:44 -0000
+@@ -590,25 +590,8 @@ OUString FirstStartWizard::getLicensePat
+         // yuck! no license :/
+     }
+ 
+-    // determine the filename of the license to show
+-	OUString  aLangString;
+-    ::com::sun::star::lang::Locale aLocale;
+-    OString aMgrName = OString("dkt") + OString::valueOf((sal_Int32)SUPD, 10);
+-    AllSettings aSettings(Application::GetSettings());
+-    aLocale = aSettings.GetUILocale();
+-    ResMgr* pResMgr = ResMgr::SearchCreateResMgr(aMgrName, aLocale);    
++    OUString aLangString(OUString::createFromAscii("en-US"));
+ 
+-    aLangString = aLocale.Language;
+-    if ( aLocale.Country.getLength() != 0 )
+-    {
+-        aLangString += OUString::createFromAscii("-");
+-        aLangString += aLocale.Country;
+-	    if ( aLocale.Variant.getLength() != 0 )
+-        {
+-	        aLangString += OUString::createFromAscii("-");
+-	        aLangString += aLocale.Variant;
+-        }
+-    }
+ #ifdef WNT
+     aLicensePath = 
+         aBaseInstallPath + OUString::createFromAscii(szLicensePath)

openoffice.org-1.9.88.NONE.gcc3gcj4.patch:
 bean/native/unix/makefile.mk |    7 +++++++
 native/unix/makefile.mk      |    0 
 2 files changed, 7 insertions(+)

Index: openoffice.org-1.9.88.NONE.gcc3gcj4.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.88.NONE.gcc3gcj4.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-1.9.88.NONE.gcc3gcj4.patch	24 Mar 2005 13:05:55 -0000	1.1
+++ openoffice.org-1.9.88.NONE.gcc3gcj4.patch	31 Mar 2005 13:18:13 -0000	1.2
@@ -4,13 +4,15 @@
 retrieving revision 1.5
 diff -u -p -r1.5 makefile.mk
 --- openoffice.org.orig/bean/native/unix/makefile.mk	15 Mar 2005 09:07:46 -0000	1.5
-+++ openoffice.org/bean/native/unix/makefile.mk	24 Mar 2005 10:16:10 -0000
-@@ -21,6 +21,11 @@ dummy:
++++ openoffice.org/bean/native/unix/makefile.mk	31 Mar 2005 07:33:21 -0000
+@@ -21,6 +21,13 @@ dummy:
  	@echo "Nothing to build for OS $(OS)"
  .ENDIF
  
 +.IF "$(GCJ_CFLAGS)"!=""
 +	SOLARINC+=-I$(GCJ_CFLAGS)
++.ENDIF
++.IF "$(GCJ_LDFLAGS)"!=""
 +	SOLARLIB+=-L$(GCJ_LDFLAGS)
 +.ENDIF
 +


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- openoffice.org.spec	30 Mar 2005 07:34:22 -0000	1.110
+++ openoffice.org.spec	31 Mar 2005 13:18:13 -0000	1.111
@@ -11,7 +11,7 @@
 Summary:        OpenOffice.org comprehensive office suite.
 Name:           openoffice.org
 Version:        1.9.%{ooo2ver}
-Release: 	4
+Release: 	5
 Epoch:		1
 License:	LGPL/SISSL
 Group:		Applications/Productivity
@@ -57,12 +57,16 @@
 Patch17: workspace-gcj4.patch
 Patch18: openoffice.org-1.9.85.rh151356.usetwodotzeropath.patch
 Patch19: openoffice.org-1.9.87.gccXXXXX.bean.patch
-Patch20: openoffice.org-1.9.87.NONE.wizards.broken.patch
+Patch20: openoffice.org-1.9.88.rh150650.gcjneedstoresolveallrequirements.patch
 Patch21: openoffice.org-1.9.87.warnnoterroronmissing.patch
-Patch22: openoffice.org-1.9.87.NONE.sysui.parallel.patch
-Patch23: openoffice.org-1.9.87.rh151357.patch
-Patch24: openoffice.org-1.9.87.oooXXXXX.fragments.patch
-Patch25: openoffice.org-1.9.88.NONE.gcc3gcj4.patch
+Patch22: openoffice.org-1.9.87.rh151357.patch
+Patch23: openoffice.org-1.9.87.oooXXXXX.fragments.patch
+Patch24: openoffice.org-1.9.88.NONE.gcc3gcj4.patch
+Patch25: openoffice.org-1.9.88.rh133741.alwaysgtk.patch
+Patch26: openoffice.org-1.9.88.ooo46217.allowfallbacktoenUSfromotherenglish.patch
+Patch27: openoffice.org-1.9.89.ooo46228.parallel.solenv.patch
+Patch28: openoffice.org-1.9.89.ooo46316.parallel.vcl.patch
+Patch29: openoffice.org-1.9.89.ooo46389.parallel.framework.patch
 
 %define instdir %{_libdir}/openoffice.org%{version}
 
@@ -573,12 +577,17 @@
 %patch17 -p1 -b .workspace-gcj4.patch
 %patch18 -p1 -b .usetwodotzeropath.patch
 %patch19 -p1 -b .gccXXXXX.bean.patch
-%patch20 -p1 -b .wizards.broken.patch
+%patch20 -p1 -b .rh150650.gcjneedstoresolveallrequirements.patch
 %patch21 -p1 -b .warnnoterroronmissing.patch
-%patch22 -p1 -b .sysui.parallel.patch
-%patch23 -p1 -b .rh151357.patch
-%patch24 -p1 -b .oooXXXXX.fragments.patch
-%patch25 -p1 -b .gcc3gcj4.patch
+%patch22 -p1 -b .rh151357.patch
+%patch23 -p1 -b .oooXXXXX.fragments.patch
+%patch24 -p1 -b .gcc3gcj4.patch
+%patch25 -p1 -b .rh133741.alwaysgtk.patch
+%patch26 -p1 -b .ooo46217.allowfallbacktoenUSfromotherenglish.patch
+%patch27 -p1 -b ooo46228.parallel.solenv.patch
+%patch28 -p1 -b ooo46316.parallel.vcl.patch
+%patch29 -p1 -b ooo46389.parallel.framework.patch
+
 cd solenv/bin
 tar xvzf %{SOURCE2} Archive-Zip-1.13/lib
 cd ../..
@@ -587,8 +596,16 @@
 cp %{SOURCE3} hsqldb/download/hsqldb_1_8_0.zip
 
 %build
-export LANG=en_US.UTF-8 # gcc#20629#
 echo build start time is `date`
+if [ -z "$RPM_BUILD_NCPUS" ] ; then
+    if [ -x /usr/bin/getconf ] ; then
+        RPM_BUILD_NCPUS=$(/usr/bin/getconf _NPROCESSORS_ONLN)
+        if [ $RPM_BUILD_NCPUS -eq 0 ]; then
+            RPM_BUILD_NCPUS=0
+        fi
+    fi
+fi
+export LANG=en_US.UTF-8 # gcc#20629#
 cd config_office
 autoconf
 %configure --with-java=%{java_interpreter} --disable-epm --enable-libart --enable-gtk --enable-gnome-vfs --enable-openldap --enable-cups --enable-libsn --enable-fontconfig --disable-fontooo --with-system-libs --with-system-python --with-system-mozilla --with-system-boost --without-system-mspack --without-system-sablot --without-system-nas --without-system-sndfile --without-system-portaudio --without-fonts %{withlang}
@@ -599,13 +616,14 @@
 export LINK=$CXX
 #faster build
 export nodep=true
-#export MAXPROCESS=2
+#enable parallel build
+export MAXPROCESS=$RPM_BUILD_NCPUS
 #dance of the seven veils to get unpackaged install
 export RPM=rpmbuild
 export EPM=DUMMY
 export PKGFORMAT="rpm -simple $RPM_BUILD_ROOT/%{instdir}"
 export BUILD_SPECIAL=1
-%if ! %{gcc_is_gcc4}
+%if !%{gcc_is_gcc4}
 #this is needed for a mix of gcc/g++ 3.4.x and gcj/gij 4.0.x
 export GCJ_CFLAGS="-I`$JAVACOMPILER -print-search-dirs | grep install | awk ' { print $2 } '`""include"
 export GCJ_LDFLAGS="-L`$JAVACOMPILER -print-search-dirs | grep install | awk ' { print $2 } '`"
@@ -1685,6 +1703,7 @@
 %{instdir}/program/resource/tpl680en-US.res
 %{instdir}/program/resource/uui680en-US.res
 %{instdir}/program/resource/vcl680en-US.res
+%{instdir}/program/resource/wzi680en-US.res
 %{instdir}/program/resource/xmlsec680en-US.res
 %{instdir}/program/resource/xsltdlg680en-US.res
 %{instdir}/program/sax.uno.so
@@ -2220,6 +2239,17 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Tue Mar 29 2005 Caolan McNamara <caolanm at redhat.com> 1:1.9.88-5
+- new wzi.res
+- ooo#46217# allow fallback to en_US from other english, i.e. en_IE, en_GB etc
+- replace openoffice.org-1.9.87.NONE.wizards.broken.patch with
+  openoffice.org-1.9.88.rh150650.gcjneedstoresolveallrequirements.patch
+  as a workaround to get the wizards registered
+- give parallel building a go with 
+        openoffice.org-1.9.89.ooo46228.parallel.solenv.patch
+        openoffice.org-1.9.89.ooo46316.parallel.vcl.patch
+        openoffice.org-1.9.89.ooo46389.parallel.framework.patch
+
 * Mon Mar 28 2005 Christopher Aillon <caillon at redhat.com>
 - rebuilt
 


--- openoffice.org-1.9.87.NONE.sysui.parallel.patch DELETED ---


--- openoffice.org-1.9.87.NONE.wizards.broken.patch DELETED ---


