From ae9a0de917af7597e2925593628642e12d653b4b8ae0780734c21eeaa1e6387f Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 21 Feb 2024 17:29:14 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/snakeyaml?expand=0&rev=24 --- snakeyaml.changes | 5 +++++ snakeyaml.spec | 13 ++++++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/snakeyaml.changes b/snakeyaml.changes index 8cd080c..30ab866 100644 --- a/snakeyaml.changes +++ b/snakeyaml.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Feb 21 17:28:08 UTC 2024 - Fridrich Strba + +- Use %patch -P N instead of deprecated %patchN. + ------------------------------------------------------------------- Tue Oct 18 07:17:01 UTC 2022 - Fridrich Strba diff --git a/snakeyaml.spec b/snakeyaml.spec index 785f709..86d45f6 100644 --- a/snakeyaml.spec +++ b/snakeyaml.spec @@ -1,7 +1,7 @@ # # spec file for package snakeyaml # -# 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 @@ -41,8 +41,7 @@ BuildRequires: ant BuildRequires: apache-commons-codec BuildRequires: fdupes BuildRequires: java-devel >= 1.8 -BuildRequires: javapackages-local -Requires: mvn(commons-codec:commons-codec) +BuildRequires: javapackages-local >= 6 BuildArch: noarch %if %{with tests} BuildRequires: ant-junit @@ -79,9 +78,9 @@ This package contains %{summary}. %prep %setup -q -n %{name}-%{name}-%{vertag} cp %{SOURCE1} build.xml -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 +%patch -P 0 -p1 +%patch -P 1 -p1 +%patch -P 2 -p1 %pom_remove_plugin :cobertura-maven-plugin %pom_remove_plugin :maven-changes-plugin @@ -158,7 +157,7 @@ install -dm 0755 %{buildroot}%{_javadir} install -pm 0644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar # pom install -dm 0755 %{buildroot}%{_mavenpomdir} -install -pm 0644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom +%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom %add_maven_depmap JPP-%{name}.pom %{name}.jar # javadoc install -dm 0755 %{buildroot}%{_javadocdir}/%{name}