Compare commits

...

No commits in common. "c8-stream-201902" and "stream-javapackages-tools-201801-rhel-8.10.0" have entirely different histories.

4 changed files with 20 additions and 14 deletions

View File

@ -1 +1 @@
0901f1904286a0ea0605ca2e5e1ed0f585ffacdb SOURCES/felix-parent-6-source-release.tar.gz
e7b3f7c2f0f1a5669ff37a4e08c622e3102aad99 felix-parent-4-source-release.tar.gz

4
.gitignore vendored
View File

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

View File

@ -1,6 +1,6 @@
Name: felix-parent
Version: 6
Release: 2%{?dist}
Version: 4
Release: 5%{?dist}
Summary: Parent POM file for Apache Felix Specs
License: ASL 2.0
URL: http://felix.apache.org/
@ -8,7 +8,15 @@ 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.
@ -16,7 +24,6 @@ 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
@ -27,6 +34,11 @@ 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
@ -37,15 +49,6 @@ Parent POM file for Apache Felix Specs.
%doc LICENSE NOTICE
%changelog
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 6-2
- Mass rebuild for javapackages-tools 201902
* 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
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

1
sources Normal file
View File

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