SPECS (AC-branch): openoffice.org.spec - add system_hsqldb bcond a...

[glen]

Author: glen                         Date: Sat Mar  3 14:16:53 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- add system_hsqldb bcond and enable it

---- Files affected:
SPECS:
   openoffice.org.spec (1.704.2.6 -> 1.704.2.7) 

---- Diffs:

================================================================
Index: SPECS/openoffice.org.spec
diff -u SPECS/openoffice.org.spec:1.704.2.6 SPECS/openoffice.org.spec:1.704.2.7
--- SPECS/openoffice.org.spec:1.704.2.6	Thu Mar  1 10:39:09 2007
+++ SPECS/openoffice.org.spec	Sat Mar  3 15:16:48 2007
@@ -24,7 +24,6 @@
 #       - can't be just i18n-{be,gu,hi,kn,pa,ta} instead of *-{be_BY,*_IN}?
 #   - more system libs todo:
 #	- --with-system-agg + antigrain package (http://www.antigrain.com)
-#	- --with-system-hsqldb + hsqldb package (http://hsqldb.org or sourceforge)
 #	- --with-system-hunspell + hunspell package (http://hunspell.sourceforge.net)
 #	- (SYSTEM_HYPH) bcond system_libhnj doesn't work - needs Debian-patched version of libhnj
 #	- --with-system-myspell + myspell package as in Debian
@@ -54,6 +53,7 @@
 %bcond_without	system_xalan
 %bcond_without	system_xerces
 %bcond_without	system_xml_apis
+%bcond_without	system_hsqldb
 %bcond_with	system_xt
 
 %bcond_without	xvfb		# using Xvfb in build-galleries script (without xvfb broken)
@@ -64,6 +64,7 @@
 %undefine	with_system_xerces
 %undefine	with_system_xml_apis
 %undefine	with_system_xt
+%undefine	with_system_hsqldb
 %endif
 
 %define		ver		2.1.0
@@ -179,6 +180,7 @@
 BuildRequires:	mono-devel >= 1.1.8
 %endif
 BuildRequires:	XFree86-devel
+%{?with_system_hsqldb:BuildRequires:	hsqldb >= 1.8.0}
 BuildRequires:	nas-devel >= 1.7-1
 BuildRequires:	neon-devel
 BuildRequires:	openclipart-png >= 0:0.16
@@ -308,6 +310,7 @@
 # libcups.so.2 is dlopened (in cupsmgr.cxx); maybe Suggests instead?
 %{?with_system_beanshell:Requires:	beanshell}
 Requires:	cups-lib
+%{?with_system_hsqldb:Requires:	hsqldb >= 1.8.0}
 Requires:	libstdc++ >= 5:3.2.1
 Requires:	mktemp
 Requires:	sed
@@ -2109,6 +2112,7 @@
 	%{?with_system_xalan:--with-system-xalan} \
 	%{?with_system_xalan:--with-serializer-jar=%{_javadir}/xalan.jar} \
 	%{?with_system_xerces:--with-system-xerces} \
+	%{?with_system_hsqldb:--with-system-hsqldb} \
 	%{?with_system_xml_apis:--with-system-xml-apis} \
 	--with-system-zlib \
 	--with-system-jpeg \
@@ -2837,7 +2841,7 @@
 %{_libdir}/%{name}/program/classes/commonwizards.jar
 %{_libdir}/%{name}/program/classes/fax.jar
 %{_libdir}/%{name}/program/classes/form.jar
-%{_libdir}/%{name}/program/classes/hsqldb.jar
+%{!?with_system_hsqldb:%{_libdir}/%{name}/program/classes/hsqldb.jar}
 %{_libdir}/%{name}/program/classes/java_uno.jar
 %{_libdir}/%{name}/program/classes/java_uno_accessbridge.jar
 %{_libdir}/%{name}/program/classes/js.jar
@@ -3761,6 +3765,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.704.2.7  2007/03/03 14:16:48  glen
+- add system_hsqldb bcond and enable it
+
 Revision 1.704.2.6  2007/03/01 09:39:09  glen
 - missing backslash
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/openoffice.org.spec?r1=1.704.2.6&r2=1.704.2.7&f=u