Hello community,
here is the log from the commit of package jakarta-commons-dbcp for
openSUSE:Factory checked in at 2014-07-21 21:40:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-src.changes
2013-12-05 06:59:26.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.jakarta-commons-dbcp.new/jakarta-commons-dbcp-src.changes
2014-07-21 22:34:43.000000000 +0200
@@ -1,0 +2,11 @@
+Fri Jul 11 09:26:24 UTC 2014 - [email protected]
+
+- Cleanup with spec-cleaner
+
+-------------------------------------------------------------------
+Thu Apr 3 12:40:39 UTC 2014 - [email protected]
+
+- Add BuildRoot for SLES builds
+- Disable post-build-check on SLES due to FHS errors
+
+-------------------------------------------------------------------
---
/work/SRC/openSUSE:Factory/jakarta-commons-dbcp/jakarta-commons-dbcp.changes
2013-12-05 06:59:26.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.jakarta-commons-dbcp.new/jakarta-commons-dbcp.changes
2014-07-21 22:34:43.000000000 +0200
@@ -1,0 +2,11 @@
+Mon Jul 21 08:19:33 UTC 2014 - [email protected]
+
+- Fixup the update-alternatives code.
+- Get rid of the old maven code that we didn't use
+
+-------------------------------------------------------------------
+Fri Jul 11 09:26:14 UTC 2014 - [email protected]
+
+- Cleanup with spec-cleaner
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ jakarta-commons-dbcp-src.spec ++++++
--- /var/tmp/diff_new_pack.ZFk5YM/_old 2014-07-21 22:34:44.000000000 +0200
+++ /var/tmp/diff_new_pack.ZFk5YM/_new 2014-07-21 22:34:44.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package jakarta-commons-dbcp-src
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 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
@@ -18,13 +18,13 @@
%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
+Url: http://jakarta.apache.org/commons/dbcp/
Source0: commons-dbcp-1.2.2-src.tar.bz2
Source5: commons-build.tar.bz2
Patch0: commons-dbcp-1.2.2-project_xml.patch
@@ -33,7 +33,7 @@
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/
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
%description
@@ -58,7 +58,7 @@
%patch0 -b .sav
%patch1 -b .sav1
%patch2 -b .target15
-%patch3 -p0
+%patch3
%build
# nope
++++++ jakarta-commons-dbcp.spec ++++++
--- /var/tmp/diff_new_pack.ZFk5YM/_old 2014-07-21 22:34:44.000000000 +0200
+++ /var/tmp/diff_new_pack.ZFk5YM/_new 2014-07-21 22:34:44.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package jakarta-commons-dbcp
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 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
@@ -16,17 +16,15 @@
#
-%define with_maven 0
%define base_name dbcp
%define short_name commons-%{base_name}
-%define section free
-
Name: jakarta-commons-dbcp
Version: 1.2.2
Release: 0
Summary: Jakarta Commons DataBase Pooling Package
License: Apache-2.0
Group: Development/Libraries/Java
+Url: http://jakarta.apache.org/commons/dbcp/
Source0: commons-dbcp-1.2.2-src.tar.bz2
Source1: pom-maven2jpp-depcat.xsl
Source2: pom-maven2jpp-newdepmap.xsl
@@ -40,7 +38,6 @@
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/
BuildRequires: ant >= 1.6.5
BuildRequires: jakarta-commons-logging
BuildRequires: jakarta-commons-pool >= 1.3
@@ -50,33 +47,18 @@
BuildRequires: junit >= 3.8.1
BuildRequires: tomcat-lib
BuildRequires: xerces-j2
-#!BuildIgnore: jakarta-commons-dbcp-tomcat5
-#!BuildIgnore: jakarta-commons-dbcp-tomcat
-%if %{with_maven}
-BuildRequires: maven >= 1.1
-BuildRequires: maven-plugin-artifact
-BuildRequires: maven-plugin-changes
-BuildRequires: maven-plugin-checkstyle
-BuildRequires: maven-plugin-license
-BuildRequires: maven-plugin-pmd
-BuildRequires: maven-plugin-test
-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
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): %{_sbindir}/update-alternatives
Requires(post): javapackages-tools
Requires(postun): javapackages-tools
+Requires(preun): %{_sbindir}/update-alternatives
+Provides: %{short_name} = %{version}-%{release}
+Provides: hibernate_jdbc_cache
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildArch: noarch
+#!BuildIgnore: jakarta-commons-dbcp-tomcat5
+#!BuildIgnore: jakarta-commons-dbcp-tomcat
%description
The DBCP package creates and maintains a database connection pool
@@ -87,8 +69,6 @@
testing for valid connections, PreparedStatement pooling, and other
features.
-
-
%package javadoc
Summary: Javadoc for jakarta-commons-dbcp
Group: Development/Libraries/Java
@@ -104,26 +84,6 @@
testing for valid connections, PreparedStatement pooling, and other
features.
-
-%if %{with_maven}
-
-%package manual
-
-Summary: Documents for %{name}
-Group: Development/Documentation
-
-%description manual
-This package contains the documentation for the DBCP package.
-
-The DBCP package shall create and maintain a database connection pool
-package written in the Java language to be distributed under the ASF
-license. The package shall be available as a pseudo-JDBC driver and via
-a DataSource interface. The package shall also support multiple logins
-to multiple database systems, reclamation of stale or dead connections,
-testing for valid connections, PreparedStatement pooling, and other
-features.
-%endif
-
%prep
%setup -q -n %{short_name}-%{version}-src
# quick hack
@@ -134,7 +94,7 @@
%patch0 -b .sav
%patch1 -b .sav1
%patch2 -b .target15
-%patch3 -p0
+%patch3
%build
if [ ! -f %{SOURCE4} ]; then
@@ -143,30 +103,14 @@
echo '<depset>' >> $DEPCAT
for p in $(find . -name project.xml); do
pushd $(dirname $p)
- /usr/bin/saxon project.xml %{SOURCE1} >> $DEPCAT
+ %{_bindir}/saxon project.xml %{SOURCE1} >> $DEPCAT
popd
done
echo >> $DEPCAT
echo '</depset>' >> $DEPCAT
- /usr/bin/saxon $DEPCAT %{SOURCE2} > %{base_name}-%{version}-depmap.new.xml
+ %{_bindir}/saxon $DEPCAT %{SOURCE2} > %{base_name}-%{version}-depmap.new.xml
fi
-%if %{with_maven}
-for p in $(find . -name project.xml); do
- pushd $(dirname $p)
- cp project.xml project.xml.orig
- /usr/bin/saxon -o project.xml project.xml.orig %{SOURCE3} map=%{SOURCE4}
- popd
-done
-mkdir -p .maven/repository/JPP/jars
-pushd .maven/repository/JPP/jars
- ln -sf $(build-classpath jdbc-stdext) jdbc.jar
-popd
-maven \
- -Dmaven.repo.remote=file:/usr/share/maven/repository \
- -Dmaven.home.local=$(pwd)/.maven \
- jar javadoc xdoc:transform
-%else
ant \
-Dcommons-pool.jar=$(build-classpath commons-pool) \
-Djdbc20ext.jar=$(build-classpath jdbc-stdext) \
@@ -178,53 +122,36 @@
-Dlogging.jar=$(build-classpath commons-logging) \
-Djava.io.tmpdir=. \
dist test
-%endif
%install
# jars
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-%if %{with_maven}
-install -m 644 target/%{short_name}-%{version}.jar
$RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-%else
-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
-(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)
+install -d -m 755 %{buildroot}%{_javadir}
+install -m 644 dist/%{short_name}.jar
%{buildroot}%{_javadir}/%{name}-%{version}.jar
+(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar}
`echo $jar| sed "s|jakarta-||g"`; done)
+(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar}
`echo $jar| sed "s|-%{version}||g"`; done)
# pom
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
+install -d -m 755 %{buildroot}%{_mavenpomdir}
install -pm 644 %{SOURCE7} \
- $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
+ %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
%add_maven_depmap
# javadoc
-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}
-%endif
-%if %{with_maven}
-# manual
-install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-cp -pr target/docs/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-%endif
+install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr dist/docs/* %{buildroot}%{_javadocdir}/%{name}
# quick hack clean up
rm ../LICENSE
# hibernate_jdbc_cache ghost symlink
-ln -s %{_sysconfdir}/alternatives \
- $RPM_BUILD_ROOT%{_javadir}/hibernate_jdbc_cache.jar
+mkdir -p %{buildroot}%{_sysconfdir}/alternatives/
+ln -s %{_javadir}/%{name}.jar
%{buildroot}%{_sysconfdir}/alternatives/hibernate_jdbc_cache.jar
+ln -s %{_sysconfdir}/alternatives/hibernate_jdbc_cache.jar
%{buildroot}%{_javadir}/hibernate_jdbc_cache.jar
%post
update-alternatives --install %{_javadir}/hibernate_jdbc_cache.jar \
hibernate_jdbc_cache %{_javadir}/%{name}.jar 60
%preun
-{
- [ $1 -eq 0 ] || exit 0
+if [ $1 -eq 0 ] ; then
update-alternatives --remove hibernate_jdbc_cache %{_javadir}/%{name}.jar
-} >/dev/null 2>&1 || :
+fi
%files
%defattr(-,root,root)
@@ -233,18 +160,13 @@
%{_javadir}/%{name}-%{version}.jar
%{_javadir}/%{short_name}.jar
%{_javadir}/%{short_name}-%{version}.jar
-%ghost %{_javadir}/hibernate_jdbc_cache.jar
+%{_javadir}/hibernate_jdbc_cache.jar
+%ghost %{_sysconfdir}/alternatives/hibernate_jdbc_cache.jar
%{_mavenpomdir}/*
%{_mavendepmapfragdir}/*
%files javadoc
%defattr(-,root,root)
%doc %{_javadocdir}/%{name}
-%if %{with_maven}
-
-%files manual
-%defattr(0644,root,root,0755)
-%doc %{_docdir}/%{name}-%{version}
-%endif
%changelog
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
