From 92e32e714e5fa883d5be93ac5469297d8d725061 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 Nov 2018 12:42:46 +0000 Subject: [PATCH 01/13] Expand conditionals --- plexus-archiver.spec | 6 ------ 1 file changed, 6 deletions(-) diff --git a/plexus-archiver.spec b/plexus-archiver.spec index e76395f..50b3fb8 100644 --- a/plexus-archiver.spec +++ b/plexus-archiver.spec @@ -1,4 +1,3 @@ -%bcond_without snappy Name: plexus-archiver Version: 3.6.0 @@ -23,9 +22,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) -%if %{with snappy} -BuildRequires: mvn(org.iq80.snappy:snappy) -%endif # Missing from xmvn-builddep BuildRequires: mvn(org.tukaani:xz) @@ -50,13 +46,11 @@ Javadoc for %{name}. %setup -q -n %{name}-%{name}-%{version} %mvn_file :%{name} plexus/archiver -%if %{without snappy} %patch0 -p1 %pom_remove_dep org.iq80.snappy:snappy 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 -%endif %build %mvn_build -f From ad078da690fde1b521baf0a51be9ea3f7c3dd9c7 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 Nov 2018 13:02:12 +0000 Subject: [PATCH 02/13] Remove explicit Epoch --- plexus-archiver.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/plexus-archiver.spec b/plexus-archiver.spec index 50b3fb8..0c3c520 100644 --- a/plexus-archiver.spec +++ b/plexus-archiver.spec @@ -2,7 +2,6 @@ Name: plexus-archiver Version: 3.6.0 Release: 1%{?dist} -Epoch: 0 Summary: Plexus Archiver Component License: ASL 2.0 URL: http://codehaus-plexus.github.io/plexus-archiver From 56095d00e3e94b002c25ffc02b03f363c80581e5 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 27 Feb 2019 10:54:10 +0100 Subject: [PATCH 03/13] Update to upstream version 4.1.0 --- .gitignore | 1 + plexus-archiver.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 0b285a9..3fca5d0 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ sonatype-plexus-archiver-plexus-archiver-2.1.1-0-ge64d181.tar.gz /plexus-archiver-3.4.tar.gz /plexus-archiver-3.5.tar.gz /plexus-archiver-3.6.0.tar.gz +/plexus-archiver-4.1.0.tar.gz diff --git a/plexus-archiver.spec b/plexus-archiver.spec index 0c3c520..d175961 100644 --- a/plexus-archiver.spec +++ b/plexus-archiver.spec @@ -1,6 +1,6 @@ Name: plexus-archiver -Version: 3.6.0 +Version: 4.1.0 Release: 1%{?dist} Summary: Plexus Archiver Component License: ASL 2.0 @@ -64,6 +64,9 @@ rm -f src/main/java/org/codehaus/plexus/archiver/tar/PlexusIoTarSnappyFileResour %license LICENSE %changelog +* Wed Feb 27 2019 Marian Koncek - 0:4.1.0-1 +- Update to upstream version 4.1.0 + * Wed May 09 2018 Michael Simacek - 0:3.6.0-1 - Update to upstream version 3.6.0 diff --git a/sources b/sources index 15b2a23..77fb7c7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (plexus-archiver-3.6.0.tar.gz) = 060affdbb11330a773cf04f03714405b02890d4e320b8e071f178fe2bd1f021dd286f29184600dc83618b8c9d801388572fc26c5c129713c3870ef92d7a55828 +SHA512 (plexus-archiver-4.1.0.tar.gz) = ec29b41d86ab3d727714bc012a99f8d1dcef6b758ed1ecd2e078d9cf87b4fa32ea8d8bdebf19de37d4eb21bf2efac8fda8159b6094719b22a6a7fad0a7ba6f06 From 2c67123f1e702f0871c35042b5f963551c02c55d Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 13 May 2019 21:29:56 +0200 Subject: [PATCH 04/13] Rebase patch --- 0001-Remove-support-for-snappy.patch | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/0001-Remove-support-for-snappy.patch b/0001-Remove-support-for-snappy.patch index cac52ab..98920a2 100644 --- a/0001-Remove-support-for-snappy.patch +++ b/0001-Remove-support-for-snappy.patch @@ -1,15 +1,15 @@ -From bd1055a190a1a64374f4aeb3bfde138d9c3d965f Mon Sep 17 00:00:00 2001 +From 6e2004d90deab2f59af01629187006e320444e34 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sat, 23 Sep 2017 11:43:45 +0200 Subject: [PATCH] Remove support for snappy --- - src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java | 3 +-- - src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java | 3 +-- + .../java/org/codehaus/plexus/archiver/tar/TarArchiver.java | 3 +-- + .../java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java b/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java -index 398ecf1..0d46cfc 100644 +index 8eec881..be8e7a3 100644 --- a/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java +++ b/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java @@ -38,7 +38,6 @@ @@ -30,18 +30,18 @@ index 398ecf1..0d46cfc 100644 else if ( TarCompressionMethod.xz.equals( tarCompressionMethod ) ) { diff --git a/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java b/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java -index 4bc94a4..15f0494 100644 +index 2316d4e..c2e2b83 100644 --- a/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java +++ b/src/main/java/org/codehaus/plexus/archiver/tar/TarUnArchiver.java -@@ -30,7 +30,6 @@ - import org.codehaus.plexus.archiver.ArchiverException; +@@ -31,7 +31,6 @@ import org.codehaus.plexus.archiver.util.Streams; + import org.codehaus.plexus.components.io.filemappers.FileMapper; import org.codehaus.plexus.util.IOUtil; -import org.iq80.snappy.SnappyInputStream; /** * @author Emmanuel Venisse -@@ -153,7 +152,7 @@ else if ( compression == UntarCompressionMethod.BZIP2 ) +@@ -154,7 +153,7 @@ else if ( compression == UntarCompressionMethod.BZIP2 ) } else if ( compression == UntarCompressionMethod.SNAPPY ) { @@ -51,5 +51,5 @@ index 4bc94a4..15f0494 100644 else if ( compression == UntarCompressionMethod.XZ ) { -- -2.13.5 +2.21.0 From 65d7ad9a79a20939cb993a3dc80192352fbb1ce2 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:01:27 +0200 Subject: [PATCH 05/13] Mass rebuild for javapackages-tools 201901 --- plexus-archiver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plexus-archiver.spec b/plexus-archiver.spec index d175961..3bcae90 100644 --- a/plexus-archiver.spec +++ b/plexus-archiver.spec @@ -1,7 +1,7 @@ Name: plexus-archiver Version: 4.1.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Plexus Archiver Component License: ASL 2.0 URL: http://codehaus-plexus.github.io/plexus-archiver @@ -64,6 +64,9 @@ rm -f src/main/java/org/codehaus/plexus/archiver/tar/PlexusIoTarSnappyFileResour %license LICENSE %changelog +* Fri May 24 2019 Mikolaj Izdebski - 4.1.0-2 +- Mass rebuild for javapackages-tools 201901 + * Wed Feb 27 2019 Marian Koncek - 0:4.1.0-1 - Update to upstream version 4.1.0 From 8f8455a4a88e8dd8d0ce5fdc06221526cf493494 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 23 Oct 2019 10:55:11 +0200 Subject: [PATCH 06/13] Update to upstream version 4.2.0 --- .gitignore | 1 + plexus-archiver.spec | 21 ++++++++++++--------- sources | 2 +- 3 files changed, 14 insertions(+), 10 deletions(-) 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 From f3ce44967faef310b733fd27c926175ee79805c9 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 5 Nov 2019 17:29:28 +0100 Subject: [PATCH 07/13] Mass rebuild for javapackages-tools 201902 --- plexus-archiver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plexus-archiver.spec b/plexus-archiver.spec index d42bcc7..ff6d2bd 100644 --- a/plexus-archiver.spec +++ b/plexus-archiver.spec @@ -1,6 +1,6 @@ Name: plexus-archiver Version: 4.2.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Plexus Archiver Component License: ASL 2.0 URL: http://codehaus-plexus.github.io/plexus-archiver @@ -64,6 +64,9 @@ sed -i '/getLoggerManager/d' src/test/java/org/codehaus/plexus/archiver/Duplicat %license LICENSE %changelog +* Tue Nov 05 2019 Mikolaj Izdebski - 4.2.0-2 +- Mass rebuild for javapackages-tools 201902 + * Wed Oct 23 2019 Marian Koncek - 4.2.0-1 - Update to upstream version 4.2.0 From dc509962afa1ad9e64b9a17a9a9a6ca3a2200d5a Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 20 Nov 2019 11:43:44 +0100 Subject: [PATCH 08/13] Update to upstream version 4.2.1 --- .gitignore | 1 + plexus-archiver.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 748df77..94fa545 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ sonatype-plexus-archiver-plexus-archiver-2.1.1-0-ge64d181.tar.gz /plexus-archiver-3.6.0.tar.gz /plexus-archiver-4.1.0.tar.gz /plexus-archiver-4.2.0.tar.gz +/plexus-archiver-4.2.1.tar.gz diff --git a/plexus-archiver.spec b/plexus-archiver.spec index ff6d2bd..d1188fa 100644 --- a/plexus-archiver.spec +++ b/plexus-archiver.spec @@ -1,6 +1,6 @@ Name: plexus-archiver -Version: 4.2.0 -Release: 2%{?dist} +Version: 4.2.1 +Release: 1%{?dist} Summary: Plexus Archiver Component License: ASL 2.0 URL: http://codehaus-plexus.github.io/plexus-archiver @@ -64,6 +64,9 @@ sed -i '/getLoggerManager/d' src/test/java/org/codehaus/plexus/archiver/Duplicat %license LICENSE %changelog +* Wed Nov 20 2019 Marian Koncek - 4.2.1-1 +- Update to upstream version 4.2.1 + * Tue Nov 05 2019 Mikolaj Izdebski - 4.2.0-2 - Mass rebuild for javapackages-tools 201902 diff --git a/sources b/sources index 6c9d4b5..55ae509 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (plexus-archiver-4.2.0.tar.gz) = d990e1ef0def4d30af14bad92abf1a0f62d90ed66127c00679e503edc1019c45d1abbdadda8fe29224f63a2bbc41bac0dede073b1fec02bb3ef76df72b7c41d6 +SHA512 (plexus-archiver-4.2.1.tar.gz) = c35a228aaa40fe93354f6e38e37933c015070bc0029307d41f0c174b0cc80c73a3ac9586be885348330c16422d7152d33d5cf7e21ae5ec35a849187cc5300735 From 990474e528804d351e2736248184e73d284b302c Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Mon, 3 Aug 2020 12:21:19 +0200 Subject: [PATCH 09/13] Update to upstream version 4.2.2 --- .gitignore | 1 + plexus-archiver.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 94fa545..fd2e326 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ sonatype-plexus-archiver-plexus-archiver-2.1.1-0-ge64d181.tar.gz /plexus-archiver-4.1.0.tar.gz /plexus-archiver-4.2.0.tar.gz /plexus-archiver-4.2.1.tar.gz +/plexus-archiver-4.2.2.tar.gz diff --git a/plexus-archiver.spec b/plexus-archiver.spec index d1188fa..4fbe97b 100644 --- a/plexus-archiver.spec +++ b/plexus-archiver.spec @@ -1,9 +1,9 @@ Name: plexus-archiver -Version: 4.2.1 +Version: 4.2.2 Release: 1%{?dist} Summary: Plexus Archiver Component License: ASL 2.0 -URL: http://codehaus-plexus.github.io/plexus-archiver +URL: https://codehaus-plexus.github.io/plexus-archiver BuildArch: noarch Source0: https://github.com/codehaus-plexus/plexus-archiver/archive/plexus-archiver-%{version}.tar.gz @@ -64,6 +64,9 @@ sed -i '/getLoggerManager/d' src/test/java/org/codehaus/plexus/archiver/Duplicat %license LICENSE %changelog +* Mon Aug 03 2020 Marian Koncek - 4.2.2-1 +- Update to upstream version 4.2.2 + * Wed Nov 20 2019 Marian Koncek - 4.2.1-1 - Update to upstream version 4.2.1 diff --git a/sources b/sources index 55ae509..d22be9e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (plexus-archiver-4.2.1.tar.gz) = c35a228aaa40fe93354f6e38e37933c015070bc0029307d41f0c174b0cc80c73a3ac9586be885348330c16422d7152d33d5cf7e21ae5ec35a849187cc5300735 +SHA512 (plexus-archiver-4.2.2.tar.gz) = 9c599077ba503d10b57bd24b1868ce6d0471fd53889ac9a003249db75bf984bdd09519c0803c2393bd2da3577e412b7ae4c21156a65940d9fd33d7cd378c10c1 From b1358898cd69b3aadc375995515607bb52ae160c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 4 Dec 2020 12:50:42 +0100 Subject: [PATCH 10/13] Update to upstream version 4.2.3 --- .gitignore | 1 + plexus-archiver.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index fd2e326..3413f0b 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ sonatype-plexus-archiver-plexus-archiver-2.1.1-0-ge64d181.tar.gz /plexus-archiver-4.2.0.tar.gz /plexus-archiver-4.2.1.tar.gz /plexus-archiver-4.2.2.tar.gz +/plexus-archiver-4.2.3.tar.gz diff --git a/plexus-archiver.spec b/plexus-archiver.spec index 4fbe97b..c49034d 100644 --- a/plexus-archiver.spec +++ b/plexus-archiver.spec @@ -1,5 +1,5 @@ Name: plexus-archiver -Version: 4.2.2 +Version: 4.2.3 Release: 1%{?dist} Summary: Plexus Archiver Component License: ASL 2.0 @@ -64,6 +64,9 @@ sed -i '/getLoggerManager/d' src/test/java/org/codehaus/plexus/archiver/Duplicat %license LICENSE %changelog +* Fri Dec 4 2020 Mikolaj Izdebski - 4.2.3-1 +- Update to upstream version 4.2.3 + * Mon Aug 03 2020 Marian Koncek - 4.2.2-1 - Update to upstream version 4.2.2 diff --git a/sources b/sources index d22be9e..f460365 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (plexus-archiver-4.2.2.tar.gz) = 9c599077ba503d10b57bd24b1868ce6d0471fd53889ac9a003249db75bf984bdd09519c0803c2393bd2da3577e412b7ae4c21156a65940d9fd33d7cd378c10c1 +SHA512 (plexus-archiver-4.2.3.tar.gz) = a7e4fb05b6961d5c21c69b95565dde5cbea9784e58ba1de76b890e2c1dc9227799c05cda66c7a45761292fd5937e1edcca0d989018f892f8a43c759d7f2ed36d From d282df0eb7f3f15849b4be073c5f04d5ac6ad76e Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Fri, 12 Feb 2021 10:50:23 +0100 Subject: [PATCH 11/13] Update to upstream version 4.2.4 --- .gitignore | 1 + plexus-archiver.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3413f0b..532d687 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ sonatype-plexus-archiver-plexus-archiver-2.1.1-0-ge64d181.tar.gz /plexus-archiver-4.2.1.tar.gz /plexus-archiver-4.2.2.tar.gz /plexus-archiver-4.2.3.tar.gz +/plexus-archiver-4.2.4.tar.gz diff --git a/plexus-archiver.spec b/plexus-archiver.spec index c49034d..c569c8b 100644 --- a/plexus-archiver.spec +++ b/plexus-archiver.spec @@ -1,5 +1,5 @@ Name: plexus-archiver -Version: 4.2.3 +Version: 4.2.4 Release: 1%{?dist} Summary: Plexus Archiver Component License: ASL 2.0 @@ -64,6 +64,9 @@ sed -i '/getLoggerManager/d' src/test/java/org/codehaus/plexus/archiver/Duplicat %license LICENSE %changelog +* Fri Feb 12 2021 Marian Koncek - 4.2.4-1 +- Update to upstream version 4.2.4 + * Fri Dec 4 2020 Mikolaj Izdebski - 4.2.3-1 - Update to upstream version 4.2.3 diff --git a/sources b/sources index f460365..a0ad484 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (plexus-archiver-4.2.3.tar.gz) = a7e4fb05b6961d5c21c69b95565dde5cbea9784e58ba1de76b890e2c1dc9227799c05cda66c7a45761292fd5937e1edcca0d989018f892f8a43c759d7f2ed36d +SHA512 (plexus-archiver-4.2.4.tar.gz) = a550683587bc42650a4b714df68a88c430450c0fba87ce64c7da0dc1380de293ced259e304e33688b594a23f1b1760bba5868e65d8d13d4d9d21fff00f9b1bc8 From c616f6cb5b3c68faf237f83d1272093a1e87690e Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 15:33:12 +0200 Subject: [PATCH 12/13] Conditionalize buildrequires in bootstrap mode --- plexus-archiver.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/plexus-archiver.spec b/plexus-archiver.spec index c569c8b..ad2dd70 100644 --- a/plexus-archiver.spec +++ b/plexus-archiver.spec @@ -1,3 +1,5 @@ +%bcond_without bootstrap + Name: plexus-archiver Version: 4.2.4 Release: 1%{?dist} @@ -11,6 +13,9 @@ Source0: https://github.com/codehaus-plexus/plexus-archiver/archive/plexu Patch0: 0001-Remove-support-for-snappy.patch BuildRequires: maven-local +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: mvn(com.google.code.findbugs:jsr305) BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.commons:commons-compress) @@ -21,6 +26,7 @@ BuildRequires: mvn(org.codehaus.plexus:plexus-io) BuildRequires: mvn(org.codehaus.plexus:plexus:pom:) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) BuildRequires: mvn(org.tukaani:xz) +%endif %description The Plexus project seeks to create end-to-end developer tools for From d1b59177d863bf362d4c4bfd5189d6a6679c4a19 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 13 May 2021 19:08:42 +0200 Subject: [PATCH 13/13] Turn off bootstrap mode by default --- plexus-archiver.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plexus-archiver.spec b/plexus-archiver.spec index ad2dd70..592c21e 100644 --- a/plexus-archiver.spec +++ b/plexus-archiver.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: plexus-archiver Version: 4.2.4