diff --git a/.gitignore b/.gitignore index f9a920d..852eb11 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ sonatype-plexus-io-plexus-io-2.0.4-0-g2767dfe.tar.gz /plexus-io-2.0.10.tar.gz /plexus-io-2.0.12.tar.gz /plexus-io-2.1.1.tar.gz +/plexus-io-2.1.2.tar.gz diff --git a/0001-Don-t-try-to-set-attributes-of-symbolic-links.patch b/0001-Don-t-try-to-set-attributes-of-symbolic-links.patch deleted file mode 100644 index 43a1212..0000000 --- a/0001-Don-t-try-to-set-attributes-of-symbolic-links.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 2566bd476a0036f91b610679eb5cc15aeae99612 Mon Sep 17 00:00:00 2001 -From: Mikolaj Izdebski -Date: Mon, 29 Sep 2014 07:30:29 +0200 -Subject: [PATCH] Don't try to set attributes of symbolic links - ---- - .../plexus/components/io/attributes/Java7AttributeUtils.java | 7 ++----- - 1 file changed, 2 insertions(+), 5 deletions(-) - -diff --git a/src/main/java/org/codehaus/plexus/components/io/attributes/Java7AttributeUtils.java b/src/main/java/org/codehaus/plexus/components/io/attributes/Java7AttributeUtils.java -index 25bd452..e43f738 100644 ---- a/src/main/java/org/codehaus/plexus/components/io/attributes/Java7AttributeUtils.java -+++ b/src/main/java/org/codehaus/plexus/components/io/attributes/Java7AttributeUtils.java -@@ -52,11 +52,8 @@ public static void chmod( File file, int mode ) - throws IOException - { - final Path path = file.toPath(); -- if (Files.isSymbolicLink( path )){ -- if (Files.readSymbolicLink( path ).toFile().exists()){ -- Files.setPosixFilePermissions( path, getPermissions( mode ) ); -- } -- } else { -+ if ( !Files.isSymbolicLink( path ) ) -+ { - Files.setPosixFilePermissions( path, getPermissions( mode ) ); - } - } --- -1.9.3 - diff --git a/plexus-io.spec b/plexus-io.spec index 51c483b..fd6b396 100644 --- a/plexus-io.spec +++ b/plexus-io.spec @@ -1,6 +1,6 @@ Name: plexus-io -Version: 2.1.1 -Release: 2%{?dist} +Version: 2.1.2 +Release: 1%{?dist} Summary: Plexus IO Components License: ASL 2.0 URL: http://plexus.codehaus.org/plexus-components/plexus-io @@ -9,10 +9,6 @@ BuildArch: noarch Source0: https://github.com/sonatype/plexus-io/archive/plexus-io-%{version}.tar.gz Source1: http://www.apache.org/licenses/LICENSE-2.0.txt -# Accepted upstream: http://jira.codehaus.org/browse/PLXCOMP-244 -# https://github.com/sonatype/plexus-io/pull/6 -Patch0: 0001-Don-t-try-to-set-attributes-of-symbolic-links.patch - BuildRequires: plexus-utils BuildRequires: plexus-containers-container-default BuildRequires: plexus-components-pom @@ -34,7 +30,6 @@ API documentation for %{name}. %prep %setup -q -n plexus-io-plexus-io-%{version} cp %{SOURCE1} . -%patch0 -p1 %build export XMVN_COMPILER_SOURCE="1.5" @@ -52,6 +47,10 @@ export XMVN_COMPILER_SOURCE="1.5" %changelog +* Wed Oct 1 2014 Mikolaj Izdebski - 2.1.2-1 +- Update to upstream version 2.1.2 +- Remove patch for PLXCOMP-244 (accepted upstream) + * Mon Sep 29 2014 Mikolaj Izdebski - 2.1.1-2 - Don't try to set attributes of symbolic links diff --git a/sources b/sources index a93f6d6..ea283be 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -82809e074660238fbf2b1d744df5fcd3 plexus-io-2.1.1.tar.gz +25374a5f85267d9635b8fb22831a6e87 plexus-io-2.1.2.tar.gz 3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt