diff --git a/0001-Follow-symlinks-in-NioFiles.copy.patch b/0001-Follow-symlinks-in-NioFiles.copy.patch deleted file mode 100644 index 2cedde1..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-3.1.1.tar.gz b/plexus-utils-3.1.1.tar.gz deleted file mode 100644 index ca19785..0000000 --- a/plexus-utils-3.1.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b129763f3e3198d0cf7926f08045fa58f696ba8032e43dc0afe4ff6bf1b1d3c0 -size 428079 diff --git a/plexus-utils-3.3.0.tar.gz b/plexus-utils-3.3.0.tar.gz new file mode 100644 index 0000000..9f36869 --- /dev/null +++ b/plexus-utils-3.3.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a8953a183887d026311742ef72ab64a8e38916097690c24566bcf28b82478b03 +size 432641 diff --git a/plexus-utils-build.xml b/plexus-utils-build.xml index 6ce1182..ddd703b 100644 --- a/plexus-utils-build.xml +++ b/plexus-utils-build.xml @@ -11,7 +11,7 @@ - + diff --git a/plexus-utils.changes b/plexus-utils.changes index 7bee610..ccf439d 100644 --- a/plexus-utils.changes +++ b/plexus-utils.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Nov 21 15:05:50 UTC 2019 - Fridrich Strba + +- Upgrade to upstream version 3.3.0 +- Removed patch: + * 0001-Follow-symlinks-in-NioFiles.copy.patch + + not needed with this version + ------------------------------------------------------------------- Tue Apr 9 16:52:48 UTC 2019 - Fridrich Strba diff --git a/plexus-utils.spec b/plexus-utils.spec index 3b61eec..ae5b62b 100644 --- a/plexus-utils.spec +++ b/plexus-utils.spec @@ -1,7 +1,7 @@ # # spec file for package plexus-utils # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: plexus-utils -Version: 3.1.1 +Version: 3.3.0 Release: 0 Summary: Plexus Common Utilities License: Apache-1.1 AND Apache-2.0 AND xpp AND BSD-3-Clause AND SUSE-Public-Domain @@ -26,8 +26,6 @@ URL: https://codehaus-plexus.github.io/plexus-utils/ Source0: https://github.com/codehaus-plexus/%{name}/archive/%{name}-%{version}.tar.gz Source1: %{name}-build.xml Source2: 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: ant BuildRequires: fdupes BuildRequires: javapackages-local @@ -50,8 +48,6 @@ Javadoc for %{name}. %prep %setup -q -n %{name}-%{name}-%{version} -%patch1 -p1 - cp %{SOURCE1} build.xml cp %{SOURCE2} .