Sync from SUSE:SLFO:Main xml-commons-resolver revision 5a4b35a9cdd8e1d7fbc18c011377cb1b

xml-commons-resolver.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+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>
 

xml-commons-resolver.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package xml-commons-resolver
 #
-# 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
@@ -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
@@ -35,8 +35,10 @@ Patch1:         %{name}-1.2-osgi.patch
 BuildRequires:  ant
 BuildRequires:  fdupes
 BuildRequires:  java-devel >= 1.8
-BuildRequires:  javapackages-local
+BuildRequires:  javapackages-local >= 6
-#!BuildIgnore:  xerces-j2 xml-apis xml-resolver
+#!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
@@ -66,8 +68,8 @@ Javadoc for %{name}.
 
 %prep
 %setup -q
-%patch0 -p1
+%patch -P 0 -p1
-%patch1 -p1
+%patch -P 1 -p1
 
 cp %{SOURCE5} pom.xml
 
@@ -93,7 +95,7 @@ popd
 
 # pom
 install -d -m 0755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom
+%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom
 %add_maven_depmap %{name}.pom %{name}.jar
 
 # javadoc