diff --git a/.gitignore b/.gitignore index 505578f..e65ff4c 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ plexus-utils-3.0.tar.xz /plexus-utils-3.0.24.tar.gz /plexus-utils-3.1.0.tar.gz /plexus-utils-3.2.0.tar.gz +/plexus-utils-3.2.1.tar.gz diff --git a/0001-Follow-symlinks-in-NioFiles.copy.patch b/0001-Follow-symlinks-in-NioFiles.copy.patch deleted file mode 100644 index 9d12d47..0000000 --- a/0001-Follow-symlinks-in-NioFiles.copy.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 978fcb3b207d1b1a9895dadd40ba31c290c57918 Mon Sep 17 00:00:00 2001 -From: Michael Simacek -Date: Wed, 11 Jul 2018 13:15:55 +0200 -Subject: [PATCH] Follow symlinks in NioFiles.copy - ---- - src/main/java/org/codehaus/plexus/util/NioFiles.java | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/main/java/org/codehaus/plexus/util/NioFiles.java b/src/main/java/org/codehaus/plexus/util/NioFiles.java -index 2841978..50cdeb7 100644 ---- a/src/main/java/org/codehaus/plexus/util/NioFiles.java -+++ b/src/main/java/org/codehaus/plexus/util/NioFiles.java -@@ -138,7 +138,7 @@ public static File copy( File source, File target ) - throws IOException - { - Path copy = Files.copy( source.toPath(), target.toPath(), StandardCopyOption.REPLACE_EXISTING, -- StandardCopyOption.COPY_ATTRIBUTES, LinkOption.NOFOLLOW_LINKS ); -+ StandardCopyOption.COPY_ATTRIBUTES ); - return copy.toFile(); - } - --- -2.17.1 - diff --git a/plexus-utils.spec b/plexus-utils.spec index 9e0062b..8cabc25 100644 --- a/plexus-utils.spec +++ b/plexus-utils.spec @@ -1,6 +1,6 @@ Name: plexus-utils -Version: 3.2.0 -Release: 2%{?dist} +Version: 3.2.1 +Release: 1%{?dist} Summary: Plexus Common Utilities # ASL 1.1: several files in src/main/java/org/codehaus/plexus/util/ # xpp: src/main/java/org/codehaus/plexus/util/xml/pull directory @@ -17,9 +17,6 @@ BuildArch: noarch Source0: https://github.com/codehaus-plexus/%{name}/archive/%{name}-%{version}.tar.gz Source1: http://apache.org/licenses/LICENSE-2.0.txt -# https://github.com/codehaus-plexus/plexus-utils/issues/45 -Patch1: 0001-Follow-symlinks-in-NioFiles.copy.patch - BuildRequires: maven-local BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) @@ -39,8 +36,6 @@ is like a J2EE application server, without all the baggage. %prep %setup -q -n %{name}-%{name}-%{version} -%patch1 -p1 - cp %{SOURCE1} . %mvn_file : plexus/utils @@ -71,6 +66,9 @@ cp %{SOURCE1} . %license NOTICE.txt LICENSE-2.0.txt %changelog +* Mon Jul 29 2019 Marian Koncek - 3.2.1-1 +- Update to upstream version 3.2.1 + * Fri May 24 2019 Mikolaj Izdebski - 3.2.0-2 - Mass rebuild for javapackages-tools 201901 diff --git a/sources b/sources index 22df18d..4f7ebd8 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (plexus-utils-3.2.0.tar.gz) = 7d33472e9f2a7f344d3ab5054889b0b8ba36f23dc8690bffbf0ac689c4a9f9906a265e59e030c668068b64d56587de2adbe09a93833201c8b9ec74edf9a49e42 +SHA512 (plexus-utils-3.2.1.tar.gz) = 9642e5513aaecbc8a7e25d42837ee5604dc76dddef83e9091edfc86b4c0d02fd590ac3c0fc998f275f0d00806bd71594006bcc4c78cf492df3d828a91da1d2f9 SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8