rpms/openoffice.org/devel openoffice.org.spec,1.491,1.492

Fri Sep 23 08:06:45 UTC 2005

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Log Message:
now try system db


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.491
retrieving revision 1.492
diff -u -r1.491 -r1.492

--- openoffice.org.spec	22 Sep 2005 15:27:29 -0000	1.491
+++ openoffice.org.spec	23 Sep 2005 08:06:43 -0000	1.492
@@ -1,5 +1,5 @@
 %define ooo2ver 130
-%define ooo_rpm_release 1.scratch2
+%define ooo_rpm_release 2.scratch
 %define build_fc5 1
 %define build_fc4 0
 %define build_rhel4 0
@@ -70,7 +70,7 @@
 %define javabitsflags --without-system-hsqldb --without-system-beanshell --without-system-db
 %define includingexternals 1
 %else
-%define javabitsflags --with-system-hsqldb --with-system-beanshell --without-system-db
+%define javabitsflags --with-system-hsqldb --with-system-beanshell --with-system-db
 %endif
 %if %{internalicu}
 %define icuflags --without-system-icu
@@ -883,9 +883,9 @@
 #%patch57 -p1 -b .ooo54692.fasterhelpcontent2.patch
 %patch58 -p1 -b .ooo54708.sc.patch
 %patch59 -p1 -b .oooXXXXX.systemxalan.patch
-#%if ! %{internaljavabits}
-#%patch60 -p1 -b .oooXXXXX.newsystemdb.xmlhelp.patch
-#%endif
+%if ! %{internaljavabits}
+%patch60 -p1 -b .oooXXXXX.newsystemdb.xmlhelp.patch
+%endif
 %patch61 -p1 -b .ooo54959.negativeindent.sw.patch
 
 %if %{includingexternals}
@@ -1070,6 +1070,9 @@
 #allow gtk file dialog to be default
 rm -rf $RPM_BUILD_ROOT/%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-UseOOoFileDialogs.xcu
 
+#remove dictooo stuff which we disabled in configure
+rm -rf $RPM_BUILD_ROOT/%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-dicooo.xcu
+
 #remove script to munge OOo2 mime info into system, we'll do that
 rm -f $RPM_BUILD_ROOT/%{instdir}/program/update-mime-data
 
@@ -2162,10 +2165,6 @@
 %{instdir}/program/classes/docbook.jar
 %{instdir}/program/classes/fax.jar
 %{instdir}/program/classes/form.jar
-%if %{internaljavabits}
-%{instdir}/program/classes/bsh.jar                    
-%{instdir}/program/classes/hsqldb.jar
-%endif
 %{instdir}/program/classes/htmlsoff.jar
 %{instdir}/program/classes/java_uno.jar
 %{instdir}/program/classes/java_uno_accessbridge.jar
@@ -2188,11 +2187,6 @@
 %{instdir}/program/classes/unoil.jar
 %{instdir}/program/classes/unoloader.jar
 %{instdir}/program/classes/web.jar
-%if %{internaljavabits}
-%{instdir}/program/classes/xalan.jar
-%{instdir}/program/classes/xercesImpl.jar
-%{instdir}/program/classes/xml-apis.jar
-%endif
 %{instdir}/program/classes/XFlatXml.jar
 %{instdir}/program/classes/XMergeBridge.jar
 %{instdir}/program/classes/xmerge.jar
@@ -2259,9 +2253,6 @@
 %{instdir}/program/libcppuhelpergcc3.so.3
 %{instdir}/program/libctl680*.so
 %{instdir}/program/libcui680*.so
-#%if %{internaljavabits}
-%{instdir}/program/libdb-*.so
-#%endif
 %{instdir}/program/libdba680*.so
 %{instdir}/program/libdbacfg680*.so
 %{instdir}/program/libdbase680*.so
@@ -2318,9 +2309,6 @@
 %{instdir}/program/libhyphen680*.so
 %{instdir}/program/libi18nregexpgcc3.so
 %{instdir}/program/libi18nutilgcc3.so
-%if %{internalicu}
-%{instdir}/program/libicu*
-%endif
 %{instdir}/program/libj680*_g.so
 %{instdir}/program/libjava_uno.so
 %{instdir}/program/libjdbc2.so
@@ -2417,14 +2405,6 @@
 %{instdir}/program/libxcr680*.so
 %{instdir}/program/libxmlfa680*.so
 %{instdir}/program/libxmlfd680*.so
-%if %{internalxmlsec}
-%{instdir}/program/libxmlsec*
-%else
-%{instdir}/program/libxmlsecurity.so
-%endif
-%if %{stlvisibilityfcked}
-%{instdir}/program/libstlport*.so
-%endif
 %{instdir}/program/libxmx680*.so
 %{instdir}/program/libxo680*.so
 %{instdir}/program/libxof680*.so
@@ -2574,9 +2554,6 @@
 %{instdir}/share/dict/ooo/dictionary.lst
 %{instdir}/share/dict/ooo/WordNet_license.txt
 %{instdir}/share/dict/ooo/*en_*
-%if ! %{galangpack}
-%{instdir}/share/dict/ooo/*ga_IE*
-%endif
 %dir %{instdir}/share/dtd
 %{instdir}/share/dtd/officedocument
 %{instdir}/share/fonts
@@ -2771,6 +2748,28 @@
 %{_datadir}/icons
 %dir %{_datadir}/mime-info
 %{_datadir}/mime-info/*
+%if ! %{galangpack}
+%{instdir}/share/dict/ooo/*ga_IE*
+%endif
+%if %{internalxmlsec}
+%{instdir}/program/libxmlsec*
+%else
+%{instdir}/program/libxmlsecurity.so
+%endif
+%if %{stlvisibilityfcked}
+%{instdir}/program/libstlport*.so
+%endif
+%if %{internalicu}
+%{instdir}/program/libicu*
+%endif
+%if %{internaljavabits}
+%{instdir}/program/classes/bsh.jar                    
+%{instdir}/program/classes/hsqldb.jar
+%{instdir}/program/classes/xalan.jar
+%{instdir}/program/classes/xercesImpl.jar
+%{instdir}/program/classes/xml-apis.jar
+%{instdir}/program/libdb-*.so
+%endif
 # base files
 %if ! %{seperatebase}
 %{instdir}/help/en/sdatabase.*
@@ -2996,7 +2995,6 @@
 %dir %{instdir}/share/registry/modules/org/openoffice
 %dir %{instdir}/share/registry/modules/org/openoffice/Office
 %dir %{instdir}/share/registry/modules/org/openoffice/Office/Common
-%{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-dicooo.xcu
 %{instdir}/share/registry/modules/org/openoffice/Office/Common/Common-writer.xcu
 %dir %{instdir}/share/registry/modules/org/openoffice/Setup
 %{instdir}/share/registry/modules/org/openoffice/Setup/Setup-writer.xcu
@@ -3242,12 +3240,13 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
-* Thu Sep 22 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.130-1.scratch2
+* Thu Sep 22 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.130-2.scratch
 - add openoffice.org-1.9.130.ooo54959.negativeindent.sw.patch
 - add openoffice.org-1.9.130.ooo54708.sc.patch
 - workaround for gcc#22132# for rh#168537#
 - alternative parallel cppumaker problem fix
-- build against system db4, java api is different, fix that
+- build against system db4 
+      -> java api is different, fix that
 - build against system xalan
       -> that's as small as OOo gets until gcc#19664# get fixed
       or someone figures out how to use system rhino


