Sync from SUSE:SLFO:1.1 apache-commons-net revision bb29aba36682a15cda7274e1379acd0a

apache-commons-net.changes

@@ -1,8 +1,3 @@
--------------------------------------------------------------------
-Wed Oct  2 15:32:03 UTC 2024 - Fridrich Strba <fstrba@suse.com>
-
-- Spec file cleanup
-
 -------------------------------------------------------------------
 Mon Dec  5 10:00:10 UTC 2022 - Fridrich Štrba <fridrich.strba@bluewin.ch>
 

apache-commons-net.spec

@@ -1,7 +1,7 @@
 #
-# spec file for package apache-commons-net
+# spec file
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -31,7 +31,7 @@ Source1:        %{name}-build.xml
 BuildRequires:  ant
 BuildRequires:  fdupes
 BuildRequires:  java-devel >= 1.8
-BuildRequires:  javapackages-local >= 6
+BuildRequires:  javapackages-local
 Provides:       %{short_name} = %{version}-%{release}
 Obsoletes:      %{short_name} < %{version}-%{release}
 Provides:       jakarta-%{short_name} = %{version}-%{release}
@@ -58,9 +58,10 @@ Group:          Documentation/HTML
 %prep
 %setup -q -n %{short_name}-%{version}-src
 cp %{SOURCE1} build.xml
+%pom_remove_parent .
 
 %build
-ant \
+%{ant} \
 %if %{without tests}
   -Dtest.skip=true \
 %endif
@@ -73,7 +74,7 @@ install -pm 0644 target/%{short_name}-%{version}.jar %{buildroot}%{_javadir}/%{s
 ln -sf %{short_name}.jar %{buildroot}%{_javadir}/%{name}.jar
 # pom
 install -dm 0755 %{buildroot}%{_mavenpomdir}
-%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}.pom
+install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}.pom
 %add_maven_depmap %{short_name}.pom %{short_name}.jar
 # javadoc
 install -dm 0755 %{buildroot}%{_javadocdir}/%{name}