From cc699d291f016a531f78e0528e5dc08c14d81943 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:00:20 +0200 Subject: [PATCH 1/4] Mass rebuild for javapackages-tools 201901 --- apache-commons-net.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-net.spec b/apache-commons-net.spec index 6d77ca1..8a3b420 100644 --- a/apache-commons-net.spec +++ b/apache-commons-net.spec @@ -4,7 +4,7 @@ Name: apache-%{short_name} Version: 3.6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Internet protocol suite Java library License: ASL 2.0 URL: http://commons.apache.org/%{base_name}/ @@ -58,6 +58,9 @@ rm src/test/java/org/apache/commons/net/tftp/TFTPServerPathTest.java %license LICENSE.txt NOTICE.txt %changelog +* Fri May 24 2019 Mikolaj Izdebski - 3.6-4 +- Mass rebuild for javapackages-tools 201901 + * Wed Feb 07 2018 Fedora Release Engineering - 3.6-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 2e04c288474c45764995e777f8d8a0a3a78ce0be Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 5 Nov 2019 17:29:27 +0100 Subject: [PATCH 2/4] Mass rebuild for javapackages-tools 201902 --- apache-commons-net.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-net.spec b/apache-commons-net.spec index 8a3b420..cf17db1 100644 --- a/apache-commons-net.spec +++ b/apache-commons-net.spec @@ -4,7 +4,7 @@ Name: apache-%{short_name} Version: 3.6 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Internet protocol suite Java library License: ASL 2.0 URL: http://commons.apache.org/%{base_name}/ @@ -58,6 +58,9 @@ rm src/test/java/org/apache/commons/net/tftp/TFTPServerPathTest.java %license LICENSE.txt NOTICE.txt %changelog +* Tue Nov 05 2019 Mikolaj Izdebski - 3.6-5 +- Mass rebuild for javapackages-tools 201902 + * Fri May 24 2019 Mikolaj Izdebski - 3.6-4 - Mass rebuild for javapackages-tools 201901 From fa717f50dc2d44032365e6955f447541ffea25b4 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 11 Dec 2019 17:41:20 +0100 Subject: [PATCH 3/4] Fix OSGi bundle symbolic name --- apache-commons-net.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apache-commons-net.spec b/apache-commons-net.spec index cf17db1..54d0ce8 100644 --- a/apache-commons-net.spec +++ b/apache-commons-net.spec @@ -44,7 +44,7 @@ rm src/test/java/org/apache/commons/net/tftp/TFTPServerPathTest.java %mvn_alias : org.apache.commons:%{short_name} %build -%mvn_build +%mvn_build -- -Dcommons.osgi.symbolicName=org.apache.commons.net %install %mvn_install From 65b11a63e9ec526711a658fa81af61c99853e3e6 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 30 Sep 2020 12:15:12 +0200 Subject: [PATCH 4/4] Remove build-dependency on exec-maven-plugin --- apache-commons-net.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/apache-commons-net.spec b/apache-commons-net.spec index 54d0ce8..5fb043c 100644 --- a/apache-commons-net.spec +++ b/apache-commons-net.spec @@ -4,7 +4,7 @@ Name: apache-%{short_name} Version: 3.6 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Internet protocol suite Java library License: ASL 2.0 URL: http://commons.apache.org/%{base_name}/ @@ -16,7 +16,6 @@ BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.commons:commons-parent:pom:) BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) -BuildRequires: mvn(org.codehaus.mojo:exec-maven-plugin) %description @@ -40,6 +39,8 @@ rm src/test/java/org/apache/commons/net/time/TimeTCPClientTest.java # Fails in Koji with "Address already in use" rm src/test/java/org/apache/commons/net/tftp/TFTPServerPathTest.java +%pom_remove_plugin :exec-maven-plugin + %mvn_file : %{short_name} %{name} %mvn_alias : org.apache.commons:%{short_name} @@ -58,6 +59,9 @@ rm src/test/java/org/apache/commons/net/tftp/TFTPServerPathTest.java %license LICENSE.txt NOTICE.txt %changelog +* Wed Sep 30 2020 Mikolaj Izdebski - 3.6-6 +- Remove build-dependency on exec-maven-plugin + * Tue Nov 05 2019 Mikolaj Izdebski - 3.6-5 - Mass rebuild for javapackages-tools 201902