rpms/apache-commons-collections
5
0
Fork 0
Code Issues Pull Requests Releases Activity

adapt build and install scriptlets to fix issues in dependencies

Browse Source
This commit is contained in:
Fabio Valentini 2019-11-15 21:08:49 +01:00
parent 5f7f14b8c6
commit 73645073ad
No known key found for this signature in database
GPG Key ID: 5AC5F572E5D410AF
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
apache-commons-collections.spec
View File

@ -3,7 +3,7 @@
Name: apache-%{short_name} Name: apache-%{short_name}
Version: 3.2.2 Version: 3.2.2
Release: 14%{?dist} Release: 15%{?dist}
Summary: Provides new interfaces, implementations and utilities for Java Collections Summary: Provides new interfaces, implementations and utilities for Java Collections
License: ASL 2.0 License: ASL 2.0
URL: http://commons.apache.org/%{base_name}/ URL: http://commons.apache.org/%{base_name}/
@ -64,16 +64,11 @@ sed -i 's/\r//' LICENSE.txt PROPOSAL.html README.txt NOTICE.txt
%mvn_file ':%{short_name}{,-testframework}' %{short_name}@1 %{name}@1 %mvn_file ':%{short_name}{,-testframework}' %{short_name}@1 %{name}@1
%build %build
# 2017-09-18 mizdebsk: Temporarly disable tests, they stopped working %mvn_build -- -Dmaven.compiler.source=1.6 -Dmaven.compiler.target=1.6 \
# after Maven Surefire upgrade to 2.20, need to investigate why.
%mvn_build -f -- \
-Dcommons.osgi.symbolicName=org.apache.commons.collections -Dcommons.osgi.symbolicName=org.apache.commons.collections
ant tf.javadoc -Dtf.build.docs=target/site/apidocs/
%mvn_artifact %{short_name}:%{short_name}-testframework:%{version} target/%{short_name}-testframework-%{version}.jar
%install %install
%mvn_artifact %{short_name}:%{short_name}-testframework:%{version} target/%{short_name}-testframework-%{version}.jar
%mvn_install %mvn_install
%files -f .mfiles %files -f .mfiles
@ -87,6 +82,9 @@ ant tf.javadoc -Dtf.build.docs=target/site/apidocs/
%changelog %changelog
* Fri Nov 15 2019 Fabio Valentini <decathorpe@gmail.com> - 3.2.2-15
- Adapt build and install scriptlets to fix issues in dependencies.
* Tue Nov 05 2019 Fabio Valentini <decathorpe@gmail.com> - 3.2.2-14 * Tue Nov 05 2019 Fabio Valentini <decathorpe@gmail.com> - 3.2.2-14
- Really actually skip tests to fix builds with xmvn 3.1.0. - Really actually skip tests to fix builds with xmvn 3.1.0.