Hello community,
here is the log from the commit of package jakarta-commons-dbcp for
openSUSE:Factory checked in at 2013-12-05 06:59:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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:
--------
New Changes file:
--- /dev/null 2013-11-25 01:44:08.036031256 +0100
+++
/work/SRC/openSUSE:Factory/.jakarta-commons-dbcp.new/jakarta-commons-dbcp-src.changes
2013-12-05 06:59:26.000000000 +0100
@@ -0,0 +1,6 @@
+-------------------------------------------------------------------
+Tue Nov 26 14:12:42 UTC 2013 - [email protected]
+
+- Drop -src package into separate spec file in order to really
+ break a build cycle between tomcat and dbcp
+
---
/work/SRC/openSUSE:Factory/jakarta-commons-dbcp/jakarta-commons-dbcp.changes
2013-09-11 13:38:59.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.jakarta-commons-dbcp.new/jakarta-commons-dbcp.changes
2013-12-05 06:59:26.000000000 +0100
@@ -1,0 +2,11 @@
+Tue Nov 26 14:56:21 UTC 2013 - [email protected]
+
+- Move -src subpackage to extra spec file
+
+-------------------------------------------------------------------
+Wed Oct 30 14:54:34 UTC 2013 - [email protected]
+
+- Create -src subpackage in order to create tomcat-dbcp.jar without
+ build cycles (bnc#847505)
+
+-------------------------------------------------------------------
Old:
----
dbcp-tomcat5-build.xml
New:
----
jakarta-commons-dbcp-src.changes
jakarta-commons-dbcp-src.spec
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ jakarta-commons-dbcp-src.spec ++++++
#
# spec file for package jakarta-commons-dbcp-src
#
# 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
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
%define base_name dbcp
%define short_name commons-%{base_name}
Name: jakarta-commons-dbcp-src
Version: 1.2.2
Release: 0
Summary: Jakarta Commons DataBase Pooling Package src
License: Apache-2.0
Group: Development/Libraries/Java
Source0: commons-dbcp-1.2.2-src.tar.bz2
Source5: commons-build.tar.bz2
Patch0: commons-dbcp-1.2.2-project_xml.patch
#improved from https://issues.apache.org/jira/browse/DBCP-191
Patch1: java6-compatibility.patch
Patch2: jakarta-commons-dbcp-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/
BuildArch: noarch
%description
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.
This package contains a source code, which is intended to break some
bootstrap issues between commons-dbcp and tomcat.
%prep
%setup -q -n %{short_name}-%{version}-src
# quick hack
cp LICENSE.txt ../LICENSE
# remove all binary libs
find . -name "*.jar" -exec rm -f {} \;
bzip2 -dc %{SOURCE5} | tar xf -
%patch0 -b .sav
%patch1 -b .sav1
%patch2 -b .target15
%patch3 -p0
%build
# nope
%install
# source code
install -d -m 0755 %{buildroot}%{_usrsrc}/%{short_name}/
cp -pr src/java %{buildroot}%{_usrsrc}/%{short_name}/
%files
%defattr(0644,root,root,0755)
%doc LICENSE.txt
%{_usrsrc}/%{short_name}
%changelog
++++++ jakarta-commons-dbcp.spec ++++++
--- /var/tmp/diff_new_pack.J1mPT7/_old 2013-12-05 06:59:27.000000000 +0100
+++ /var/tmp/diff_new_pack.J1mPT7/_new 2013-12-05 06:59:27.000000000 +0100
@@ -33,12 +33,11 @@
Source3: pom-maven2jpp-mapdeps.xsl
Source4: %{base_name}-%{version}-jpp-depmap.xml
Source5: commons-build.tar.bz2
-Source6: dbcp-tomcat5-build.xml
Source7: commons-dbcp-1.2.2.pom
Patch0: commons-dbcp-1.2.2-project_xml.patch
#improved from https://issues.apache.org/jira/browse/DBCP-191
Patch1: java6-compatibility.patch
-Patch2: %{name}-target15.patch
+Patch2: jakarta-commons-dbcp-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/
@@ -132,7 +131,6 @@
# remove all binary libs
find . -name "*.jar" -exec rm -f {} \;
bzip2 -dc %{SOURCE5} | tar xf -
-cp %{SOURCE6} .
%patch0 -b .sav
%patch1 -b .sav1
%patch2 -b .target15
@@ -218,9 +216,6 @@
ln -s %{_sysconfdir}/alternatives \
$RPM_BUILD_ROOT%{_javadir}/hibernate_jdbc_cache.jar
-%clean
-rm -rf $RPM_BUILD_ROOT
-
%post
update-alternatives --install %{_javadir}/hibernate_jdbc_cache.jar \
hibernate_jdbc_cache %{_javadir}/%{name}.jar 60
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
