From c56ca0dc0fcd6a8a515cf6bbf70f908539d9362991ffbf761d6d611b102d5254 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 21 Feb 2024 14:06:57 +0000 Subject: [PATCH 1/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/jzlib?expand=0&rev=35 --- jzlib.changes | 5 +++++ jzlib.spec | 7 ++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/jzlib.changes b/jzlib.changes index 9d2e134..08560fe 100644 --- a/jzlib.changes +++ b/jzlib.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Feb 21 14:06:48 UTC 2024 - Fridrich Strba + +- Use %patch -P N instead of deprecated %patchN. + ------------------------------------------------------------------- Sun Mar 20 12:17:34 UTC 2022 - Fridrich Strba diff --git a/jzlib.spec b/jzlib.spec index 71a9480..4f57a64 100644 --- a/jzlib.spec +++ b/jzlib.spec @@ -1,7 +1,7 @@ # # spec file for package jzlib # -# 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 @@ -57,7 +57,7 @@ Group: Documentation/HTML %prep %setup -q -%patch0 +%patch -P 0 cp %{SOURCE1} build.xml # bnc#500524 @@ -73,7 +73,8 @@ install -Dpm 644 target/%{name}-%{version}.jar \ %{buildroot}%{_javadir}/%{name}.jar # pom -install -Dpm 644 pom.xml \ +install -dm 755 %{buildroot}%{_mavenpomdir} +%mvn_install_pom pom.xml \ %{buildroot}%{_mavenpomdir}/%{name}.pom %add_maven_depmap %{name}.pom %{name}.jar From 3213baea591bd4424d74a3e9cdc7980fe09c92a335f21f5c289bb5f9d8baa797 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 21 Feb 2024 14:08:26 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/jzlib?expand=0&rev=36 --- jzlib.changes | 5 +++++ jzlib.spec | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/jzlib.changes b/jzlib.changes index 08560fe..4962445 100644 --- a/jzlib.changes +++ b/jzlib.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Feb 21 14:08:20 UTC 2024 - Fridrich Strba + +- Use %patch -P N instead of deprecated %patchN. + ------------------------------------------------------------------- Wed Feb 21 14:06:48 UTC 2024 - Fridrich Strba diff --git a/jzlib.spec b/jzlib.spec index 4f57a64..330c34a 100644 --- a/jzlib.spec +++ b/jzlib.spec @@ -30,7 +30,7 @@ Patch0: jzlib-javadoc-fixes.patch BuildRequires: ant >= 1.6 BuildRequires: fdupes BuildRequires: java-devel -BuildRequires: javapackages-local +BuildRequires: javapackages-local >= 6 BuildArch: noarch %description @@ -74,7 +74,7 @@ install -Dpm 644 target/%{name}-%{version}.jar \ # pom install -dm 755 %{buildroot}%{_mavenpomdir} -%mvn_install_pom pom.xml \ +%{mvn_install_pom} pom.xml \ %{buildroot}%{_mavenpomdir}/%{name}.pom %add_maven_depmap %{name}.pom %{name}.jar From d47b3a26ef4e53b4f8df5f1a5bee99ff1de5c1038c7ed81ff91847cfcad71c91 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 21 Feb 2024 14:08:44 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/jzlib?expand=0&rev=37 --- jzlib.changes | 5 ----- 1 file changed, 5 deletions(-) diff --git a/jzlib.changes b/jzlib.changes index 4962445..08560fe 100644 --- a/jzlib.changes +++ b/jzlib.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Wed Feb 21 14:08:20 UTC 2024 - Fridrich Strba - -- Use %patch -P N instead of deprecated %patchN. - ------------------------------------------------------------------- Wed Feb 21 14:06:48 UTC 2024 - Fridrich Strba