From 49f7cea0a9a01979229d926ff8c4678121f673eb Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 23 Sep 2014 09:35:25 +0200 Subject: [PATCH] Update to upstream version 2.0.12 --- .gitignore | 1 + plexus-io-test-failure.patch | 11 +++++++++++ plexus-io.spec | 37 +++++++++++++++--------------------- sources | 2 +- 4 files changed, 28 insertions(+), 23 deletions(-) create mode 100644 plexus-io-test-failure.patch diff --git a/.gitignore b/.gitignore index 4fee428..b3e5c06 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ sonatype-plexus-io-plexus-io-2.0.4-0-g2767dfe.tar.gz /plexus-io-2.0.5.tar.gz /LICENSE-2.0.txt /plexus-io-2.0.10.tar.gz +/plexus-io-2.0.12.tar.gz diff --git a/plexus-io-test-failure.patch b/plexus-io-test-failure.patch new file mode 100644 index 0000000..287abb2 --- /dev/null +++ b/plexus-io-test-failure.patch @@ -0,0 +1,11 @@ +--- src/test/java/org/codehaus/plexus/components/io/filemappers/ResourcesTest.java~ 2014-09-21 21:49:48.000000000 +0200 ++++ src/test/java/org/codehaus/plexus/components/io/filemappers/ResourcesTest.java 2014-09-23 09:38:48.601457483 +0200 +@@ -139,7 +139,7 @@ + assertTrue( res.getLastModified() != PlexusIoResource.UNKNOWN_MODIFICATION_DATE ); + if ( res instanceof PlexusIoFileResource ) + { +- assertEquals( res.getLastModified(), file.lastModified() ); ++ assertEquals( res.getLastModified() / 1000, file.lastModified() / 1000 ); + } + assertTrue( res.getSize() != PlexusIoResource.UNKNOWN_RESOURCE_SIZE ); + assertEquals( res.getSize(), file.length() ); diff --git a/plexus-io.spec b/plexus-io.spec index 4dcfd6f..01d5c08 100644 --- a/plexus-io.spec +++ b/plexus-io.spec @@ -1,39 +1,28 @@ Name: plexus-io -Version: 2.0.10 -Release: 3%{?dist} +Version: 2.0.12 +Release: 1%{?dist} Summary: Plexus IO Components - -Group: Development/Libraries License: ASL 2.0 URL: http://plexus.codehaus.org/plexus-components/plexus-io +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 -BuildArch: noarch -BuildRequires: java-devel >= 1:1.6.0 -BuildRequires: jpackage-utils +Patch0: %{name}-test-failure.patch -BuildRequires: plexus-utils -BuildRequires: plexus-containers-container-default -BuildRequires: plexus-components-pom -BuildRequires: maven-local -BuildRequires: maven-compiler-plugin -BuildRequires: maven-enforcer-plugin -BuildRequires: maven-jar-plugin -BuildRequires: maven-install-plugin -BuildRequires: maven-javadoc-plugin -BuildRequires: maven-resources-plugin -BuildRequires: maven-surefire-plugin -BuildRequires: maven-surefire-provider-junit -BuildRequires: maven-doxia-sitetools -BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) +BuildRequires: plexus-utils +BuildRequires: plexus-containers-container-default +BuildRequires: plexus-components-pom +BuildRequires: maven-local +BuildRequires: maven-doxia-sitetools +BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) %description Plexus IO is a set of plexus components, which are designed for use in I/O operations. %package javadoc -Group: Documentation Summary: Javadoc for %{name} %description javadoc @@ -43,6 +32,7 @@ API documentation for %{name}. %prep %setup -q -n plexus-io-plexus-io-%{version} cp %{SOURCE1} . +%patch0 %build export XMVN_COMPILER_SOURCE="1.5" @@ -60,6 +50,9 @@ export XMVN_COMPILER_SOURCE="1.5" %changelog +* Tue Sep 23 2014 Mikolaj Izdebski - 2.0.12-1 +- Update to upstream version 2.0.12 + * Sat Jun 07 2014 Fedora Release Engineering - 2.0.10-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild diff --git a/sources b/sources index 85ab92c..17d5d14 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -d3c29a9c5907e1dcd1cadd70079f638f plexus-io-2.0.10.tar.gz +f02de8c5dad152391f23945c7fa62f91 plexus-io-2.0.12.tar.gz 3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt