Hello community,
here is the log from the commit of package jakarta-commons-dbcp for
openSUSE:Factory checked in at 2013-09-11 13:38: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"
Changes:
--------
---
/work/SRC/openSUSE:Factory/jakarta-commons-dbcp/jakarta-commons-dbcp.changes
2012-06-25 12:31:48.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.jakarta-commons-dbcp.new/jakarta-commons-dbcp.changes
2013-09-11 13:38:59.000000000 +0200
@@ -1,0 +2,13 @@
+Mon Sep 9 11:05:46 UTC 2013 - [email protected]
+
+- Move from jpackage-utils to javapackage-tools
+
+-------------------------------------------------------------------
+Thu Sep 5 12:50:42 UTC 2013 - [email protected]
+
+- don't require commons-collections-tomcat5 for build
+- drop -tomcat5 subpackage
+- use new add_maven_depmap macro
+- drop source url as apache stops to distribute such old version
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ jakarta-commons-dbcp.spec ++++++
--- /var/tmp/diff_new_pack.9T7K6V/_old 2013-09-11 13:39:00.000000000 +0200
+++ /var/tmp/diff_new_pack.9T7K6V/_new 2013-09-11 13:39:00.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package jakarta-commons-dbcp
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 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
@@ -27,7 +27,7 @@
Summary: Jakarta Commons DataBase Pooling Package
License: Apache-2.0
Group: Development/Libraries/Java
-Source0:
http://www.apache.org/dist/commons/dbcp/source/commons-dbcp-1.2.2-src.tar.bz2
+Source0: commons-dbcp-1.2.2-src.tar.bz2
Source1: pom-maven2jpp-depcat.xsl
Source2: pom-maven2jpp-newdepmap.xsl
Source3: pom-maven2jpp-mapdeps.xsl
@@ -43,13 +43,11 @@
Patch3: jdbc41.patch
Url: http://jakarta.apache.org/commons/dbcp/
BuildRequires: ant >= 1.6.5
-BuildRequires: jakarta-commons-collections-tomcat5
BuildRequires: jakarta-commons-logging
BuildRequires: jakarta-commons-pool >= 1.3
-BuildRequires: jakarta-commons-pool-tomcat5
BuildRequires: java-devel
+BuildRequires: javapackages-tools
BuildRequires: jdbc-stdext >= 2.0
-BuildRequires: jpackage-utils > 1.7.2
BuildRequires: junit >= 3.8.1
BuildRequires: tomcat-lib
BuildRequires: xerces-j2
@@ -72,14 +70,14 @@
%endif
Requires(post): /usr/sbin/update-alternatives
Requires(preun): /usr/sbin/update-alternatives
-Requires: jakarta-commons-collections >= 3.2
-Requires: jakarta-commons-pool >= 1.3
+Requires: commons-collections >= 3.2
+Requires: commons-pool >= 1.3
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Provides: %{short_name} = %{version}-%{release}
Provides: hibernate_jdbc_cache
-Requires(post): jpackage-utils >= 1.7.2
-Requires(postun): jpackage-utils >= 1.7.2
+Requires(post): javapackages-tools
+Requires(postun): javapackages-tools
%description
The DBCP package creates and maintains a database connection pool
@@ -95,8 +93,6 @@
%package javadoc
Summary: Javadoc for jakarta-commons-dbcp
Group: Development/Libraries/Java
-Requires(post): /bin/rm,/bin/ln
-Requires(postun): /bin/rm
%description javadoc
This package contains the javadoc documentation for the DBCP package.
@@ -110,24 +106,6 @@
features.
-
-%package tomcat
-Summary: Jakarta Commons DataBase Pooling Package
-Group: Development/Libraries/Java
-Provides: %{name}-tomcat5 = %{version}-%{release}
-Obsoletes: %{name}-tomcat5 < %{version}-%{release}
-
-%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
-DataSource interface. The package also supports multiple logins to
-multiple database systems, reclamation of stale or dead connections,
-testing for valid connections, PreparedStatement pooling, and other
-features.
-
-
-
%if %{with_maven}
%package manual
@@ -203,8 +181,6 @@
-Djava.io.tmpdir=. \
dist test
%endif
-export CLASSPATH=$(build-classpath jdbc-stdext xerces-j2
commons-collections-tomcat5 commons-pool-tomcat5)
-ant -f dbcp-tomcat5-build.xml
%install
# jars
@@ -215,14 +191,14 @@
install -m 644 dist/%{short_name}.jar
$RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
%endif
#tomcat5 jars
-install -m 644 dbcp-tomcat5/%{short_name}-tomcat5.jar
$RPM_BUILD_ROOT%{_javadir}/%{name}-tomcat5-%{version}.jar
+#install -m 644 dbcp-tomcat5/%{short_name}-tomcat5.jar
$RPM_BUILD_ROOT%{_javadir}/%{name}-tomcat5-%{version}.jar
(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar}
`echo $jar| sed "s|jakarta-||g"`; done)
(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar}
`echo $jar| sed "s|-%{version}||g"`; done)
-%add_to_maven_depmap commons-dbcp commons-dbcp %{version} JPP %{name}
# pom
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
+install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
install -pm 644 %{SOURCE7} \
- $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
+ $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
+%add_maven_depmap
# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%if %{with_maven}
@@ -248,10 +224,6 @@
%post
update-alternatives --install %{_javadir}/hibernate_jdbc_cache.jar \
hibernate_jdbc_cache %{_javadir}/%{name}.jar 60
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
%preun
{
@@ -267,12 +239,8 @@
%{_javadir}/%{short_name}.jar
%{_javadir}/%{short_name}-%{version}.jar
%ghost %{_javadir}/hibernate_jdbc_cache.jar
-%{_datadir}/maven2
-%{_mavendepmapfragdir}
-
-%files tomcat
-%defattr(-,root,root)
-%{_javadir}/*-tomcat*.jar
+%{_mavenpomdir}/*
+%{_mavendepmapfragdir}/*
%files javadoc
%defattr(-,root,root)
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
