Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/felix-gogo-parent.git#0b7b4d828997e434eb05f2cf4089b19f4dec82b3
This commit is contained in:
DistroBaker 2021-03-19 14:46:19 +00:00
parent 7a5230800c
commit ef8e7d19c3
3 changed files with 20 additions and 3 deletions

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
/gogo-parent-0.6.0-project.tar.gz /gogo-parent-0.6.0-project.tar.gz
/gogo-parent-2-source-release.tar.gz /gogo-parent-2-source-release.tar.gz
/gogo-parent-4-source-release.tar.gz /gogo-parent-4-source-release.tar.gz
/gogo-parent-5-source-release.tar.gz

View File

@ -1,6 +1,6 @@
Name: felix-gogo-parent Name: felix-gogo-parent
Version: 4 Version: 5
Release: 7%{?dist} Release: 1%{?dist}
Summary: Parent pom for Apache Felix Gogo Summary: Parent pom for Apache Felix Gogo
License: ASL 2.0 License: ASL 2.0
URL: http://felix.apache.org/documentation/subprojects/apache-felix-gogo.html 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 %prep
%setup -q -n gogo-parent-%{version} %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" "
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.cmpn</artifactId>
<version>6.0.0</version>
<scope>provided</scope>
</dependency>"
%build %build
%mvn_build %mvn_build
@ -29,6 +42,9 @@ line shell for OSGi. It is used in many OSGi runtimes and servers.
%license LICENSE NOTICE %license LICENSE NOTICE
%changelog %changelog
* Sat Mar 06 2021 Mat Booth <mat.booth@redhat.com> - 5-1
- Update to latest upstream release
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4-7 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

View File

@ -1 +1 @@
SHA512 (gogo-parent-4-source-release.tar.gz) = 6ed28c21fc063dd6c41a085fd424193231f55cc62c352f8259de31b49bfc847097f7b6f60e12d48278c774e8fcc34b167ca461ec25bd6b56cee428e659197639 SHA512 (gogo-parent-5-source-release.tar.gz) = 977e213ba626ad00b43ebc2f88f911fc0a442b855a42573625f41159413689177d026523758fcb87d294c2edefea0919aee4b8f7ccb3de1636a4a90011b7232a