SPECS: openoffice.org.spec - AC-branch merge (use system hsqldb, j...

[glen]

Author: glen                         Date: Sat Mar  3 14:22:38 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- AC-branch merge (use system hsqldb, jdb blocker removed)

---- Files affected:
SPECS:
   openoffice.org.spec (1.707 -> 1.708) 

---- Diffs:

================================================================
Index: SPECS/openoffice.org.spec
diff -u SPECS/openoffice.org.spec:1.707 SPECS/openoffice.org.spec:1.708
--- SPECS/openoffice.org.spec:1.707	Sat Mar  3 15:18:01 2007
+++ SPECS/openoffice.org.spec	Sat Mar  3 15:22:33 2007
@@ -28,7 +28,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
@@ -58,6 +57,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)
@@ -68,10 +68,11 @@
 %undefine	with_system_xerces
 %undefine	with_system_xml_apis
 %undefine	with_system_xt
+%undefine	with_system_hsqldb
 %endif
 
 %define		ver		2.1.0
-%define		_rel		0.20
+%define		_rel		0.21
 %define		subver		680
 %define		snap		OOE680
 %define		snap2		SRC680
@@ -158,6 +159,7 @@
 BuildRequires:	gstreamer-devel >= 0.10.0
 BuildRequires:	gstreamer-plugins-base-devel >= 0.10.0
 BuildRequires:	gtk+2-devel
+%{?with_system_hsqldb:BuildRequires:	hsqldb >= 1.8.0}
 BuildRequires:	icu
 %if %{with kde}
 BuildRequires:	kdelibs-devel
@@ -222,7 +224,6 @@
 BuildRequires:	ant
 %{?with_system_db:BuildRequires:	db-java >= 4.3}
 BuildRequires:	jar
-BuildRequires:	jdk < 1.6
 BuildRequires:	jdk >= 1.4.0_00
 %else
 BuildRequires:	libxslt-progs
@@ -2062,7 +2063,7 @@
 
 %build
 # Make sure we have /proc mounted - otherwise idlc will fail later.
-if [ ! -r /proc/cpuinfo ]; then
+if [ ! -f /proc/cpuinfo ]; then
 	echo "You need to have /proc mounted in order to build this package!"
 	exit 1
 fi
@@ -2118,6 +2119,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 \
@@ -2846,7 +2848,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
@@ -3770,6 +3772,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.708  2007/03/03 14:22:33  glen
+- AC-branch merge (use system hsqldb, jdb blocker removed)
+
 Revision 1.707  2007/03/03 14:18:01  glen
 - localization todo
 
================================================================

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