diff --git a/apache-commons-pool.changes b/apache-commons-pool.changes index f861aa1..33e6e4d 100644 --- a/apache-commons-pool.changes +++ b/apache-commons-pool.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Dec 13 10:37:54 UTC 2018 - Fridrich Strba + +- Install as maven artifact + ------------------------------------------------------------------- Tue May 15 13:05:26 UTC 2018 - fstrba@suse.com diff --git a/apache-commons-pool.spec b/apache-commons-pool.spec index f5632e3..2357779 100644 --- a/apache-commons-pool.spec +++ b/apache-commons-pool.spec @@ -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,20 +24,21 @@ Release: 0 Summary: Apache Commons Pool License: Apache-2.0 Group: Development/Libraries/Java -Url: https://commons.apache.org/proper/commons-pool/ +URL: https://commons.apache.org/proper/commons-pool/ Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz Patch0: jakarta-commons-pool-build.patch Patch1: commons-pool-1.6-sourcetarget.patch BuildRequires: ant +BuildRequires: apache-commons-parent BuildRequires: fdupes BuildRequires: java-devel >= 1.8 -BuildRequires: javapackages-tools +BuildRequires: javapackages-local BuildRequires: junit -Provides: jakarta-commons-pool = %{version} -Obsoletes: jakarta-commons-pool < %{version} -Provides: %{short_name} = %{version} -Obsoletes: %{short_name} < %{version} -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Requires: apache-commons-parent +Provides: jakarta-%{short_name} = %{version}-%{release} +Obsoletes: jakarta-%{short_name} < %{version}-%{release} +Provides: %{short_name} = %{version}-%{release} +Obsoletes: %{short_name} < %{version}-%{release} BuildArch: noarch %description @@ -76,6 +77,12 @@ install -d -m 755 %{buildroot}%{_javadir} install -m 644 dist/%{short_name}-%{version}-SNAPSHOT.jar %{buildroot}%{_javadir}/%{name}-%{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}-%{version}.pom +%add_maven_depmap %{name}-%{version}.pom %{name}-%{version}.jar + # javadoc install -d -m 755 %{buildroot}%{_javadocdir}/%{name} cp -pr dist/docs/api/* %{buildroot}%{_javadocdir}/%{name} @@ -83,11 +90,18 @@ cp -pr dist/docs/api/* %{buildroot}%{_javadocdir}/%{name} %files %defattr(0644,root,root,0755) -%doc README.txt LICENSE.txt +%license LICENSE.txt +%doc README.txt %{_javadir}/%{name}.jar %{_javadir}/%{name}-%{version}.jar %{_javadir}/%{short_name}.jar %{_javadir}/%{short_name}-%{version}.jar +%{_mavenpomdir}/%{name}-%{version}.pom +%if %{defined _maven_repository} +%{_mavendepmapfragdir}/%{name} +%else +%{_datadir}/maven-metadata/%{name}.xml* +%endif %files javadoc %defattr(0644,root,root,0755)