Accepting request 1170859 from Java:packages

Simplify and clean up the spec file: avoid versioned jars

OBS-URL: https://build.opensuse.org/request/show/1170859
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apache-commons-pool2?expand=0&rev=7

apache-commons-pool2.changes

@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Mon Apr 29 17:32:24 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Simplify and clean up the spec file: avoid versioned jars
+
+-------------------------------------------------------------------
+Tue Feb 20 11:06:37 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Use %patch -P N instead of deprecated %patchN.
+
+-------------------------------------------------------------------
+Mon Mar 25 17:47:40 UTC 2019 - Fridrich Strba <fstrba@suse.com>
+
+- Remove pom parent, since we don't use it when not building with
+  maven
+
+-------------------------------------------------------------------
+Thu Dec 13 11:27:43 UTC 2018 - Fridrich Strba <fstrba@suse.com>
+
+- Add maven pom file
+
 -------------------------------------------------------------------
 Tue May 15 13:19:59 UTC 2018 - fstrba@suse.com
 

apache-commons-pool2.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package apache-commons-pool2
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -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,14 +24,14 @@ Release:        0
 Summary:        Apache Commons Pool 2.x series
 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
 BuildRequires:  ant
 BuildRequires:  cglib
 BuildRequires:  fdupes
 BuildRequires:  java-devel >= 1.8
-BuildRequires:  javapackages-tools
+BuildRequires:  javapackages-local >= 6
 BuildRequires:  junit
 Requires:       cglib
 Provides:       %{short_name} = %{version}
@@ -61,8 +61,8 @@ Pool 2.x Package.
 %prep
 %setup -q -n %{short_name}-%{version}-src
 # remove all binary libs
-find . -name "*.jar" -exec rm -f {} \;
-%patch0
+find . -name "*.jar" -print -delete
+%patch -P 0
 
 %build
 echo "cglib.jar=$(build-classpath cglib)" >> build.properties
@@ -73,20 +73,22 @@ ant \
 %install
 # jars
 install -d -m 755 %{buildroot}%{_javadir}
-install -m 644 dist/%{short_name}-%{version}.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)
+install -m 644 dist/%{short_name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
+ln -sf %{_javadir}/%{name}.jar %{buildroot}%{_javadir}/%{short_name}.jar
+# pom
+install -d -m 755 %{buildroot}%{_mavenpomdir}
+%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom
+%add_maven_depmap %{name}.pom %{name}.jar
+
 # javadoc
 install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
 cp -pr dist/docs/api/* %{buildroot}%{_javadocdir}/%{name}
 %fdupes -s %{buildroot}%{_javadocdir}/%{name}
 
-%files
-%doc README.txt LICENSE.txt
-%{_javadir}/%{name}.jar
-%{_javadir}/%{name}-%{version}.jar
+%files -f .mfiles
+%license LICENSE.txt
+%doc README.txt
 %{_javadir}/%{short_name}.jar
-%{_javadir}/%{short_name}-%{version}.jar
 
 %files javadoc
 %doc %{_javadocdir}/%{name}