From ed52b73fa40cc979ca59c9cd015d0febc2cef7b1 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:01:25 +0200 Subject: [PATCH 1/6] Mass rebuild for javapackages-tools 201901 --- osgi-annotation.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/osgi-annotation.spec b/osgi-annotation.spec index a6848d2..ea995f1 100644 --- a/osgi-annotation.spec +++ b/osgi-annotation.spec @@ -1,6 +1,6 @@ Name: osgi-annotation Version: 7.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Annotations for use in compiling OSGi bundles License: ASL 2.0 @@ -72,6 +72,9 @@ cp -p %{SOURCE1} pom.xml %doc LICENSE %changelog +* Fri May 24 2019 Mikolaj Izdebski - 7.0.0-2 +- Mass rebuild for javapackages-tools 201901 + * Tue Nov 20 2018 Marian Koncek - 7.0.0-1 - Update to upstream version 7.0.0 From f125d9668b4911cc8568705cedbe7e7bfe99df62 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 21 Aug 2019 05:04:37 +0200 Subject: [PATCH 2/6] Remove unneeded %dir --- osgi-annotation.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/osgi-annotation.spec b/osgi-annotation.spec index ea995f1..98606df 100644 --- a/osgi-annotation.spec +++ b/osgi-annotation.spec @@ -65,8 +65,6 @@ cp -p %{SOURCE1} pom.xml %files -f .mfiles %license LICENSE %doc about.html -%dir %{_javadir}/osgi-annotation -%dir %{_mavenpomdir}/osgi-annotation %files javadoc -f .mfiles-javadoc %doc LICENSE From 499f1f8a8c767af2b75393fd5931c492759009ef Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 5 Nov 2019 17:29:28 +0100 Subject: [PATCH 3/6] Mass rebuild for javapackages-tools 201902 --- osgi-annotation.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/osgi-annotation.spec b/osgi-annotation.spec index 98606df..27b43a2 100644 --- a/osgi-annotation.spec +++ b/osgi-annotation.spec @@ -1,6 +1,6 @@ Name: osgi-annotation Version: 7.0.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Annotations for use in compiling OSGi bundles License: ASL 2.0 @@ -70,6 +70,9 @@ cp -p %{SOURCE1} pom.xml %doc LICENSE %changelog +* Tue Nov 05 2019 Mikolaj Izdebski - 7.0.0-3 +- Mass rebuild for javapackages-tools 201902 + * Fri May 24 2019 Mikolaj Izdebski - 7.0.0-2 - Mass rebuild for javapackages-tools 201901 From 5a44086494618791efa9f970e413940cdf7518de Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Fri, 15 Jan 2021 12:48:09 +0100 Subject: [PATCH 4/6] Update to upstream version 8.0.0 --- .gitignore | 2 ++ osgi-annotation.spec | 26 +++++++++++++++----------- sources | 4 ++-- 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 8e9eaf8..030c7cf 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,5 @@ /*.src.rpm /osgi.annotation-7.0.0.jar /osgi.annotation-7.0.0.pom +/osgi.annotation-8.0.0.jar +/osgi.annotation-8.0.0.pom diff --git a/osgi-annotation.spec b/osgi-annotation.spec index 27b43a2..f9e1d27 100644 --- a/osgi-annotation.spec +++ b/osgi-annotation.spec @@ -1,19 +1,20 @@ -Name: osgi-annotation -Version: 7.0.0 -Release: 3%{?dist} -Summary: Annotations for use in compiling OSGi bundles +Name: osgi-annotation +Version: 8.0.0 +Release: 1%{?dist} +Summary: Annotations for use in compiling OSGi bundles + +License: ASL 2.0 +URL: https://www.osgi.org -License: ASL 2.0 -URL: http://www.osgi.org/ # Upstream project is behind an account registration system with no anonymous # read access, so we download the source from maven central instead -Source0: http://repo1.maven.org/maven2/org/osgi/osgi.annotation/%{version}/osgi.annotation-%{version}.jar -Source1: http://repo1.maven.org/maven2/org/osgi/osgi.annotation/%{version}/osgi.annotation-%{version}.pom +Source0: https://repo1.maven.org/maven2/org/osgi/osgi.annotation/%{version}/osgi.annotation-%{version}.jar +Source1: https://repo1.maven.org/maven2/org/osgi/osgi.annotation/%{version}/osgi.annotation-%{version}.pom -BuildArch: noarch +BuildArch: noarch -BuildRequires: maven-local -BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) +BuildRequires: maven-local +BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) %description Annotations for use in compiling OSGi bundles. This package is not normally @@ -70,6 +71,9 @@ cp -p %{SOURCE1} pom.xml %doc LICENSE %changelog +* Fri Jan 15 2021 Marian Koncek - 8.0.0-1 +- Update to upstream version 8.0.0 + * Tue Nov 05 2019 Mikolaj Izdebski - 7.0.0-3 - Mass rebuild for javapackages-tools 201902 diff --git a/sources b/sources index 0eaa286..95b98d6 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (osgi.annotation-7.0.0.jar) = b976bceed56e88854550318f21e71c2812b220d1b86dd3f4d34b4319b983b9c659cba2d29f044efaa243af5775cc4f9d2283bf60836b7632ce8f6bc396325c2c -SHA512 (osgi.annotation-7.0.0.pom) = 6bfa35e1cd81a2e659061ec6b65fde0f048bce9b247424897bf18cf822b9d397f8dece42064f96cdacfe72c744408832210cdb9bf96f49e57f73af957ed3f991 +SHA512 (osgi.annotation-8.0.0.jar) = b71d7ce3cb2a927b277cdb1974b31755d3b634511f85012ec289adef8dd3ec39d97ea60fd8d8e51f3daf9ad779887d91c4007e56ca9d9bcc683475f6c7a6ab54 +SHA512 (osgi.annotation-8.0.0.pom) = d4d7ed67b5f366c0c30e7c7d71a174267ef9a9b5d391ed8064183408a8aa07e15b77f06e9a05476316b267e060654cd80ed84301e57d0c75ca748a5158aaf146 From 40419a62224a1d9c7ef5115d04c4db128d2b0560 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 --- osgi-annotation.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/osgi-annotation.spec b/osgi-annotation.spec index f9e1d27..b2b56a0 100644 --- a/osgi-annotation.spec +++ b/osgi-annotation.spec @@ -1,3 +1,5 @@ +%bcond_without bootstrap + Name: osgi-annotation Version: 8.0.0 Release: 1%{?dist} @@ -14,7 +16,11 @@ Source1: https://repo1.maven.org/maven2/org/osgi/osgi.annotation/%{versio BuildArch: noarch BuildRequires: maven-local +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) +%endif %description Annotations for use in compiling OSGi bundles. This package is not normally From 351b883c2e7ce3705083d8e980d549a4fb20b338 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 --- osgi-annotation.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osgi-annotation.spec b/osgi-annotation.spec index b2b56a0..a9a4252 100644 --- a/osgi-annotation.spec +++ b/osgi-annotation.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: osgi-annotation Version: 8.0.0