rpms/aqute-bnd
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to upstream version 5.2.0

Browse Source
This commit is contained in:
Marian Koncek 2021-01-20 16:17:42 +01:00
parent 242ca7154a
commit 02305b24e4
5 changed files with 17 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitignore vendored
View File

@ -48,3 +48,8 @@
/biz.aQute.bnd-5.1.2.pom
/biz.aQute.bnd.annotation-5.1.2.pom
/biz.aQute.bndlib-5.1.2.pom
/aqute-bnd-5.2.0.tar.gz
/aQute.libg-5.2.0.pom
/biz.aQute.bnd-5.2.0.pom
/biz.aQute.bnd.annotation-5.2.0.pom
/biz.aQute.bndlib-5.2.0.pom

25
0002-Fix-ant-compatibility.patch
View File

@ -1,25 +0,0 @@
From bb26bdfa9f742a6ae5d39e0312aeadb8e9b48940 Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com>
Date: Tue, 12 Sep 2017 18:11:27 +0300
Subject: [PATCH 2/2] Fix ant compatibility
---
biz.aQute.bnd/src/aQute/bnd/ant/BndTask.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/biz.aQute.bnd/src/aQute/bnd/ant/BndTask.java b/biz.aQute.bnd/src/aQute/bnd/ant/BndTask.java
index dd438a5..6b714be 100644
--- a/biz.aQute.bnd/src/aQute/bnd/ant/BndTask.java
+++ b/biz.aQute.bnd/src/aQute/bnd/ant/BndTask.java
@@ -220,7 +220,7 @@ public class BndTask extends BaseTask {
if (inherit) {
Properties projectProperties = new UTF8Properties();
@SuppressWarnings("unchecked")
- Hashtable<Object, Object> antProps = getProject().getProperties();
+ Hashtable<String,Object> antProps = getProject().getProperties();
projectProperties.putAll(antProps);
projectProperties.putAll(builder.getProperties());
builder.setProperties(projectProperties);
--
2.20.1

0
0003-Port-to-OSGI-7.0.0.patch → 0002-Port-to-OSGI-7.0.0.patch
View File

13
aqute-bnd.spec
View File

@ -1,5 +1,5 @@
Name: aqute-bnd
Version: 5.1.2
Version: 5.2.0
Release: 1%{?dist}
Summary: BND Tool
# Part of jpm is under BSD, but jpm is not included in binary RPM
@ -19,9 +19,8 @@ Source4: https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd/%{ver
Source5: https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/%{version}/biz.aQute.bndlib-%{version}.pom
Source6: https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.annotation/%{version}/biz.aQute.bnd.annotation-%{version}.pom
Patch0: 0001-Disable-removed-commands.patch
Patch1: 0002-Fix-ant-compatibility.patch
Patch2: 0003-Port-to-OSGI-7.0.0.patch
Patch1: 0001-Disable-removed-commands.patch
Patch2: 0002-Port-to-OSGI-7.0.0.patch
BuildRequires: maven-local
BuildRequires: mvn(org.osgi:osgi.annotation)
@ -62,7 +61,6 @@ API documentation for %{name}.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
@ -102,8 +100,8 @@ 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.bnd.ant
%pom_remove_dep :biz.aQute.repository
%pom_remove_dep :biz.aQute.bnd.exporters
%pom_remove_dep :biz.aQute.bnd.reporter
@ -155,6 +153,9 @@ echo "aqute-bnd slf4j/api slf4j/simple osgi-annotation osgi-core osgi-compendium
%license LICENSE
%changelog
* Wed Jan 20 2021 Marian Koncek <mkoncek@redhat.com> - 5.2.0-1
- Update to upstream version 5.2.0
* Tue Sep 29 2020 Marian Koncek <mkoncek@redhat.com> - 5.1.2-1
- Update to upstream version 5.1.2

10
sources
View File

@ -1,5 +1,5 @@
SHA512 (aqute-bnd-5.1.2.tar.gz) = a4ae9c5f0c480a5c651e9d7e37e39e836a88a5a7fc5845aefa4b4e1f6d632df5e195af81fe6eae354b54f7b520a313ebc2642fff10692011b853301534cb8d4d
SHA512 (aQute.libg-5.1.2.pom) = a1d093a693aa634847dd39844ac262d43c2e048335c21238c809de89e830dc2a5b63f6d5560b597a25626527c3674ee6488fc8573652b7005c367cfc97f71cb5
SHA512 (biz.aQute.bnd-5.1.2.pom) = 463a161ac46492a8a8a05408e2a5482f3e234c6de602108aab02533ee446d55c45178b2d7698901d9c045fc604eb0b183afa30c0624f1da30494c75a32923a92
SHA512 (biz.aQute.bnd.annotation-5.1.2.pom) = 516388140579187573cb124f562d5595a42f9cec9964c12933a419bc225f7444f8d346a62229e3dbd2357afb6c4dca938f3e84e2caf628ff59865da1072e1805
SHA512 (biz.aQute.bndlib-5.1.2.pom) = dd01c1f40b4f734eb6c2beb6157855ab047b8076309ddaa462d9cb47717ee7bcd989c94eca81f3314acad7495ee95db3bf4b0fa0ce0d06b5dfda04e341074fa6
SHA512 (aqute-bnd-5.2.0.tar.gz) = 4001b991b80746140c26aa4862e43aed82685344343a07b41aca9e7466d1bc180eec4724c1eef8186c7fdf69dedd6817cc30a790807ce8344958e2ea0633d015
SHA512 (aQute.libg-5.2.0.pom) = 700b698895c39f39422e66532fee626aace0656867361b7e41438a168f2725ae25c5f67e6fd1dfdcff228ec4e6a6530cc76dc1b1f40aa797ef90bb891f3e4f86
SHA512 (biz.aQute.bnd-5.2.0.pom) = b8cebc4fa358debf2296e24b2cde2f401765a628022f0972517dbaecc78558aadcddbfc3cc1c8e1c0332008864d14e76863d46f51aacb1a6a530b2577ebdc587
SHA512 (biz.aQute.bnd.annotation-5.2.0.pom) = ef10eea989b339e4166087b2baf2fb4b49693d9933498f8299356b5a40a5a155d6c725a298eb0c93cdfe9633acc147047d341f84b0a9a3e5b094827168d179a1
SHA512 (biz.aQute.bndlib-5.2.0.pom) = 4055bc35223f7c90e933ce7e694bb436743b0d138a9d21cde3ba87579e7d8be2614edbddc21c0447dba911e6ddd8a607a86ec08eb09c120653846dcb9b667462