Author: pawelz Date: Mon May 18 10:04:24 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- JDK bconds
- simplified (removed SHELL=/bin/sh and -Dbuild.compiler hacks)
---- Files affected:
packages/java-commons-dbcp:
java-commons-dbcp.spec (1.29 -> 1.30)
---- Diffs:
================================================================
Index: packages/java-commons-dbcp/java-commons-dbcp.spec
diff -u packages/java-commons-dbcp/java-commons-dbcp.spec:1.29
packages/java-commons-dbcp/java-commons-dbcp.spec:1.30
--- packages/java-commons-dbcp/java-commons-dbcp.spec:1.29 Mon Feb 16
09:05:01 2009
+++ packages/java-commons-dbcp/java-commons-dbcp.spec Mon May 18 12:04:18 2009
@@ -4,6 +4,11 @@
#
# Conditional build:
%bcond_without javadoc # don't build javadoc
+%if "%{pld_release}" == "ti"
+%bcond_without java_sun # build with gcj
+%else
+%bcond_with java_sun # build with java-sun
+%endif
%include /usr/lib/rpm/macros.java
@@ -13,7 +18,7 @@
Name: java-commons-dbcp
Version: 1.2.2
Release: 2
-License: Apache
+License: Apache v2.0
Group: Libraries/Java
Source0:
http://www.apache.org/dist/commons/dbcp/source/commons-dbcp-%{version}-src.tar.gz
# Source0-md5: 57bad7d2abfaa175c743521caccdbd8f
@@ -26,9 +31,11 @@
BuildRequires: java-commons-collections-tomcat5
BuildRequires: java-commons-pool >= 1.2
BuildRequires: java-commons-pool-tomcat5
-BuildRequires: java-gcj-compat-devel
+%{!?with_java_sun:BuildRequires: java-gcj-compat-devel}
+%{?with_java_sun:BuildRequires: java-sun}
BuildRequires: java-xerces
BuildRequires: jpackage-utils
+BuildRequires: rpm >= 4.4.9-56
BuildRequires: rpm-javaprov
BuildRequires: rpmbuild(macros) >= 1.300
Requires: java-commons-collections
@@ -108,16 +115,11 @@
required_jars="commons-pool commons-collections"
export CLASSPATH=$(build-classpath $required_jars)
%ant clean
-%ant -Dbuild.compiler=extJavac build-jar
+%ant build-jar %{?with_javadoc:javadoc}
required_jars="jdbc-stdext xercesImpl commons-collections-tomcat5
commons-pool-tomcat5"
export CLASSPATH=$(build-classpath $required_jars)
-%ant -Dbuild.compiler=extJavac -f tomcat5-build.xml
-
-%if %{with javadoc}
-export SHELL=/bin/sh
-%ant javadoc
-%endif
+%ant -f tomcat5-build.xml
%install
rm -rf $RPM_BUILD_ROOT
@@ -168,6 +170,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.30 2009/05/18 10:04:18 pawelz
+- JDK bconds
+- simplified (removed SHELL=/bin/sh and -Dbuild.compiler hacks)
+
Revision 1.29 2009/02/16 08:05:01 pawelz
- use java-gcj-compat-devel
- BR: java-xerces, tomcat5 subpackage R: java-xerces
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-commons-dbcp/java-commons-dbcp.spec?r1=1.29&r2=1.30&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
