Fridrich Strba 2018-12-13 11:31:21 +00:00 committed by Git OBS Bridge
parent 16e2987bf7
commit c26cb9b42b
2 changed files with 21 additions and 7 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Dec 13 11:13:42 UTC 2018 - Fridrich Strba <fstrba@suse.com>
- Add maven pom file and alias for previous version of commons-dbcp
-------------------------------------------------------------------
Tue May 15 09:30:50 UTC 2018 - fstrba@suse.com

View File

@ -12,7 +12,7 @@
# 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/
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@ -24,7 +24,7 @@ Release: 0
Summary: Jakarta Commons DataBase Pooling Package
License: Apache-2.0
Group: Development/Libraries/Java
Url: https://commons.apache.org/proper/commons-dbcp/
URL: https://commons.apache.org/proper/commons-dbcp/
Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
Source100: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz.asc
Source101: commons.keyring
@ -32,14 +32,16 @@ Patch0: apache-commons-dbcp-sourcetarget.patch
Patch1: apache-commons-dbcp-javadoc.patch
BuildRequires: ant >= 1.6.5
BuildRequires: apache-commons-logging
BuildRequires: apache-commons-parent
BuildRequires: apache-commons-pool2
BuildRequires: fdupes
BuildRequires: geronimo-jta-1_1-api
BuildRequires: java-devel >= 1.7
BuildRequires: javapackages-tools
BuildRequires: javapackages-local
BuildRequires: jdbc-stdext >= 2.0
BuildRequires: junit >= 3.8.1
BuildRequires: xerces-j2
Requires: apache-commons-parent
Requires: commons-collections >= 3.2
Requires: commons-pool2
Requires: jta_api >= 1.1
@ -50,7 +52,6 @@ Obsoletes: %{short_name} < %{version}
Provides: hibernate_jdbc_cache
Provides: jakarta-commons-dbcp = %{version}
Obsoletes: jakarta-commons-dbcp < %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
%description
@ -102,6 +103,10 @@ install -d -m 755 %{buildroot}%{_javadir}
install -m 644 dist/%{short_name}-%{version}.jar %{buildroot}%{_javadir}/%{name}2-%{version}.jar
(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|apache-||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 %{buildroot}%{_mavenpomdir}
install -m 644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}2-%{version}.pom
%add_maven_depmap %{name}2-%{version}.pom %{name}2-%{version}.jar -a commons-dbcp:commons-dbcp
# javadoc
install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
cp -pr dist/docs/* %{buildroot}%{_javadocdir}/%{name}
@ -120,17 +125,21 @@ if [ $1 -eq 0 ] ; then
fi
%files
%defattr(-,root,root)
%doc LICENSE.txt
%license LICENSE.txt
%{_javadir}/%{name}2.jar
%{_javadir}/%{name}2-%{version}.jar
%{_javadir}/%{short_name}.jar
%{_javadir}/%{short_name}-%{version}.jar
%{_javadir}/hibernate_jdbc_cache.jar
%ghost %{_sysconfdir}/alternatives/hibernate_jdbc_cache.jar
%{_mavenpomdir}/%{name}2-%{version}.pom
%if %{defined _maven_repository}
%{_mavendepmapfragdir}/%{name}
%else
%{_datadir}/maven-metadata/%{name}.xml*
%endif
%files javadoc
%defattr(-,root,root)
%doc %{_javadocdir}/%{name}
%changelog