Author: glen Date: Thu Mar 1 21:48:15 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- add binary bcond, can now package on ac
---- Files affected:
SPECS:
hsqldb.spec (1.9 -> 1.10)
---- Diffs:
================================================================
Index: SPECS/hsqldb.spec
diff -u SPECS/hsqldb.spec:1.9 SPECS/hsqldb.spec:1.10
--- SPECS/hsqldb.spec:1.9 Thu Mar 1 22:15:46 2007
+++ SPECS/hsqldb.spec Thu Mar 1 22:48:10 2007
@@ -1,12 +1,18 @@
# $Revision$, $Date$
+#
# TODO
# - make build with java 1.6
+# - separate server
+#
+# Conditional build:
+%bcond_without binary # do not use binary jar, but compile (needs
java < 1.6)
+#
%define _ver %(echo %{version} | tr . _)
Summary: SQL relational database engine written in Java
Summary(pl.UTF-8): Silnik relacyjnych baz danych SQL napisany w Javie
Name: hsqldb
Version: 1.8.0.7
-Release: 0.2
+Release: 0.3
License: BSD Style
Group: Development/Languages/Java
Source0: http://dl.sourceforge.net/hsqldb/%{name}_%{_ver}.zip
@@ -20,6 +26,7 @@
URL: http://www.hsqldb.org/
BuildRequires: ant
BuildRequires: jdk
+%{!?with_binary:BuildRequires: jdk < 1.6}
BuildRequires: jpackage-utils >= 0:1.5
BuildRequires: junit
BuildRequires: rpmbuild(macros) >= 1.300
@@ -99,7 +106,8 @@
#%patch1
# remove all binary libs
-find . -name '*.jar' -o -name '*.class' -o -name '*.war' | xargs rm -vf
+%{!?with_binary:rm -f lib/hsqldb.jar}
+rm -f lib/servlet.jar
cp -a doc manual
rm -rf manual/src
@@ -115,7 +123,7 @@
junit \
)
cd build
-%ant jar javadoc
+%ant %{!?with_binary:jar} javadoc
%install
rm -rf $RPM_BUILD_ROOT
@@ -214,6 +222,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.10 2007/03/01 21:48:10 glen
+- add binary bcond, can now package on ac
+
Revision 1.9 2007/03/01 21:15:46 glen
- cleanups
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/hsqldb.spec?r1=1.9&r2=1.10&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
