From 2e756bc4d97f1be03c12f458080bac305df2793b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 28 Jun 2019 09:17:26 +0200 Subject: [PATCH] Re-enable testframework package --- apache-commons-collections.spec | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/apache-commons-collections.spec b/apache-commons-collections.spec index 4851f4c..be408b4 100644 --- a/apache-commons-collections.spec +++ b/apache-commons-collections.spec @@ -13,6 +13,7 @@ Patch0: 0001-Port-to-Java-8.patch BuildRequires: maven-local BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.commons:commons-parent:pom:) +BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) %description The introduction of the Collections API by Sun in JDK 1.2 has been a @@ -29,6 +30,13 @@ Java2-style collections. - methods to test or create typical set-theory properties of collections such as union, intersection, and closure. +%package testframework +Summary: Testframework for %{name} +Requires: %{name} = %{version}-%{release} + +%description testframework +%{summary}. + %package javadoc Summary: Javadoc for %{name} @@ -47,27 +55,28 @@ find . -name "*.class" -exec rm -f {} \; # Fix file eof sed -i 's/\r//' LICENSE.txt PROPOSAL.html README.txt NOTICE.txt -%pom_remove_plugin :maven-antrun-plugin - -%mvn_file :commons-collections %{name} commons-collections +%mvn_package :commons-collections-testframework testframework +%mvn_file ':commons-collections{,-testframework}' %{name}@1 commons-collections@1 %build %mvn_build %install +%mvn_artifact commons-collections:commons-collections-testframework:%{version} target/commons-collections-testframework-%{version}.jar %mvn_install %files -f .mfiles %doc PROPOSAL.html README.txt %license LICENSE.txt NOTICE.txt +%files testframework -f .mfiles-testframework + %files javadoc -f .mfiles-javadoc %license LICENSE.txt NOTICE.txt - %changelog * Fri Jun 28 2019 Mikolaj Izdebski - 3.2.2-12 -- Disable testframework package +- Enable tests * Fri May 24 2019 Mikolaj Izdebski - 3.2.2-11 - Mass rebuild for javapackages-tools 201901