From 9104ae01107c0ba7bde22c8cf303bf0fb1436fd8 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:00:30 +0200 Subject: [PATCH 1/6] Mass rebuild for javapackages-tools 201901 --- felix-parent.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/felix-parent.spec b/felix-parent.spec index c618d96..dcba27a 100644 --- a/felix-parent.spec +++ b/felix-parent.spec @@ -1,6 +1,6 @@ Name: felix-parent Version: 4 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Parent POM file for Apache Felix Specs License: ASL 2.0 URL: http://felix.apache.org/ @@ -49,6 +49,9 @@ Parent POM file for Apache Felix Specs. %doc LICENSE NOTICE %changelog +* Fri May 24 2019 Mikolaj Izdebski - 4-6 +- Mass rebuild for javapackages-tools 201901 + * Wed Feb 07 2018 Fedora Release Engineering - 4-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 24a31c3cf9a0c71a5ee3e233ed1f5e3fea137607 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Thu, 18 Jul 2019 14:46:35 +0200 Subject: [PATCH 2/6] Update to upstream version 6 --- .gitignore | 1 + felix-parent.spec | 21 ++++++--------------- sources | 2 +- 3 files changed, 8 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index c1b42f3..e09c300 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ felix-parent-1.2.1.tar.bz2 /felix-parent-2.1-source-release.tar.gz /felix-parent-4-source-release.tar.gz +/felix-parent-6-source-release.tar.gz diff --git a/felix-parent.spec b/felix-parent.spec index dcba27a..acc527c 100644 --- a/felix-parent.spec +++ b/felix-parent.spec @@ -1,6 +1,6 @@ Name: felix-parent -Version: 4 -Release: 6%{?dist} +Version: 6 +Release: 1%{?dist} Summary: Parent POM file for Apache Felix Specs License: ASL 2.0 URL: http://felix.apache.org/ @@ -8,15 +8,7 @@ Source0: http://repo1.maven.org/maven2/org/apache/felix/felix-parent/%{ve BuildArch: noarch BuildRequires: maven-local -BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache:apache:pom:) -BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) -BuildRequires: mvn(org.easymock:easymock) -BuildRequires: mvn(org.mockito:mockito-all) - -# FIXME auto-requires are not generated -Requires: mvn(org.easymock:easymock) -Requires: mvn(org.mockito:mockito-all) %description Parent POM file for Apache Felix Specs. @@ -24,6 +16,7 @@ Parent POM file for Apache Felix Specs. %prep %setup -q -n felix-parent-%{version} %mvn_alias : :felix +%pom_remove_plugin :maven-enforcer-plugin %pom_remove_plugin :maven-javadoc-plugin %pom_remove_plugin :maven-site-plugin %pom_remove_plugin :maven-release-plugin @@ -34,11 +27,6 @@ Parent POM file for Apache Felix Specs. # wagon ssh dependency unneeded %pom_xpath_remove pom:extensions -# Remove workaround for MANTRUN-51/MNG-6205 issue -# (should only be needed with old versions of Maven) -# See: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/site/fml/faq.fml?r1=790402&r2=790401 -%pom_xpath_remove "pom:plugin[pom:artifactId='maven-antrun-plugin']/pom:dependencies" - %build %mvn_build @@ -49,6 +37,9 @@ Parent POM file for Apache Felix Specs. %doc LICENSE NOTICE %changelog +* Thu Jul 18 2019 Marian Koncek - 6-1 +- Update to upstream version 6 + * Fri May 24 2019 Mikolaj Izdebski - 4-6 - Mass rebuild for javapackages-tools 201901 diff --git a/sources b/sources index 0e4f2b8..e7c1b84 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (felix-parent-4-source-release.tar.gz) = 1b6c713e9f56514f3f2af311643b386a9ea9b2ca5efa6be3f160a7444ae77462fc436ee0aa761ef1d0675ae7cf0b95e6f4ecf1eeb208b929ca7071d8c83407ab +SHA512 (felix-parent-6-source-release.tar.gz) = 0b2c96662075b999c888143b38a114bedb5d68d3ec9a7446b87d4766d777abc99f5f836e2511a255ac2bc1011ffc25b237a8e35b1b3745ded488a9b7e21c1825 From c96b6ffe7442af32aaacf4ac797d9a9171349cba Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 5 Nov 2019 17:29:27 +0100 Subject: [PATCH 3/6] Mass rebuild for javapackages-tools 201902 --- felix-parent.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/felix-parent.spec b/felix-parent.spec index acc527c..eec4498 100644 --- a/felix-parent.spec +++ b/felix-parent.spec @@ -1,6 +1,6 @@ Name: felix-parent Version: 6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Parent POM file for Apache Felix Specs License: ASL 2.0 URL: http://felix.apache.org/ @@ -37,6 +37,9 @@ Parent POM file for Apache Felix Specs. %doc LICENSE NOTICE %changelog +* Tue Nov 05 2019 Mikolaj Izdebski - 6-2 +- Mass rebuild for javapackages-tools 201902 + * Thu Jul 18 2019 Marian Koncek - 6-1 - Update to upstream version 6 From 189ebea54d2d738f8c9d284445902ad8a849dd0c Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 29 Jul 2020 08:39:32 +0200 Subject: [PATCH 4/6] Update to upstream version 7 --- .gitignore | 1 + felix-parent.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index e09c300..5a1af70 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ felix-parent-1.2.1.tar.bz2 /felix-parent-2.1-source-release.tar.gz /felix-parent-4-source-release.tar.gz /felix-parent-6-source-release.tar.gz +/felix-parent-7-source-release.tar.gz diff --git a/felix-parent.spec b/felix-parent.spec index eec4498..26a11d4 100644 --- a/felix-parent.spec +++ b/felix-parent.spec @@ -1,10 +1,10 @@ Name: felix-parent -Version: 6 -Release: 2%{?dist} +Version: 7 +Release: 1%{?dist} Summary: Parent POM file for Apache Felix Specs License: ASL 2.0 -URL: http://felix.apache.org/ -Source0: http://repo1.maven.org/maven2/org/apache/felix/felix-parent/%{version}/%{name}-%{version}-source-release.tar.gz +URL: https://felix.apache.org/ +Source0: https://repo1.maven.org/maven2/org/apache/felix/felix-parent/%{version}/%{name}-%{version}-source-release.tar.gz BuildArch: noarch BuildRequires: maven-local @@ -37,6 +37,9 @@ Parent POM file for Apache Felix Specs. %doc LICENSE NOTICE %changelog +* Wed Jul 29 2020 Marian Koncek - 7-1 +- Update to upstream version 7 + * Tue Nov 05 2019 Mikolaj Izdebski - 6-2 - Mass rebuild for javapackages-tools 201902 diff --git a/sources b/sources index e7c1b84..ca1c893 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (felix-parent-6-source-release.tar.gz) = 0b2c96662075b999c888143b38a114bedb5d68d3ec9a7446b87d4766d777abc99f5f836e2511a255ac2bc1011ffc25b237a8e35b1b3745ded488a9b7e21c1825 +SHA512 (felix-parent-7-source-release.tar.gz) = cc9217621d223b3adf60bd98acb8c8c4678bd225246ca7fa9cb75249a49e5ee3d102d8d3f30e9bdf58ba1a7a190f749234022c5f8de9112a9746357b4ee3eb83 From 8889b18fa443dcb05fe52a89f0733d13beab7075 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 15:33:12 +0200 Subject: [PATCH 5/6] Conditionalize buildrequires in bootstrap mode --- felix-parent.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/felix-parent.spec b/felix-parent.spec index 26a11d4..1fda37f 100644 --- a/felix-parent.spec +++ b/felix-parent.spec @@ -1,3 +1,5 @@ +%bcond_without bootstrap + Name: felix-parent Version: 7 Release: 1%{?dist} @@ -8,7 +10,11 @@ Source0: https://repo1.maven.org/maven2/org/apache/felix/felix-parent/%{v BuildArch: noarch BuildRequires: maven-local +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: mvn(org.apache:apache:pom:) +%endif %description Parent POM file for Apache Felix Specs. From 775eda9c4e1851d23de6495e2407ce05e9b38e64 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 13 May 2021 19:08:42 +0200 Subject: [PATCH 6/6] Turn off bootstrap mode by default --- felix-parent.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/felix-parent.spec b/felix-parent.spec index 1fda37f..d790673 100644 --- a/felix-parent.spec +++ b/felix-parent.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: felix-parent Version: 7