Enable biz.aQute.bnd.ant

This commit is contained in:
Didik Supriadi 2021-11-22 12:01:40 +07:00
parent 1790df05a9
commit af9c0f92ab
3 changed files with 14 additions and 2 deletions

View File

@ -8,7 +8,7 @@
Name: aqute-bnd
Version: 5.2.0
Release: 6%{?dist}
Release: 7%{?dist}
Summary: BND Tool
# Part of jpm is under BSD, but jpm is not included in binary RPM
License: ASL 2.0 or EPL-2.0
@ -26,6 +26,7 @@ Source3: https://repo1.maven.org/maven2/biz/aQute/bnd/aQute.libg/%{versio
Source4: https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd/%{version}/biz.aQute.bnd-%{version}.pom
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
Source7: https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.ant/%{version}/biz.aQute.bnd.ant-%{version}.pom
Patch1: 0001-Disable-removed-commands.patch
Patch2: 0002-Port-to-OSGI-7.0.0.patch
@ -34,6 +35,7 @@ BuildRequires: maven-local
%if %{with bootstrap}
BuildRequires: javapackages-bootstrap
%else
BuildRequires: mvn(org.apache.ant:ant)
BuildRequires: mvn(org.osgi:osgi.annotation)
BuildRequires: mvn(org.osgi:osgi.cmpn)
BuildRequires: mvn(org.osgi:osgi.core)
@ -130,13 +132,18 @@ cp -p %{SOURCE5} pom.xml
%pom_add_dep biz.aQute.bnd:biz.aQute.bnd.annotation:%{version}
popd
# bnd.ant
pushd biz.aQute.bnd.ant
cp -p %{SOURCE7} pom.xml
%pom_add_parent biz.aQute.bnd:parent:%{version}
popd
# bnd
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_add_parent biz.aQute.bnd:parent:%{version}
%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
@ -217,6 +224,9 @@ echo "aqute-bnd slf4j/api slf4j/simple osgi-annotation osgi-core osgi-compendium
%license LICENSE
%changelog
* Mon Nov 22 2021 Didik Supriadi <didiksupriadi41@fedoraproject.org> - 5.2.0-7
- Enable biz.aQute.bnd.ant
* Fri Sep 24 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 5.2.0-6
- Rename maven_plugin build conditional to bnd_maven_plugin

View File

@ -168,6 +168,7 @@
<module>biz.aQute.bndlib</module>
<module>biz.aQute.bnd</module>
<module>biz.aQute.bnd.annotation</module>
<module>biz.aQute.bnd.ant</module>
<module>maven</module>
</modules>

View File

@ -3,3 +3,4 @@ SHA512 (aQute.libg-5.2.0.pom) = 700b698895c39f39422e66532fee626aace0656867361b7e
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
SHA512 (biz.aQute.bnd.ant-5.2.0.pom) = 9cb605216507fee1db70c78235c1f9a254bc4350bfa4f1a2d00826b807b9e0cb9626a690325c1bfcc8b7032875e9820edca6b80ab41078f8fb3cb52bca139baf