Hello community, here is the log from the commit of package jakarta-commons-dbcp for openSUSE:Factory checked in at 2012-06-13 22:45:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jakarta-commons-dbcp (Old) and /work/SRC/openSUSE:Factory/.jakarta-commons-dbcp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jakarta-commons-dbcp", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/jakarta-commons-dbcp/jakarta-commons-dbcp.changes 2011-09-23 02:03:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.jakarta-commons-dbcp.new/jakarta-commons-dbcp.changes 2012-06-13 22:45:59.000000000 +0200 @@ -1,0 +2,8 @@ +Fri May 25 09:44:21 UTC 2012 - [email protected] + +- fix build with jdk7 +- remove note needed obsolete +- rename tomcat5 subpackage to tomcat +- use non-versioned javadocdir + +------------------------------------------------------------------- New: ---- jdbc41.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jakarta-commons-dbcp.spec ++++++ --- /var/tmp/diff_new_pack.jNZxbk/_old 2012-06-13 22:46:00.000000000 +0200 +++ /var/tmp/diff_new_pack.jNZxbk/_new 2012-06-13 22:46:00.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package jakarta-commons-dbcp (Version 1.2.2) +# spec file for package jakarta-commons-dbcp # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,8 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild -# icecream 0 %define with_maven 0 %define base_name dbcp @@ -25,7 +23,7 @@ Name: jakarta-commons-dbcp Version: 1.2.2 -Release: 88 +Release: 0 Summary: Jakarta Commons DataBase Pooling Package License: Apache-2.0 Group: Development/Libraries/Java @@ -41,33 +39,36 @@ #improved from https://issues.apache.org/jira/browse/DBCP-191 Patch1: java6-compatibility.patch Patch2: %{name}-target15.patch +#http://pkgs.fedoraproject.org/gitweb/?p=apache-commons-dbcp.git;a=blob_plain;f=jdbc41.patch;hb=HEAD +Patch3: jdbc41.patch Url: http://jakarta.apache.org/commons/dbcp/ BuildRequires: ant >= 1.6.5 -BuildRequires: jpackage-utils > 1.7.2 -BuildRequires: jakarta-commons-pool >= 1.3 +BuildRequires: jakarta-commons-collections-tomcat5 BuildRequires: jakarta-commons-logging +BuildRequires: jakarta-commons-pool >= 1.3 +BuildRequires: jakarta-commons-pool-tomcat5 +BuildRequires: java-devel BuildRequires: jdbc-stdext >= 2.0 -BuildRequires: xerces-j2 +BuildRequires: jpackage-utils > 1.7.2 BuildRequires: junit >= 3.8.1 -BuildRequires: jakarta-commons-pool-tomcat5 -BuildRequires: jakarta-commons-collections-tomcat5 BuildRequires: tomcat6-lib -BuildRequires: java-devel +BuildRequires: xerces-j2 #!BuildIgnore: jakarta-commons-dbcp-tomcat5 +#!BuildIgnore: jakarta-commons-dbcp-tomcat %if %{with_maven} BuildRequires: maven >= 1.1 -BuildRequires: maven-plugins-base BuildRequires: maven-plugin-artifact +BuildRequires: maven-plugin-changes BuildRequires: maven-plugin-checkstyle -BuildRequires: sf-cobertura-maven-plugin -BuildRequires: sf-findbugs-maven-plugin +BuildRequires: maven-plugin-license BuildRequires: maven-plugin-pmd -BuildRequires: maven-plugin-xdoc BuildRequires: maven-plugin-test -BuildRequires: maven-plugin-license -BuildRequires: maven-plugin-changes +BuildRequires: maven-plugin-xdoc +BuildRequires: maven-plugins-base BuildRequires: saxon BuildRequires: saxon-scripts +BuildRequires: sf-cobertura-maven-plugin +BuildRequires: sf-findbugs-maven-plugin %endif Requires(post): /usr/sbin/update-alternatives Requires(preun): /usr/sbin/update-alternatives @@ -75,9 +76,8 @@ Requires: jakarta-commons-pool >= 1.3 BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build -Provides: %{short_name} +Provides: %{short_name} = %{version}-%{relese} Provides: hibernate_jdbc_cache -Obsoletes: %{short_name} Requires(post): jpackage-utils >= 1.7.2 Requires(postun): jpackage-utils >= 1.7.2 @@ -93,7 +93,6 @@ %package javadoc -License: Apache-2.0 Summary: Javadoc for jakarta-commons-dbcp Group: Development/Libraries/Java Requires(post): /bin/rm,/bin/ln @@ -112,12 +111,13 @@ -%package tomcat5 -License: Apache-2.0 +%package tomcat Summary: Jakarta Commons DataBase Pooling Package Group: Development/Libraries/Java +Provides: %{name}-tomcat5 = %{version}-%{release} +Obsoletes: %{name}-tomcat5 < %{version}-%{release} -%description tomcat5 +%description tomcat The DBCP package creates and maintains a database connection pool package written in the Java language to be distributed under the ASF license. The package is available as a pseudo-JDBC driver and via a @@ -156,11 +156,11 @@ bzip2 -dc %{SOURCE5} | tar xf - cp %{SOURCE6} . %patch0 -b .sav -# patch only for javac 1.6.0 -if [[ "$(javac -version 2>&1 | grep '1\.6\.0')" != "" ]]; then %patch1 -b .sav1 -fi %patch2 -b .target15 +%patch3 -p0 + +%build if [ ! -f %{SOURCE4} ]; then export DEPCAT=$(pwd)/%{base_name}-%{version}-depcat.new.xml echo '<?xml version="1.0" standalone="yes"?>' > $DEPCAT @@ -175,7 +175,6 @@ /usr/bin/saxon $DEPCAT %{SOURCE2} > %{base_name}-%{version}-depmap.new.xml fi -%build %if %{with_maven} for p in $(find . -name project.xml); do pushd $(dirname $p) @@ -225,14 +224,13 @@ install -pm 644 %{SOURCE7} \ $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom # javadoc -install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} +install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name} %if %{with_maven} cp -pr target/docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} rm -rf target/docs/apidocs %else -cp -pr dist/docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} +cp -pr dist/docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} %endif -ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} %if %{with_maven} # manual install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} @@ -272,13 +270,12 @@ %{_datadir}/maven2 %{_mavendepmapfragdir} -%files tomcat5 +%files tomcat %defattr(-,root,root) -%{_javadir}/*-tomcat5*.jar +%{_javadir}/*-tomcat*.jar %files javadoc %defattr(-,root,root) -%doc %{_javadocdir}/%{name}-%{version} %doc %{_javadocdir}/%{name} %if %{with_maven} ++++++ jdbc41.patch ++++++ ++++ 610 lines (skipped) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
