From 5f1b2d4e3fa4fd90c7e70502b74b15835627a41e Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Nov 15 2012 06:13:21 +0000 Subject: Fix license tag - Install text of Apache license --- diff --git a/modello.spec b/modello.spec index 169e3f7..424dc65 100644 --- a/modello.spec +++ b/modello.spec @@ -30,14 +30,14 @@ Name: modello Version: 1.5 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 0 Summary: Modello Data Model toolkit -License: MIT +License: ASL 2.0 and BSD and MIT Group: Development/Libraries URL: http://modello.codehaus.org/ Source0: http://repo2.maven.org/maven2/org/codehaus/%{name}/%{name}/%{version}/%{name}-%{version}-source-release.zip - +Source1: http://www.apache.org/licenses/LICENSE-2.0.txt Source2: %{name}-jpp-depmap.xml @@ -83,8 +83,6 @@ Requires: guava Requires: xbean Requires: jpackage-utils -Requires(post): jpackage-utils -Requires(postun): jpackage-utils Provides: modello-maven-plugin = %{epoch}:%{version}-%{release} Obsoletes: modello-maven-plugin < 0:1.0-0.a8.3jpp @@ -114,6 +112,7 @@ API documentation for %{name}. %prep %setup -q +cp -p %{SOURCE1} LICENSE %build @@ -153,15 +152,21 @@ install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name} cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} %files +%doc LICENSE %{_mavenpomdir}/* %{_javadir}/%{name} %{_bindir}/* %{_mavendepmapfragdir}/* %files javadoc +%doc LICENSE %{_javadocdir}/%{name} %changelog +* Thu Nov 15 2012 Mikolaj Izdebski - 0:1.5-4 +- Fix license tag +- Install text of Apache license + * Fri Jul 20 2012 Fedora Release Engineering - 0:1.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/sources b/sources index 039aab9..3f03246 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 3743d1c44419f78c761d9e2d6898ac1d modello-1.5-source-release.zip +3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt