Update to upstream version 6

This commit is contained in:
Marian Koncek 2019-07-18 14:46:35 +02:00
parent 9104ae0110
commit 24a31c3cf9
3 changed files with 8 additions and 16 deletions

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
felix-parent-1.2.1.tar.bz2
/felix-parent-2.1-source-release.tar.gz
/felix-parent-4-source-release.tar.gz
/felix-parent-6-source-release.tar.gz

View File

@ -1,6 +1,6 @@
Name: felix-parent
Version: 4
Release: 6%{?dist}
Version: 6
Release: 1%{?dist}
Summary: Parent POM file for Apache Felix Specs
License: ASL 2.0
URL: http://felix.apache.org/
@ -8,15 +8,7 @@ Source0: http://repo1.maven.org/maven2/org/apache/felix/felix-parent/%{ve
BuildArch: noarch
BuildRequires: maven-local
BuildRequires: mvn(junit:junit)
BuildRequires: mvn(org.apache:apache:pom:)
BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin)
BuildRequires: mvn(org.easymock:easymock)
BuildRequires: mvn(org.mockito:mockito-all)
# FIXME auto-requires are not generated
Requires: mvn(org.easymock:easymock)
Requires: mvn(org.mockito:mockito-all)
%description
Parent POM file for Apache Felix Specs.
@ -24,6 +16,7 @@ Parent POM file for Apache Felix Specs.
%prep
%setup -q -n felix-parent-%{version}
%mvn_alias : :felix
%pom_remove_plugin :maven-enforcer-plugin
%pom_remove_plugin :maven-javadoc-plugin
%pom_remove_plugin :maven-site-plugin
%pom_remove_plugin :maven-release-plugin
@ -34,11 +27,6 @@ Parent POM file for Apache Felix Specs.
# wagon ssh dependency unneeded
%pom_xpath_remove pom:extensions
# Remove workaround for MANTRUN-51/MNG-6205 issue
# (should only be needed with old versions of Maven)
# See: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-antrun-plugin/src/site/fml/faq.fml?r1=790402&r2=790401
%pom_xpath_remove "pom:plugin[pom:artifactId='maven-antrun-plugin']/pom:dependencies"
%build
%mvn_build
@ -49,6 +37,9 @@ Parent POM file for Apache Felix Specs.
%doc LICENSE NOTICE
%changelog
* Thu Jul 18 2019 Marian Koncek <mkoncek@redhat.com> - 6-1
- Update to upstream version 6
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 4-6
- Mass rebuild for javapackages-tools 201901

View File

@ -1 +1 @@
SHA512 (felix-parent-4-source-release.tar.gz) = 1b6c713e9f56514f3f2af311643b386a9ea9b2ca5efa6be3f160a7444ae77462fc436ee0aa761ef1d0675ae7cf0b95e6f4ecf1eeb208b929ca7071d8c83407ab
SHA512 (felix-parent-6-source-release.tar.gz) = 0b2c96662075b999c888143b38a114bedb5d68d3ec9a7446b87d4766d777abc99f5f836e2511a255ac2bc1011ffc25b237a8e35b1b3745ded488a9b7e21c1825