packages: openoffice.org/openoffice.org.spec - updated hsqldb deps - rel 2

[pawelz]

Author: pawelz                       Date: Sat Apr 24 17:02:54 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated hsqldb deps
- rel 2

---- Files affected:
packages/openoffice.org:
   openoffice.org.spec (1.861 -> 1.862) 

---- Diffs:

================================================================
Index: packages/openoffice.org/openoffice.org.spec
diff -u packages/openoffice.org/openoffice.org.spec:1.861 packages/openoffice.org/openoffice.org.spec:1.862
--- packages/openoffice.org/openoffice.org.spec:1.861	Sat Apr 17 09:44:34 2010
+++ packages/openoffice.org/openoffice.org.spec	Sat Apr 24 19:02:46 2010
@@ -85,7 +85,7 @@
 Name:		openoffice.org
 Version:	3.2.0.7
 Release:	%{_tag}.%{_rel}
-Epoch:		1
+Epoch:		2
 License:	GPL/LGPL
 Group:		X11/Applications
 # we use git because released tarballs are buggy too often
@@ -181,7 +181,7 @@
 BuildRequires:	gstreamer-devel >= 0.10.0
 BuildRequires:	gstreamer-plugins-base-devel >= 0.10.0
 BuildRequires:	gtk+2-devel >= 2:2.10
-%{?with_system_hsqldb:BuildRequires:	hsqldb >= 1.8.0.9}
+%{?with_system_hsqldb:BuildRequires:	java-hsqldb}
 %{?with_system_hunspell:BuildRequires:	hunspell-devel >=1.2.2}
 %{?with_icecream:BuildRequires:	icecream}
 BuildRequires:	icu
@@ -355,7 +355,7 @@
 # libcups.so.2 is dlopened (in cupsmgr.cxx); maybe Suggests instead?
 Requires:	cups-lib
 Requires:	fonts-TTF-OpenSymbol
-%{?with_system_hsqldb:Requires:	hsqldb >= 1.8.0}
+%{?with_system_hsqldb:Requires:	java-hsqldb}
 %{?with_system_beanshell:Requires:	java-beanshell}
 Requires:	libstdc++ >= 5:3.2.1
 Requires:	mktemp
@@ -4624,6 +4624,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.862  2010/04/24 17:02:46  pawelz
+- updated hsqldb deps
+- rel 2
+
 Revision 1.861  2010/04/17 07:44:34  jajcus
 - do not pull java-sun via BR - icedtea6 should be enough in all (most) cases
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openoffice.org/openoffice.org.spec?r1=1.861&r2=1.862&f=u