Rebase to match latest upstream version 7

Signed-off-by: Dinesh Prasanth M K <dmoluguw@redhat.com>
This commit is contained in:
Dinesh Prasanth M K 2020-04-24 21:36:06 -04:00
parent ba1426d891
commit 65c100b79d
No known key found for this signature in database
GPG Key ID: 0D4491AB07D86AB0
3 changed files with 10 additions and 14 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-7-source-release.tar.gz

View File

@ -1,18 +1,14 @@
Name: felix-parent
Version: 4
Release: 9%{?dist}
Version: 7
Release: 1%{?dist}
Summary: Parent POM file for Apache Felix Specs
License: ASL 2.0
URL: http://felix.apache.org/
Source0: http://repo1.maven.org/maven2/org/apache/felix/felix-parent/%{version}/%{name}-%{version}-source-release.tar.gz
URL: https://felix.apache.org/
Source0: https://repo1.maven.org/maven2/org/apache/felix/%{name}/%{version}/%{name}-%{version}-source-release.tar.gz
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)
@ -24,6 +20,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 +31,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 +41,9 @@ Parent POM file for Apache Felix Specs.
%doc LICENSE NOTICE
%changelog
* Fri Apr 24 2020 Dinesh Prasanth M K <dmoluguw@redhat.com> - 7-1
- Rebase to latest upstream version 7
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

View File

@ -1 +1 @@
SHA512 (felix-parent-4-source-release.tar.gz) = 1b6c713e9f56514f3f2af311643b386a9ea9b2ca5efa6be3f160a7444ae77462fc436ee0aa761ef1d0675ae7cf0b95e6f4ecf1eeb208b929ca7071d8c83407ab
SHA512 (felix-parent-7-source-release.tar.gz) = cc9217621d223b3adf60bd98acb8c8c4678bd225246ca7fa9cb75249a49e5ee3d102d8d3f30e9bdf58ba1a7a190f749234022c5f8de9112a9746357b4ee3eb83