diff --git a/.gitignore b/.gitignore index 3fca5d0..748df77 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,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 3bcae90..d42bcc7 100644 --- a/plexus-archiver.spec +++ b/plexus-archiver.spec @@ -1,7 +1,6 @@ - Name: plexus-archiver -Version: 4.1.0 -Release: 2%{?dist} +Version: 4.2.0 +Release: 1%{?dist} Summary: Plexus Archiver Component License: ASL 2.0 URL: http://codehaus-plexus.github.io/plexus-archiver @@ -13,7 +12,7 @@ Patch0: 0001-Remove-support-for-snappy.patch 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) @@ -21,8 +20,6 @@ BuildRequires: mvn(org.codehaus.plexus:plexus-container-default) BuildRequires: mvn(org.codehaus.plexus:plexus-io) BuildRequires: mvn(org.codehaus.plexus:plexus:pom:) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) - -# Missing from xmvn-builddep BuildRequires: mvn(org.tukaani:xz) %description @@ -33,14 +30,12 @@ reusable components for hibernate, form processing, jndi, i18n, velocity, etc. Plexus also includes an application server which is like a J2EE application server, without all the baggage. - %package javadoc Summary: Javadoc for %{name} %description javadoc Javadoc for %{name}. - %prep %setup -q -n %{name}-%{name}-%{version} %mvn_file :%{name} plexus/archiver @@ -50,9 +45,14 @@ Javadoc for %{name}. rm -rf src/main/java/org/codehaus/plexus/archiver/snappy rm -f src/main/java/org/codehaus/plexus/archiver/tar/SnappyTarFile.java rm -f src/main/java/org/codehaus/plexus/archiver/tar/PlexusIoTarSnappyFileResourceCollection.java +rm src/test/java/org/codehaus/plexus/archiver/snappy/SnappyArchiverTest.java +rm src/test/java/org/codehaus/plexus/archiver/tar/TarSnappyUnArchiverTest.java + +# Tests use old plexus-containers-default +sed -i '/getLoggerManager/d' src/test/java/org/codehaus/plexus/archiver/DuplicateFilesTest.java %build -%mvn_build -f +%mvn_build %install %mvn_install @@ -64,6 +64,9 @@ rm -f src/main/java/org/codehaus/plexus/archiver/tar/PlexusIoTarSnappyFileResour %license LICENSE %changelog +* Wed Oct 23 2019 Marian Koncek - 4.2.0-1 +- Update to upstream version 4.2.0 + * Fri May 24 2019 Mikolaj Izdebski - 4.1.0-2 - Mass rebuild for javapackages-tools 201901 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