From 85f2a587a13787da77e8c331db0d8daedfc3160cfd500d1245a0043b20d26da8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 31 May 2024 14:55:21 +0200 Subject: [PATCH] Sync from SUSE:SLFO:Main plexus-archiver revision 359b0c6535cf57b2fb4d9ca41c052b7f --- plexus-archiver.changes | 5 +++++ plexus-archiver.spec | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/plexus-archiver.changes b/plexus-archiver.changes index 00f1522..b56f59b 100644 --- a/plexus-archiver.changes +++ b/plexus-archiver.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 20 14:53:23 UTC 2024 - Fridrich Strba + +- Use %patch -P N instead of deprecated %patchN. + ------------------------------------------------------------------- Wed Sep 6 07:09:33 UTC 2023 - Fridrich Strba diff --git a/plexus-archiver.spec b/plexus-archiver.spec index 82d3792..674eaa7 100644 --- a/plexus-archiver.spec +++ b/plexus-archiver.spec @@ -1,7 +1,7 @@ # # spec file for package plexus-archiver # -# 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 @@ -59,7 +59,7 @@ Javadoc for %{name}. %setup -q -n %{name}-%{name}-%{version} cp %{SOURCE1} build.xml -%patch0 -p1 +%patch -P 0 -p1 %pom_remove_dep org.iq80.snappy:snappy rm -rf src/main/java/org/codehaus/plexus/archiver/snappy rm -rf src/test/java/org/codehaus/plexus/archiver/snappy @@ -67,7 +67,7 @@ rm -f src/main/java/org/codehaus/plexus/archiver/tar/SnappyTarFile.java rm -f src/main/java/org/codehaus/plexus/archiver/tar/PlexusIoTarSnappyFileResourceCollection.java rm -r src/test/java/org/codehaus/plexus/archiver/tar/TarSnappyUnArchiverTest.java -%patch1 -p1 +%patch -P 1 -p1 %pom_remove_dep com.github.luben:zstd-jni rm -rf src/main/java/org/codehaus/plexus/archiver/zstd rm -rf src/test/java/org/codehaus/plexus/archiver/zstd