diff --git a/.gitignore b/.gitignore index 1093512..ba3b717 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /gogo-parent-0.6.0-project.tar.gz /gogo-parent-2-source-release.tar.gz /gogo-parent-4-source-release.tar.gz +/gogo-parent-5-source-release.tar.gz diff --git a/felix-gogo-parent.spec b/felix-gogo-parent.spec index b792f76..5ac86c9 100644 --- a/felix-gogo-parent.spec +++ b/felix-gogo-parent.spec @@ -1,6 +1,6 @@ Name: felix-gogo-parent -Version: 4 -Release: 7%{?dist} +Version: 5 +Release: 1%{?dist} Summary: Parent pom for Apache Felix Gogo License: ASL 2.0 URL: http://felix.apache.org/documentation/subprojects/apache-felix-gogo.html @@ -19,6 +19,19 @@ line shell for OSGi. It is used in many OSGi runtimes and servers. %prep %setup -q -n gogo-parent-%{version} +# Use compendium dep +%pom_xpath_remove "pom:dependency[pom:artifactId='org.osgi.namespace.service']" +%pom_xpath_remove "pom:dependency[pom:artifactId='org.osgi.service.event']" +%pom_xpath_remove "pom:dependency[pom:artifactId='org.osgi.service.log']" +%pom_xpath_remove "pom:dependency[pom:artifactId='org.apache.felix.framework']" +%pom_xpath_inject "pom:dependencies" " + +org.osgi +osgi.cmpn +6.0.0 +provided +" + %build %mvn_build @@ -29,6 +42,9 @@ line shell for OSGi. It is used in many OSGi runtimes and servers. %license LICENSE NOTICE %changelog +* Sat Mar 06 2021 Mat Booth - 5-1 +- Update to latest upstream release + * Tue Jan 26 2021 Fedora Release Engineering - 4-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index d094aef..c3fff17 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gogo-parent-4-source-release.tar.gz) = 6ed28c21fc063dd6c41a085fd424193231f55cc62c352f8259de31b49bfc847097f7b6f60e12d48278c774e8fcc34b167ca461ec25bd6b56cee428e659197639 +SHA512 (gogo-parent-5-source-release.tar.gz) = 977e213ba626ad00b43ebc2f88f911fc0a442b855a42573625f41159413689177d026523758fcb87d294c2edefea0919aee4b8f7ccb3de1636a4a90011b7232a