Author: pawelz Date: Tue Oct 6 07:38:28 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- updated BRs (servlet -> java(servlet), junit -> java-junit)
- commented out Patch2 (what happend to the patch itself?)
- dropped TODO. It builds with jdk 1.6
---- Files affected:
packages/hsqldb:
hsqldb.spec (1.22 -> 1.23)
---- Diffs:
================================================================
Index: packages/hsqldb/hsqldb.spec
diff -u packages/hsqldb/hsqldb.spec:1.22 packages/hsqldb/hsqldb.spec:1.23
--- packages/hsqldb/hsqldb.spec:1.22 Sun Dec 30 23:49:03 2007
+++ packages/hsqldb/hsqldb.spec Tue Oct 6 09:38:22 2009
@@ -1,6 +1,4 @@
# $Revision$, $Date$
-# TODO
-# - make build with java 1.6
#
# Conditional build:
%bcond_with binary # use binary jar instead of compiling (which
needs java < 1.6)
@@ -27,7 +25,7 @@
Source4: %{name}-standard-sqltool.rc
Patch0: %{name}-scripts.patch
Patch1: %{name}-pld.patch
-Patch2: %{name}-javadoc.patch
+#Patch2: %{name}-javadoc.patch
URL: http://www.hsqldb.org/
BuildRequires: ant
BuildRequires: sed >= 4.0
@@ -36,8 +34,8 @@
BuildRequires: rpmbuild(macros) >= 1.300
%if %{without binary}
BuildRequires: jdk < 1.6
-BuildRequires: junit
-BuildRequires: servlet >= 4
+BuildRequires: java-junit
+BuildRequires: java(servlet)
%endif
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -129,7 +127,7 @@
%{__sed} -i -e 's,\r$,,' build/build.xml
%patch0 -p0
%patch1 -p1
-%patch2 -p1
+#%patch2 -p1
# remove all binary libs
%{!?with_binary:rm -f lib/hsqldb.jar}
@@ -258,6 +256,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.23 2009/10/06 07:38:22 pawelz
+- updated BRs (servlet -> java(servlet), junit -> java-junit)
+- commented out Patch2 (what happend to the patch itself?)
+- dropped TODO. It builds with jdk 1.6
+
Revision 1.22 2007/12/30 22:49:03 glen
- rel 2
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/hsqldb/hsqldb.spec?r1=1.22&r2=1.23&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
