From 00dad0fa6e5440a30dff8f2ffa2dcc9f620c831391718d17845bc8d3a6b4667b Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 29 Sep 2023 13:58:04 +0000 Subject: [PATCH 1/2] Accepting request 1114395 from Java:packages:test javapackages >= 6 OBS-URL: https://build.opensuse.org/request/show/1114395 OBS-URL: https://build.opensuse.org/package/show/Java:packages/xml-commons-resolver?expand=0&rev=17 --- xml-commons-resolver.spec | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index 42230f7..e0e7da0 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -1,7 +1,7 @@ # # spec file for package xml-commons-resolver # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 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 -#!BuildIgnore: xerces-j2 xml-apis xml-resolver +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 @@ -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 From fb9daaa1b7a3d8c37b42a00d140adb2adb3a11d4352574fa56a978bf630750fd Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 20 Feb 2024 14:32:39 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/xml-commons-resolver?expand=0&rev=18 --- xml-commons-resolver.changes | 5 +++++ xml-commons-resolver.spec | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/xml-commons-resolver.changes b/xml-commons-resolver.changes index 1ccdd6c..f570eea 100644 --- a/xml-commons-resolver.changes +++ b/xml-commons-resolver.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 20 14:32:33 UTC 2024 - Fridrich Strba + +- Use %patch -P N instead of deprecated %patchN. + ------------------------------------------------------------------- Fri Mar 18 16:29:44 UTC 2022 - Fridrich Strba diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index e0e7da0..28bee1c 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -1,7 +1,7 @@ # # spec file for package xml-commons-resolver # -# Copyright (c) 2023 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 @@ -68,8 +68,8 @@ Javadoc for %{name}. %prep %setup -q -%patch0 -p1 -%patch1 -p1 +%patch -P 0 -p1 +%patch -P 1 -p1 cp %{SOURCE5} pom.xml