Accepting request 1205249 from Java:packages

Spec file cleanup

OBS-URL: https://build.opensuse.org/request/show/1205249
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/felix-shell?expand=0&rev=5

felix-shell.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Oct  2 15:39:14 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Spec file cleanup
+
 -------------------------------------------------------------------
 Wed Mar 16 12:49:38 UTC 2022 - Fridrich Strba <fstrba@suse.com>
 

felix-shell.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package felix-shell
 #
-# Copyright (c) 2022 SUSE LLC
+# 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
@@ -28,11 +28,9 @@ Source0:        http://archive.apache.org/dist/felix/%{bundle}-%{version}-source
 Source1:        %{bundle}-build.xml
 BuildRequires:  ant
 BuildRequires:  fdupes
-BuildRequires:  javapackages-local
+BuildRequires:  javapackages-local >= 6
 BuildRequires:  osgi-compendium
 BuildRequires:  osgi-core
-Requires:       mvn(org.osgi:osgi.cmpn)
-Requires:       mvn(org.osgi:osgi.core)
 BuildArch:      noarch
 
 %description
@@ -49,11 +47,6 @@ This package contains API documentation for %{name}.
 %setup -q -n %{bundle}-%{version}
 cp %{SOURCE1} build.xml
 
-%pom_remove_parent
-%pom_xpath_inject pom:project "<groupId>org.apache.felix</groupId>"
-
-%pom_remove_plugin org.codehaus.mojo:rat-maven-plugin
-
 # Use latest OSGi implementation
 %pom_change_dep :org.osgi.core org.osgi:osgi.core
 %pom_change_dep :org.osgi.compendium org.osgi:osgi.cmpn
@@ -61,7 +54,7 @@ cp %{SOURCE1} build.xml
 %build
 mkdir -p lib
 build-jar-repository -s lib osgi-core osgi-compendium
-%ant jar javadoc
+ant jar javadoc
 
 %install
 # jar
@@ -70,7 +63,7 @@ install -m 644 target/%{bundle}-%{version}.jar %{buildroot}%{_javadir}/felix/%{b
 
 # pom
 install -d -m 755 %{buildroot}%{_mavenpomdir}/felix
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/felix/%{bundle}.pom
+%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/felix/%{bundle}.pom
 %add_maven_depmap felix/%{bundle}.pom felix/%{bundle}.jar
 
 # javadoc