Accepting request 1148104 from Java:packages

rpm 4.20 compat

OBS-URL: https://build.opensuse.org/request/show/1148104
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xml-commons-resolver?expand=0&rev=5

xml-commons-resolver.changes

@@ -1,3 +1,30 @@
+-------------------------------------------------------------------
+Tue Feb 20 14:32:33 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Use %patch -P N instead of deprecated %patchN.
+
+-------------------------------------------------------------------
+Fri Mar 18 16:29:44 UTC 2022 - Fridrich Strba <fstrba@suse.com>
+
+- Build with source/target levels 8
+
+-------------------------------------------------------------------
+Mon Apr  8 11:32:53 UTC 2019 - Fridrich Strba <fstrba@suse.com>
+
+- Do not depend on the parent pom since we are not building using
+  Maven.
+
+-------------------------------------------------------------------
+Fri Feb  1 16:33:40 UTC 2019 - Fridrich Strba <fstrba@suse.com>
+
+- BuildIgnore xml-apis and xml-resolver, since this does not
+  strictly require them for build
+
+-------------------------------------------------------------------
+Fri Feb  1 12:59:05 UTC 2019 - Fridrich Strba <fstrba@suse.com>
+
+- BuildIgnore xerces-j2 to break cycle of OSGi requires
+
 -------------------------------------------------------------------
 Thu Dec 13 10:52:02 UTC 2018 - Fridrich Strba <fstrba@suse.com>
 

xml-commons-resolver.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package xml-commons-resolver
 #
-# 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
@@ -23,7 +23,7 @@ Release:        0
 Summary:        Resolver subproject of xml-commons
 License:        Apache-2.0
 Group:          Development/Libraries/Java
-URL:            http://xerces.apache.org/xml-commons/components/resolver/
+URL:            https://xerces.apache.org/xml-commons/components/resolver/
 Source0:        http://www.apache.org/dist/xerces/xml-commons/%{name}-%{version}.tar.gz
 Source5:        %{name}-pom.xml
 Source6:        %{name}-resolver.1
@@ -33,11 +33,12 @@ Source10:       %{name}-CatalogManager.properties
 Patch0:         %{name}-1.2-crosslink.patch
 Patch1:         %{name}-1.2-osgi.patch
 BuildRequires:  ant
-BuildRequires:  apache-parent
 BuildRequires:  fdupes
-BuildRequires:  java-devel
-BuildRequires:  javapackages-local
-Requires:       apache-parent
+BuildRequires:  java-devel >= 1.8
+BuildRequires:  javapackages-local >= 6
+#!BuildIgnore:  xerces-j2
+#!BuildIgnore:  xml-apis
+#!BuildIgnore:  xml-resolver
 # Explicit javapackages-tools requires since scripts use
 # /usr/share/java-utils/java-functions
 Requires:       javapackages-tools
@@ -67,16 +68,20 @@ Javadoc for %{name}.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
+%patch -P 0 -p1
+%patch -P 1 -p1
+
+cp %{SOURCE5} pom.xml
 
 # remove all binary libs and prebuilt javadocs
 find . -name "*.jar" -delete
 rm -rf docs
 sed -i 's/\r//' KEYS LICENSE.resolver.txt NOTICE-resolver.txt
 
+%pom_remove_parent .
+
 %build
-%{ant} -f resolver.xml -Dant.build.javac.source=6 -Dant.build.javac.target=6 jar javadocs
+%{ant} -f resolver.xml -Dant.build.javac.source=8 -Dant.build.javac.target=8 jar javadocs
 
 %install
 # jar
@@ -90,7 +95,7 @@ popd
 
 # pom
 install -d -m 0755 %{buildroot}%{_mavenpomdir}
-install -pm 644 %{SOURCE5} %{buildroot}%{_mavenpomdir}/%{name}.pom
+%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom
 %add_maven_depmap %{name}.pom %{name}.jar
 
 # javadoc
@@ -114,7 +119,7 @@ install -p -m 644 %{SOURCE8} %{buildroot}%{_mandir}/man1/xml-xread.1
 install -d -m 755 %{buildroot}%{resolverdir}
 install -m 0644 %{SOURCE10} %{buildroot}%{resolverdir}/CatalogManager.properties
 
-%files
+%files -f .mfiles
 %license LICENSE.resolver.txt
 %doc KEYS NOTICE-resolver.txt
 %{_mandir}/man1/*
@@ -122,12 +127,6 @@ install -m 0644 %{SOURCE10} %{buildroot}%{resolverdir}/CatalogManager.properties
 %config(noreplace) %{resolverdir}/*
 %dir %{resolverdir}
 %{_javadir}/*
-%{_mavenpomdir}/*
-%if %{defined _maven_repository}
-%{_mavendepmapfragdir}/%{name}
-%else
-%{_datadir}/maven-metadata/%{name}.xml*
-%endif
 
 %files javadoc
 %license LICENSE.resolver.txt