Update to upstream version 5.1.1

.gitignore

@@ -38,3 +38,8 @@
 /biz.aQute.bnd-5.0.0.pom
 /biz.aQute.bnd.annotation-5.0.0.pom
 /biz.aQute.bndlib-5.0.0.pom
+/aqute-bnd-5.1.1.tar.gz
+/aQute.libg-5.1.1.pom
+/biz.aQute.bnd-5.1.1.pom
+/biz.aQute.bnd.annotation-5.1.1.pom
+/biz.aQute.bndlib-5.1.1.pom

0001-Disable-removed-commands.patch

@@ -4,22 +4,22 @@ Date: Tue, 4 Oct 2016 18:02:26 +0200
 Subject: [PATCH 1/2] Disable removed commands
 
 ---
- biz.aQute.bnd/src/aQute/bnd/main/bnd.java | 48 -----------------------
+ biz.aQute.bnd/src/aQute/bnd/main/bnd.java | 49 -----------------------
- 1 file changed, 48 deletions(-)
+ 1 file changed, 49 deletions(-)
 
 diff --git a/biz.aQute.bnd/src/aQute/bnd/main/bnd.java b/biz.aQute.bnd/src/aQute/bnd/main/bnd.java
-index 3f21168..d6c9ccd 100644
+index 6870935..803c6c9 100644
 --- a/biz.aQute.bnd/src/aQute/bnd/main/bnd.java
 +++ b/biz.aQute.bnd/src/aQute/bnd/main/bnd.java
-@@ -110,7 +110,6 @@ import aQute.bnd.osgi.Processor;
+@@ -104,7 +104,6 @@ import aQute.bnd.osgi.Resource;
- import aQute.bnd.osgi.Resource;
  import aQute.bnd.osgi.Verifier;
  import aQute.bnd.osgi.eclipse.EclipseClasspath;
+ import aQute.bnd.print.JarPrinter;
 -import aQute.bnd.repository.maven.provider.NexusCommand;
  import aQute.bnd.service.Actionable;
  import aQute.bnd.service.RepositoryPlugin;
  import aQute.bnd.service.action.Action;
-@@ -4213,53 +4212,6 @@ public class bnd extends Processor {
+@@ -3904,54 +3903,6 @@ public class bnd extends Processor {
  		getInfo(profiles);
  	}
  
@@ -70,9 +70,10 @@ index 3f21168..d6c9ccd 100644
 -		getInfo(rc);
 -		rc.close();
 -	}
- 
+-
  	/**
  	 * Export a bndrun file
+ 	 */
 -- 
-2.21.0
+2.25.4
 

aqute-bnd.spec

@@ -1,17 +1,17 @@
 Name:           aqute-bnd
-Version:        5.0.0
+Version:        5.1.1
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        BND Tool
 # Part of jpm is under BSD, but jpm is not included in binary RPM
-License:        ASL 2.0
+License:        ASL 2.0 or EPL-2.0
-URL:            http://bnd.bndtools.org/
+URL:            https://bnd.bndtools.org/
 BuildArch:      noarch
 
-Source0:        %{version}.REL.tar.gz
+Source0:        %{name}-%{version}.tar.gz
 # removes bundled jars from upstream tarball
 # run as:
-# ./repack-tarball.sh
+# ./generate-tarball.sh
-Source1:        repack-tarball.sh
+Source1:        generate-tarball.sh
 
 Source2:        parent.pom
 Source3:        https://repo1.maven.org/maven2/biz/aQute/bnd/aQute.libg/%{version}/aQute.libg-%{version}.pom
@@ -60,9 +60,7 @@ Summary:        Javadoc for %{name}
 API documentation for %{name}.
 
 %prep
-%setup -q -n bnd-%{version}.REL
+%setup -q
-
-rm gradlew*
 
 %patch0 -p1
 %patch1 -p1
@@ -78,13 +76,11 @@ sed -i 's|${Bundle-Version}|%{version}|' biz.aQute.bndlib/src/aQute/bnd/osgi/bnd
 pushd aQute.libg
 cp -p %{SOURCE3} pom.xml
 %pom_add_parent biz.aQute.bnd:parent:%{version}
-%pom_remove_dep :org.osgi.util.function
-%pom_remove_dep :org.osgi.util.promise
 %pom_add_dep org.osgi:osgi.core
 %pom_add_dep org.osgi:osgi.cmpn
 popd
 
-# bndlib.annotations
+# bnd.annotation
 pushd biz.aQute.bnd.annotation
 cp -p %{SOURCE6} pom.xml
 %pom_add_parent biz.aQute.bnd:parent:%{version}
@@ -96,8 +92,6 @@ popd
 pushd biz.aQute.bndlib
 cp -p %{SOURCE5} pom.xml
 %pom_add_parent biz.aQute.bnd:parent:%{version}
-%pom_remove_dep :org.osgi.util.function
-%pom_remove_dep :org.osgi.util.promise
 %pom_add_dep org.osgi:osgi.core
 %pom_add_dep org.osgi:osgi.cmpn
 %pom_add_dep biz.aQute.bnd:aQute.libg:%{version}
@@ -108,6 +102,7 @@ popd
 cp -r biz.aQute.bnd.exporters/src/aQute/bnd/exporter biz.aQute.bnd/src/aQute/bnd/
 pushd biz.aQute.bnd
 cp -p %{SOURCE4} pom.xml
+%pom_remove_dep org.apache.ant:ant
 %pom_remove_dep :biz.aQute.resolve
 %pom_remove_dep :biz.aQute.repository
 %pom_remove_dep :biz.aQute.bnd.exporters
@@ -117,6 +112,17 @@ cp -p %{SOURCE4} pom.xml
 %pom_remove_dep :jline
 popd
 
+%pom_remove_dep -r org.osgi:org.osgi.namespace.contract
+%pom_remove_dep -r org.osgi:org.osgi.namespace.extender
+%pom_remove_dep -r org.osgi:org.osgi.namespace.implementation
+%pom_remove_dep -r org.osgi:org.osgi.namespace.service
+%pom_remove_dep -r org.osgi:org.osgi.resource
+%pom_remove_dep -r org.osgi:org.osgi.service.log
+%pom_remove_dep -r org.osgi:org.osgi.service.repository
+%pom_remove_dep -r org.osgi:org.osgi.service.serviceloader
+%pom_remove_dep -r org.osgi:org.osgi.util.function
+%pom_remove_dep -r org.osgi:org.osgi.util.promise
+
 %mvn_alias biz.aQute.bnd:biz.aQute.bnd :bnd biz.aQute:bnd
 %mvn_alias biz.aQute.bnd:biz.aQute.bndlib :bndlib biz.aQute:bndlib
 
@@ -149,6 +155,9 @@ echo "aqute-bnd slf4j/api slf4j/simple osgi-annotation osgi-core osgi-compendium
 %license LICENSE
 
 %changelog
+* Tue Jun 23 2020 Marian Koncek <mkoncek@redhat.com> - 5.1.1-1
+- Update to upstream version 5.1.1
+
 * Fri Apr 24 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.0.0-2
 - Disable bnd-maven-plugin
 

generate-tarball.sh

@@ -0,0 +1,31 @@
+#!/bin/bash
+set -e
+
+name=aqute-bnd
+version="$(sed -n 's/Version:\s*//p' *.spec)"
+
+# RETRIEVE
+wget "https://github.com/bndtools/bnd/archive/${version}.REL.tar.gz" -O "${name}-${version}.orig.tar.gz"
+
+rm -rf tarball-tmp
+mkdir tarball-tmp
+pushd tarball-tmp
+tar -xf "../${name}-${version}.orig.tar.gz"
+mv "bnd-${version}.REL" "${name}-${version}"
+
+# CLEAN TARBALL
+rm -rf "${name}-${version}/docs"
+find -name '*.jar' -delete
+find -name '*.class' -delete
+find -name '*.ar' -delete
+find -name '*.tar' -delete
+find -name '*.gz' -delete
+find -name '*.bz2' -delete
+find -name '*.xz' -delete
+find -name '*.zip' -delete
+find -name '*.exe' -delete
+find -name '*.dll' -delete
+
+tar -czf "../${name}-${version}.tar.gz" *
+popd
+rm -r tarball-tmp "${name}-${version}.orig.tar.gz"

repack-tarball.sh

@@ -1,6 +0,0 @@
-#!/bin/bash
-VERSION=`sed -rn 's/^Version:\s*([0-9.]+)/\1/p' aqute-bnd.spec`
-wget https://github.com/bndtools/bnd/archive/$VERSION.REL.tar.gz
-gunzip $VERSION.REL.tar.gz
-tar tf $VERSION.REL.tar | grep -E '\.(.ar|exe|tar\.(gz|bz2|xz)|zip)$' | xargs tar --delete --file $VERSION.REL.tar
-gzip $VERSION.REL.tar

sources

@@ -1,5 +1,5 @@
-SHA512 (5.0.0.REL.tar.gz) = 2ab00d727fdd4bd8051a19c93d1e9bca498a0de7f0cc5df3401d00a48ed65e2ab96c400ee6b5a6c31ab182f3a58c4be74816d2073af3878202873804a45e1d1f
+SHA512 (aqute-bnd-5.1.1.tar.gz) = 3e73480e28e2d39ae7537d6edcb287b2a3a51da5966c15c6c08cf91e7d22a0d499055a2eb5acc25077f0b78b3ee1014cdb2b71766cd8554c9cab26e307ca9a38
-SHA512 (aQute.libg-5.0.0.pom) = 28022d0c44bb0c1ef0f5340d4baaf85cf93f819a8863d155037b65fa6f48c1f7e8c76547b2a07cee6f17a5f05a8658ce79f8d1ca129dd29fab9ce99195cbf9f9
+SHA512 (aQute.libg-5.1.1.pom) = e5410707927551574021661f1c83c31a519b5fa82d8342520e6a71c70aa5205f3898076c9ae3875253404e36d9f8f5b901e0cda6a8c68d6d4800ee530cda501c
-SHA512 (biz.aQute.bnd-5.0.0.pom) = 3134349aa135ccb55cf590de4c7e61302a0f1f180d63c445033728108f61e06ad0571c6c9b17d94ed1d87040b90addf90c03ad5c821cc708190adcabfc87a9c5
+SHA512 (biz.aQute.bnd-5.1.1.pom) = ff684334f0b9c62d581bed4d7b6cacba5a8240d402f3ab9d56c72fac01b2606ac2948700d5b3c887abac5b26d1d958c9514bcbd7b51a4f5854654e44585c2cf1
-SHA512 (biz.aQute.bnd.annotation-5.0.0.pom) = 8b7b3fc57b6b2662bacd6ff3875de826cceeb5e1e17bd9b66c830f9bd038279851bc1a668a869adac1aee06ce0a9b3586ec4ec1ff6da3749e44cb7a051d3be77
+SHA512 (biz.aQute.bnd.annotation-5.1.1.pom) = 4e43902c9c55d2546c5a9f8f4390f0454012a33f5a755de13f5bbf0c0c78b3e5094664a388d3b54bcb2729abb7410eb5625379019d5a6ff169e79f62728d960a
-SHA512 (biz.aQute.bndlib-5.0.0.pom) = 80fb772300d0c5aa3ab347bfbad14da190e6f39edb46003f71633a03b8dfc8c7282b33548fbcbe4f12cf5f4c96b7c2a56ec323d68a9052772b3e2ad34718f16d
+SHA512 (biz.aQute.bndlib-5.1.1.pom) = d0ebe4258a0767c663a15910eafba78a1e4a0a9363a3b345bcaf70d66d7903d886e84df7b93e4a2fa036f1682e688dbde03592683fc0a7cc4b9134886b777ea6