diff --git a/apache-commons-javaflow.spec b/apache-commons-javaflow.spec index 9864def..d7fc077 100644 --- a/apache-commons-javaflow.spec +++ b/apache-commons-javaflow.spec @@ -4,7 +4,7 @@ %global namedversion %{version}%{?namedreltag} Name: apache-commons-javaflow Version: 1.0 -Release: 0.8.20120509SNAPSHOT%{?dist} +Release: 0.9.20120509SNAPSHOT%{?dist} Summary: Commons Javaflow License: ASL 2.0 Url: http://commons.apache.org/sandbox/javaflow/ @@ -19,19 +19,12 @@ BuildRequires: mvn(asm:asm-tree) BuildRequires: mvn(asm:asm-util) BuildRequires: mvn(commons-io:commons-io) BuildRequires: mvn(commons-logging:commons-logging) +BuildRequires: mvn(junit:junit) +BuildRequires: mvn(junit-addons:junit-addons) BuildRequires: mvn(org.apache.ant:ant) BuildRequires: mvn(org.apache.bcel:bcel) BuildRequires: mvn(org.apache.commons:commons-jci-core) - -# test deps -BuildRequires: mvn(junit:junit) -BuildRequires: mvn(junit-addons:junit-addons) - BuildRequires: maven-local -#BuildRequires: maven-antrun-plugin -#BuildRequires: maven-plugin-bundle -#BuildRequires: maven-site-plugin -BuildRequires: maven-surefire-provider-junit BuildArch: noarch @@ -78,10 +71,11 @@ find . -name "*.jar" -delete %pom_xpath_inject "pom:dependencies/pom:dependency[pom:artifactId = 'ant' ]" "provided" -%build - %mvn_file :%{short_name} %{name} %mvn_file :%{short_name} %{short_name} + +%build + %mvn_build -- -Dproject.build.sourceEncoding=UTF-8 %install @@ -92,15 +86,19 @@ echo "ant %{short_name}" > %{short_name} install -p -m 644 %{short_name} %{buildroot}%{_sysconfdir}/ant.d/%{short_name} %files -f .mfiles -%doc CREDITS.txt LICENSE.txt NOTICE.txt TODO.txt +%doc CREDITS.txt TODO.txt +%license LICENSE.txt NOTICE.txt %files javadoc -f .mfiles-javadoc -%doc LICENSE.txt NOTICE.txt +%license LICENSE.txt NOTICE.txt %files ant %config(noreplace) %{_sysconfdir}/ant.d/%{short_name} %changelog +* Thu Jan 29 2015 gil cattaneo 1.0-0.9.20120509SNAPSHOT +- introduce license macro + * Sun Nov 30 2014 gil cattaneo 1.0-0.8.20120509SNAPSHOT - fix for rhbz#1169160