From 0a27708a4a7da6ccd175a81acbc35bf44e80f57ad82009876d736cd497e84bb7 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 21 Feb 2024 08:21:45 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/beust-jcommander?expand=0&rev=16 --- beust-jcommander.changes | 5 +++++ beust-jcommander.spec | 10 ++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/beust-jcommander.changes b/beust-jcommander.changes index 7c37af8..3b1fa7f 100644 --- a/beust-jcommander.changes +++ b/beust-jcommander.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Feb 21 08:20:16 UTC 2024 - Fridrich Strba + +- Use %patch -P N instead of deprecated %patchN. + ------------------------------------------------------------------- Wed May 3 09:07:55 UTC 2023 - Fridrich Strba diff --git a/beust-jcommander.spec b/beust-jcommander.spec index f738efe..0e3800f 100644 --- a/beust-jcommander.spec +++ b/beust-jcommander.spec @@ -1,7 +1,7 @@ # -# spec file +# spec file for package beust-jcommander # -# 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 @@ -51,15 +51,13 @@ This package contains the %{summary}. %prep %setup -q -n %{short_name}-%{version} -%patch0 -p1 +%patch -P 0 -p1 chmod -x license.txt cp -p %{SOURCE1} pom.xml cp -p %{SOURCE2} build.xml sed -i 's/@VERSION@/%{version}/g' pom.xml build.xml -%pom_remove_parent . - %build %{ant} jar javadoc @@ -71,7 +69,7 @@ install -m 644 target/%{short_name}-%{version}.jar \ # pom install -d -m 755 %{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