From c0aa4f213edbabd7dcb31d472b0f9443f4f1e5f0 Mon Sep 17 00:00:00 2001 From: gil Date: Fri, 13 Feb 2015 18:52:21 +0100 Subject: [PATCH] introduce license macro --- vorbis-java.spec | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/vorbis-java.spec b/vorbis-java.spec index 29b9213..23b9f87 100644 --- a/vorbis-java.spec +++ b/vorbis-java.spec @@ -4,7 +4,7 @@ %endif Name: vorbis-java Version: 0.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Ogg and Vorbis toolkit for Java License: ASL 2.0 URL: https://github.com/Gagravarr/VorbisJava @@ -17,7 +17,6 @@ BuildRequires: mvn(org.apache.tika:tika-core) BuildRequires: mvn(junit:junit) BuildRequires: maven-local -BuildRequires: maven-surefire-provider-junit BuildArch: noarch @@ -62,11 +61,12 @@ find . -name "*.jar" -delete %pom_remove_plugin :maven-source-plugin parent %pom_xpath_remove "pom:build/pom:plugins/pom:plugin[pom:artifactId='maven-javadoc-plugin']/pom:executions" parent -%build - %mvn_package :%{name} %{name} %mvn_package :%{name}-parent %{name} %mvn_package :%{name}-core %{name} + +%build + # Skip test @ random fails on arm builder %mvn_build -s -f -- -Dproject.build.sourceEncoding=UTF-8 @@ -75,20 +75,24 @@ find . -name "*.jar" -delete %files -f .mfiles-%{name} %dir %{_javadir}/%{name} -%doc CHANGES.txt LICENSE.txt NOTICE.txt README.txt TODO.txt +%doc CHANGES.txt README.txt TODO.txt +%license LICENSE.txt NOTICE.txt %if %{without tika} %files tika -f .mfiles-%{name}-tika -%doc LICENSE.txt NOTICE.txt +%license LICENSE.txt NOTICE.txt %endif %files tools -f .mfiles-%{name}-tools -%doc LICENSE.txt NOTICE.txt +%license LICENSE.txt NOTICE.txt %files javadoc -f .mfiles-javadoc -%doc LICENSE.txt NOTICE.txt +%license LICENSE.txt NOTICE.txt %changelog +* Fri Feb 13 2015 gil cattaneo 0.6-2 +- introduce license macro + * Thu Sep 25 2014 gil cattaneo 0.6-1 - update to 0.6