From 030127105dff17b75388ec3b45e7ab2fdfd7a48d Mon Sep 17 00:00:00 2001 From: gil Date: Thu, 29 Jan 2015 12:27:24 +0100 Subject: [PATCH] introduce license macro --- android-json-org-java.spec | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/android-json-org-java.spec b/android-json-org-java.spec index 0ccdcbe..f6a121c 100644 --- a/android-json-org-java.spec +++ b/android-json-org-java.spec @@ -3,7 +3,7 @@ %global oname json Name: android-json-org-java Version: 4.3 -Release: 0.2.r3.1%{?dist} +Release: 0.3.r3.1%{?dist} Summary: Androids rewrite of the evil licensed Json.org License: ASL 2.0 URL: https://android.googlesource.com/platform/libcore/+/master/json @@ -13,15 +13,9 @@ Source0: %{name}-%{namedversion}-src-git.tar.xz Source1: %{name}-template.pom # android-json-org-java package don't include the license file Source2: http://www.apache.org/licenses/LICENSE-2.0.txt - Patch0: %{name}-20130122-ignore_failing_junit_test.patch - -BuildRequires: java-devel BuildRequires: geronimo-parent-poms - BuildRequires: maven-local -BuildRequires: maven-surefire-provider-junit - BuildArch: noarch %description @@ -50,21 +44,25 @@ sed -i 's/\r//' LICENSE-2.0.txt # empty file rm -rf MODULE_LICENSE_BSD_LIKE +%mvn_file :%{oname} %{name} + %build -%mvn_file :%{oname} %{name} %mvn_build %install %mvn_install %files -f .mfiles -%doc LICENSE-2.0.txt +%license LICENSE-2.0.txt %files javadoc -f .mfiles-javadoc -%doc LICENSE-2.0.txt +%license LICENSE-2.0.txt %changelog +* Thu Jan 29 2015 gil cattaneo 4.3-0.3.r3.1 +- introduce license macro + * Sat Jun 07 2014 Fedora Release Engineering - 4.3-0.2.r3.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild