SPECS: jakarta-commons-dbcp.spec - add patch from jira #191, build...

[glen]

Author: glen                         Date: Fri Dec  7 22:54:03 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- add patch from jira #191, builds with 1.5 and 1.6

---- Files affected:
SPECS:
   jakarta-commons-dbcp.spec (1.22 -> 1.23) 

---- Diffs:

================================================================
Index: SPECS/jakarta-commons-dbcp.spec
diff -u SPECS/jakarta-commons-dbcp.spec:1.22 SPECS/jakarta-commons-dbcp.spec:1.23
--- SPECS/jakarta-commons-dbcp.spec:1.22	Fri Dec  7 22:17:17 2007
+++ SPECS/jakarta-commons-dbcp.spec	Fri Dec  7 23:53:58 2007
@@ -1,28 +1,17 @@
 # $Revision$, $Date$
-# NOTE
-# - need jdk 1.5 due java.sql.Wrapper abstract issue
-#
-# Conditional build:
-%bcond_with	binary		# use binary tarball
-
-%define	java_version %(IFS=.; set -- $(java -fullversion 2>&1 | grep -o '".*"' | xargs); echo "$1.$2")
-%if "%{java_version}" >= "1.6"
-%define		with_binary	1
-%endif
-#
 %include	/usr/lib/rpm/macros.java
 Summary:	Jakarta Commons DBCP - database connection pooling
 Summary(pl.UTF-8):	Jakarta Commons DBCP - zarządzanie połączeniem z bazą danych
 Name:		jakarta-commons-dbcp
 Version:	1.2.2
-Release:	0.1
+Release:	0.2
 License:	Apache
 Group:		Development/Languages/Java
 Source0:	http://www.apache.org/dist/commons/dbcp/source/commons-dbcp-%{version}-src.tar.gz
 # Source0-md5:	57bad7d2abfaa175c743521caccdbd8f
-Source1:	http://www.apache.org/dist/commons/dbcp/binaries/commons-dbcp-%{version}.tar.gz
-# Source1-md5:	6957d443325f08f07bfd1d2142a59799
-Source2:	%{name}-tomcat5-build.xml
+Source1:	%{name}-tomcat5-build.xml
+Patch0:		%{name}-bug-191.patch
+Patch1:		%{name}-javadoc.patch
 URL:		http://commons.apache.org/dbcp/
 BuildRequires:	ant
 BuildRequires:	jakarta-commons-collections
@@ -84,13 +73,17 @@
 
 %prep
 %setup -q -n commons-dbcp-%{version}-src
-%if %{without binary}
-cp %{SOURCE2} tomcat5-build.xml
+cp %{SOURCE1} tomcat5-build.xml
 %{__sed} -i -e 's,\r$,,' build.xml
-%endif
+
+java_version=$(IFS=.; set -- $(java -fullversion 2>&1 | grep -o '".*"' | xargs); echo "$1.$2")
+if ! awk -vv=$java_version 'BEGIN{exit(v >= 1.6)}'; then # java is at least 1.6
+%patch0 -p0
+fi
+
+%patch1 -p1
 
 %build
-%if %{without binary}
 required_jars="commons-pool commons-collections"
 export CLASSPATH=$(build-classpath $required_jars)
 %ant dist
@@ -98,17 +91,14 @@
 required_jars="jdbc-stdext xercesImpl commons-collections-tomcat5 commons-pool-tomcat5"
 export CLASSPATH=$(build-classpath $required_jars)
 %ant -f tomcat5-build.xml
-%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_javadir}
 # jars
-ln -sf commons-dbcp-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/commons-dbcp.jar
-%if %{with binary}
 install commons-dbcp-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/commons-dbcp-%{version}.jar
+ln -sf commons-dbcp-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/commons-dbcp.jar
 
-%else
 install dist/commons-dbcp.jar $RPM_BUILD_ROOT%{_javadir}/commons-dbcp-%{version}.jar
 
 install dbcp-tomcat5/commons-dbcp-tomcat5.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-tomcat5-%{version}.jar
@@ -118,7 +108,6 @@
 install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -a dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
-%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -132,7 +121,6 @@
 %{_javadir}/commons-dbcp.jar
 %{_javadir}/commons-dbcp-%{version}.jar
 
-%if %{without binary}
 %files tomcat5
 %defattr(644,root,root,755)
 %{_javadir}/%{name}-tomcat5.jar
@@ -142,7 +130,6 @@
 %defattr(644,root,root,755)
 %{_javadocdir}/%{name}-%{version}
 %ghost %{_javadocdir}/%{name}
-%endif
 
 %define	date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -150,6 +137,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.23  2007-12-07 22:53:58  glen
+- add patch from jira #191, builds with 1.5 and 1.6
+
 Revision 1.22  2007-12-07 21:17:17  glen
 - update to 1.2.2, add binary bcond
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/jakarta-commons-dbcp.spec?r1=1.22&r2=1.23&f=u