diff --git a/.gitignore b/.gitignore index 3fca5d0..b0e7381 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,13 @@ -plexus-archiver-src.tar.gz -plexus-archiver-1.0-alpha-12-src.tar.bz2 -plexus-archiver-1.1-src.tar.xz +/results_* +/*.src.rpm + +/plexus-archiver-src.tar.gz +/plexus-archiver-1.0-alpha-12-src.tar.bz2 +/plexus-archiver-1.1-src.tar.xz /plexus-archiver-1.2.tar.xz -plexus-archiver-2.0.1.tar.xz -sonatype-plexus-archiver-plexus-archiver-2.1-0-g9913f73.tar.gz -sonatype-plexus-archiver-plexus-archiver-2.1.1-0-ge64d181.tar.gz +/plexus-archiver-2.0.1.tar.xz +/sonatype-plexus-archiver-plexus-archiver-2.1-0-g9913f73.tar.gz +/sonatype-plexus-archiver-plexus-archiver-2.1.1-0-ge64d181.tar.gz /sonatype-plexus-archiver-plexus-archiver-2.2-0-g450d320.tar.gz /plexus-archiver-2.2.tar.gz /LICENSE-2.0.txt @@ -26,3 +29,4 @@ sonatype-plexus-archiver-plexus-archiver-2.1.1-0-ge64d181.tar.gz /plexus-archiver-3.5.tar.gz /plexus-archiver-3.6.0.tar.gz /plexus-archiver-4.1.0.tar.gz +/plexus-archiver-4.2.0.tar.gz diff --git a/plexus-archiver.spec b/plexus-archiver.spec index 12b4646..683040e 100644 --- a/plexus-archiver.spec +++ b/plexus-archiver.spec @@ -1,33 +1,32 @@ %bcond_without snappy Name: plexus-archiver -Version: 4.1.0 +Version: 4.2.0 Release: 1%{?dist} Epoch: 0 Summary: Plexus Archiver Component License: ASL 2.0 -URL: http://codehaus-plexus.github.io/plexus-archiver -BuildArch: noarch -Source0: https://github.com/codehaus-plexus/plexus-archiver/archive/plexus-archiver-%{version}.tar.gz +URL: https://github.com/codehaus-plexus/plexus-archiver +Source0: %{url}/archive/plexus-archiver-%{version}.tar.gz Patch0: 0001-Remove-support-for-snappy.patch +BuildArch: noarch + BuildRequires: maven-local BuildRequires: mvn(com.google.code.findbugs:jsr305) -BuildRequires: mvn(commons-io:commons-io) +BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.commons:commons-compress) BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata) -BuildRequires: mvn(org.codehaus.plexus:plexus-container-default) -BuildRequires: mvn(org.codehaus.plexus:plexus-io) +BuildRequires: mvn(org.codehaus.plexus:plexus-container-default) >= 2.1.0 +BuildRequires: mvn(org.codehaus.plexus:plexus-io) >= 3.2.0 +BuildRequires: mvn(org.codehaus.plexus:plexus-utils) >= 3.3.0 BuildRequires: mvn(org.codehaus.plexus:plexus:pom:) -BuildRequires: mvn(org.codehaus.plexus:plexus-utils) %if %{with snappy} BuildRequires: mvn(org.iq80.snappy:snappy) %endif - -# Missing from xmvn-builddep BuildRequires: mvn(org.tukaani:xz) %description @@ -58,8 +57,11 @@ rm -f src/main/java/org/codehaus/plexus/archiver/tar/SnappyTarFile.java rm -f src/main/java/org/codehaus/plexus/archiver/tar/PlexusIoTarSnappyFileResourceCollection.java %endif +# looks like this test hasn't been ported to plexus-containers 2+ yet: +rm src/test/java/org/codehaus/plexus/archiver/DuplicateFilesTest.java + %build -%mvn_build -f +%mvn_build %install %mvn_install @@ -71,6 +73,9 @@ rm -f src/main/java/org/codehaus/plexus/archiver/tar/PlexusIoTarSnappyFileResour %license LICENSE %changelog +* Thu Oct 24 2019 Fabio Valentini - 0:4.2.0-1 +- Update to version 4.2.0. + * Wed Aug 07 2019 Marian Koncek - 0:4.1.0-1 - Update to upstream version 4.1.0 diff --git a/sources b/sources index 77fb7c7..6c9d4b5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (plexus-archiver-4.1.0.tar.gz) = ec29b41d86ab3d727714bc012a99f8d1dcef6b758ed1ecd2e078d9cf87b4fa32ea8d8bdebf19de37d4eb21bf2efac8fda8159b6094719b22a6a7fad0a7ba6f06 +SHA512 (plexus-archiver-4.2.0.tar.gz) = d990e1ef0def4d30af14bad92abf1a0f62d90ed66127c00679e503edc1019c45d1abbdadda8fe29224f63a2bbc41bac0dede073b1fec02bb3ef76df72b7c41d6