From c735e3836bc58911aba1904809ebf37da7baa752 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sat, 13 Apr 2019 17:42:01 +0200 Subject: [PATCH 01/10] Update to upstream version 3.2.0 --- .gitignore | 1 + plexus-utils.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index c854b5e..505578f 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ plexus-utils-3.0.tar.xz /plexus-utils-3.0.22.tar.gz /plexus-utils-3.0.24.tar.gz /plexus-utils-3.1.0.tar.gz +/plexus-utils-3.2.0.tar.gz diff --git a/plexus-utils.spec b/plexus-utils.spec index 5166761..7f0e0ec 100644 --- a/plexus-utils.spec +++ b/plexus-utils.spec @@ -1,6 +1,6 @@ Name: plexus-utils -Version: 3.1.0 -Release: 3%{?dist} +Version: 3.2.0 +Release: 1%{?dist} Summary: Plexus Common Utilities # ASL 1.1: several files in src/main/java/org/codehaus/plexus/util/ # xpp: src/main/java/org/codehaus/plexus/util/xml/pull directory @@ -77,6 +77,9 @@ cp %{SOURCE1} . %doc NOTICE.txt LICENSE-2.0.txt %changelog +* Sat Apr 13 2019 Mikolaj Izdebski - 3.2.0-1 +- Update to upstream version 3.2.0 + * Fri Jul 13 2018 Fedora Release Engineering - 3.1.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 715972b..22df18d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (plexus-utils-3.1.0.tar.gz) = 04d99d332c1417b25c20f50ea9d311fae1398de845a874ae198cc0d39fd44411d3b6ace166bce449569920c8eb5e5f6dece291aed19869a175328467ae204193 +SHA512 (plexus-utils-3.2.0.tar.gz) = 7d33472e9f2a7f344d3ab5054889b0b8ba36f23dc8690bffbf0ac689c4a9f9906a265e59e030c668068b64d56587de2adbe09a93833201c8b9ec74edf9a49e42 SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8 From da140b1c893ebb593987130785100388348c8e1f Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:01:37 +0200 Subject: [PATCH 02/10] Mass rebuild for javapackages-tools 201901 --- plexus-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plexus-utils.spec b/plexus-utils.spec index 7f0e0ec..341a619 100644 --- a/plexus-utils.spec +++ b/plexus-utils.spec @@ -1,6 +1,6 @@ Name: plexus-utils Version: 3.2.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Plexus Common Utilities # ASL 1.1: several files in src/main/java/org/codehaus/plexus/util/ # xpp: src/main/java/org/codehaus/plexus/util/xml/pull directory @@ -77,6 +77,9 @@ cp %{SOURCE1} . %doc NOTICE.txt LICENSE-2.0.txt %changelog +* Fri May 24 2019 Mikolaj Izdebski - 3.2.0-2 +- Mass rebuild for javapackages-tools 201901 + * Sat Apr 13 2019 Mikolaj Izdebski - 3.2.0-1 - Update to upstream version 3.2.0 From 7413613fa62cc2f6e7ccef7677e95ad2171cc2a8 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 28 Jun 2019 11:26:55 +0200 Subject: [PATCH 03/10] Use javadoc_package macro --- plexus-utils.spec | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/plexus-utils.spec b/plexus-utils.spec index 341a619..1eae0fd 100644 --- a/plexus-utils.spec +++ b/plexus-utils.spec @@ -33,11 +33,7 @@ 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}. +%{?javadoc_package} %prep %setup -q -n %{name}-%{name}-%{version} @@ -71,10 +67,7 @@ cp %{SOURCE1} . %mvn_install %files -f .mfiles -%doc NOTICE.txt LICENSE-2.0.txt - -%files javadoc -f .mfiles-javadoc -%doc NOTICE.txt LICENSE-2.0.txt +%license NOTICE.txt LICENSE-2.0.txt %changelog * Fri May 24 2019 Mikolaj Izdebski - 3.2.0-2 From fc175fb67eb8fb98438b71a9c0891aa294020ac6 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 28 Jun 2019 11:27:27 +0200 Subject: [PATCH 04/10] Declare module package --- plexus-utils.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plexus-utils.spec b/plexus-utils.spec index 1eae0fd..9e0062b 100644 --- a/plexus-utils.spec +++ b/plexus-utils.spec @@ -33,6 +33,7 @@ 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. +%{?module_package} %{?javadoc_package} %prep @@ -66,7 +67,7 @@ cp %{SOURCE1} . %install %mvn_install -%files -f .mfiles +%files -n %{?module_prefix}%{name} -f .mfiles %license NOTICE.txt LICENSE-2.0.txt %changelog From 0e01ada90ee94134b192a4a95452208ac6748075 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Mon, 29 Jul 2019 16:15:53 +0200 Subject: [PATCH 05/10] Update to upstream version 3.2.1 --- .gitignore | 1 + 0001-Follow-symlinks-in-NioFiles.copy.patch | 25 --------------------- plexus-utils.spec | 12 +++++----- sources | 2 +- 4 files changed, 7 insertions(+), 33 deletions(-) delete mode 100644 0001-Follow-symlinks-in-NioFiles.copy.patch diff --git a/.gitignore b/.gitignore index 505578f..e65ff4c 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ plexus-utils-3.0.tar.xz /plexus-utils-3.0.24.tar.gz /plexus-utils-3.1.0.tar.gz /plexus-utils-3.2.0.tar.gz +/plexus-utils-3.2.1.tar.gz diff --git a/0001-Follow-symlinks-in-NioFiles.copy.patch b/0001-Follow-symlinks-in-NioFiles.copy.patch deleted file mode 100644 index 9d12d47..0000000 --- a/0001-Follow-symlinks-in-NioFiles.copy.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 978fcb3b207d1b1a9895dadd40ba31c290c57918 Mon Sep 17 00:00:00 2001 -From: Michael Simacek -Date: Wed, 11 Jul 2018 13:15:55 +0200 -Subject: [PATCH] Follow symlinks in NioFiles.copy - ---- - src/main/java/org/codehaus/plexus/util/NioFiles.java | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/main/java/org/codehaus/plexus/util/NioFiles.java b/src/main/java/org/codehaus/plexus/util/NioFiles.java -index 2841978..50cdeb7 100644 ---- a/src/main/java/org/codehaus/plexus/util/NioFiles.java -+++ b/src/main/java/org/codehaus/plexus/util/NioFiles.java -@@ -138,7 +138,7 @@ public static File copy( File source, File target ) - throws IOException - { - Path copy = Files.copy( source.toPath(), target.toPath(), StandardCopyOption.REPLACE_EXISTING, -- StandardCopyOption.COPY_ATTRIBUTES, LinkOption.NOFOLLOW_LINKS ); -+ StandardCopyOption.COPY_ATTRIBUTES ); - return copy.toFile(); - } - --- -2.17.1 - diff --git a/plexus-utils.spec b/plexus-utils.spec index 9e0062b..8cabc25 100644 --- a/plexus-utils.spec +++ b/plexus-utils.spec @@ -1,6 +1,6 @@ Name: plexus-utils -Version: 3.2.0 -Release: 2%{?dist} +Version: 3.2.1 +Release: 1%{?dist} Summary: Plexus Common Utilities # ASL 1.1: several files in src/main/java/org/codehaus/plexus/util/ # xpp: src/main/java/org/codehaus/plexus/util/xml/pull directory @@ -17,9 +17,6 @@ BuildArch: noarch Source0: https://github.com/codehaus-plexus/%{name}/archive/%{name}-%{version}.tar.gz Source1: http://apache.org/licenses/LICENSE-2.0.txt -# https://github.com/codehaus-plexus/plexus-utils/issues/45 -Patch1: 0001-Follow-symlinks-in-NioFiles.copy.patch - BuildRequires: maven-local BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) @@ -39,8 +36,6 @@ is like a J2EE application server, without all the baggage. %prep %setup -q -n %{name}-%{name}-%{version} -%patch1 -p1 - cp %{SOURCE1} . %mvn_file : plexus/utils @@ -71,6 +66,9 @@ cp %{SOURCE1} . %license NOTICE.txt LICENSE-2.0.txt %changelog +* Mon Jul 29 2019 Marian Koncek - 3.2.1-1 +- Update to upstream version 3.2.1 + * Fri May 24 2019 Mikolaj Izdebski - 3.2.0-2 - Mass rebuild for javapackages-tools 201901 diff --git a/sources b/sources index 22df18d..4f7ebd8 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (plexus-utils-3.2.0.tar.gz) = 7d33472e9f2a7f344d3ab5054889b0b8ba36f23dc8690bffbf0ac689c4a9f9906a265e59e030c668068b64d56587de2adbe09a93833201c8b9ec74edf9a49e42 +SHA512 (plexus-utils-3.2.1.tar.gz) = 9642e5513aaecbc8a7e25d42837ee5604dc76dddef83e9091edfc86b4c0d02fd590ac3c0fc998f275f0d00806bd71594006bcc4c78cf492df3d828a91da1d2f9 SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8 From 592d4cf6f61f54e42a7293f6c2127b2320dcaa67 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 23 Oct 2019 09:37:55 +0200 Subject: [PATCH 06/10] Update to upstream verssion 3.3.0 --- .gitignore | 1 + plexus-utils.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e65ff4c..c64e5b8 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ plexus-utils-3.0.tar.xz /plexus-utils-3.1.0.tar.gz /plexus-utils-3.2.0.tar.gz /plexus-utils-3.2.1.tar.gz +/plexus-utils-3.3.0.tar.gz diff --git a/plexus-utils.spec b/plexus-utils.spec index 8cabc25..28cc7d5 100644 --- a/plexus-utils.spec +++ b/plexus-utils.spec @@ -1,5 +1,5 @@ Name: plexus-utils -Version: 3.2.1 +Version: 3.3.0 Release: 1%{?dist} Summary: Plexus Common Utilities # ASL 1.1: several files in src/main/java/org/codehaus/plexus/util/ @@ -66,6 +66,9 @@ cp %{SOURCE1} . %license NOTICE.txt LICENSE-2.0.txt %changelog +* Wed Oct 23 2019 Marian Koncek - 3.3.0-1 +- Update to upstream verssion 3.3.0 + * Mon Jul 29 2019 Marian Koncek - 3.2.1-1 - Update to upstream version 3.2.1 diff --git a/sources b/sources index 4f7ebd8..2e71b30 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (plexus-utils-3.2.1.tar.gz) = 9642e5513aaecbc8a7e25d42837ee5604dc76dddef83e9091edfc86b4c0d02fd590ac3c0fc998f275f0d00806bd71594006bcc4c78cf492df3d828a91da1d2f9 +SHA512 (plexus-utils-3.3.0.tar.gz) = f46f2879c4898dad51c4010e78374f349ce2b4d5a71cfefcf3e9ff16d506af8d11c7a999f3f6b22e58e13075bb2cb5c586cb5ba4ab37bb7d4b2e6c934ad4f3d3 SHA512 (LICENSE-2.0.txt) = 98f6b79b778f7b0a15415bd750c3a8a097d650511cb4ec8115188e115c47053fe700f578895c097051c9bc3dfb6197c2b13a15de203273e1a3218884f86e90e8 From 38a5ef1a80b6f9f934b2213723be5b946fdf47fd Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 5 Nov 2019 17:29:28 +0100 Subject: [PATCH 07/10] Mass rebuild for javapackages-tools 201902 --- plexus-utils.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plexus-utils.spec b/plexus-utils.spec index 28cc7d5..675a8f6 100644 --- a/plexus-utils.spec +++ b/plexus-utils.spec @@ -1,6 +1,6 @@ Name: plexus-utils Version: 3.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Plexus Common Utilities # ASL 1.1: several files in src/main/java/org/codehaus/plexus/util/ # xpp: src/main/java/org/codehaus/plexus/util/xml/pull directory @@ -66,6 +66,9 @@ cp %{SOURCE1} . %license NOTICE.txt LICENSE-2.0.txt %changelog +* Tue Nov 05 2019 Mikolaj Izdebski - 3.3.0-2 +- Mass rebuild for javapackages-tools 201902 + * Wed Oct 23 2019 Marian Koncek - 3.3.0-1 - Update to upstream verssion 3.3.0 From cbe003609d889abf009841b851bfc0e00a9e876c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sat, 25 Jan 2020 14:40:08 +0100 Subject: [PATCH 08/10] Build with OpenJDK 8 --- plexus-utils.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/plexus-utils.spec b/plexus-utils.spec index 675a8f6..86f3de7 100644 --- a/plexus-utils.spec +++ b/plexus-utils.spec @@ -1,6 +1,6 @@ Name: plexus-utils Version: 3.3.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Plexus Common Utilities # ASL 1.1: several files in src/main/java/org/codehaus/plexus/util/ # xpp: src/main/java/org/codehaus/plexus/util/xml/pull directory @@ -17,7 +17,7 @@ BuildArch: noarch Source0: https://github.com/codehaus-plexus/%{name}/archive/%{name}-%{version}.tar.gz Source1: http://apache.org/licenses/LICENSE-2.0.txt -BuildRequires: maven-local +BuildRequires: maven-local-openjdk8 BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) BuildRequires: mvn(org.codehaus.plexus:plexus:pom:) @@ -66,6 +66,9 @@ cp %{SOURCE1} . %license NOTICE.txt LICENSE-2.0.txt %changelog +* Sat Jan 25 2020 Mikolaj Izdebski - 3.3.0-3 +- Build with OpenJDK 8 + * Tue Nov 05 2019 Mikolaj Izdebski - 3.3.0-2 - Mass rebuild for javapackages-tools 201902 From 0b93462b1c747b1e831f1e6bfe422c2a54ad0c08 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 15:33:13 +0200 Subject: [PATCH 09/10] Conditionalize buildrequires in bootstrap mode --- plexus-utils.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/plexus-utils.spec b/plexus-utils.spec index 86f3de7..5f0c8e0 100644 --- a/plexus-utils.spec +++ b/plexus-utils.spec @@ -1,3 +1,5 @@ +%bcond_without bootstrap + Name: plexus-utils Version: 3.3.0 Release: 3%{?dist} @@ -18,9 +20,13 @@ Source0: https://github.com/codehaus-plexus/%{name}/archive/%{name}-%{ver Source1: http://apache.org/licenses/LICENSE-2.0.txt BuildRequires: maven-local-openjdk8 +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) BuildRequires: mvn(org.codehaus.plexus:plexus:pom:) +%endif %description The Plexus project seeks to create end-to-end developer tools for From 73370336f68b75894a7aae1e8ac999bd3126ade9 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 13 May 2021 19:08:43 +0200 Subject: [PATCH 10/10] Turn off bootstrap mode by default --- plexus-utils.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plexus-utils.spec b/plexus-utils.spec index 5f0c8e0..49c3aa9 100644 --- a/plexus-utils.spec +++ b/plexus-utils.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: plexus-utils Version: 3.3.0