[groovy] Install ASL 2.0 license text, resolves: rhbz#858257

Mikolaj Izdebski mizdebsk at fedoraproject.org
Thu Jun 6 16:29:04 UTC 2013


commit 6fb74f660a700b5ac2af96f2ff18f84a0f57336c
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Thu Jun 6 18:27:42 2013 +0200

    Install ASL 2.0 license text, resolves: rhbz#858257

 .gitignore  |    1 +
 groovy.spec |    9 ++++++---
 sources     |    1 +
 3 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a7bade1..ec87734 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ groovy-src-1.7.10.zip
 /groovy-src-1.8.7.zip
 /groovy-src-1.8.8.zip
 /groovy-src-1.8.9.zip
+/LICENSE-2.0.txt
diff --git a/groovy.spec b/groovy.spec
index a3a0abc..95d9694 100644
--- a/groovy.spec
+++ b/groovy.spec
@@ -18,6 +18,7 @@ Source2:        groovy-starter.conf
 Source3:        groovy.desktop
 Source4:	cpl-v10.txt
 Source5:	epl-v10.txt
+Source6:        http://www.apache.org/licenses/LICENSE-2.0.txt
 # http://jira.codehaus.org/browse/GROOVY-6085
 Patch0:		groovy-inner-interface-annotations.patch
 BuildArch:      noarch
@@ -79,7 +80,7 @@ JavaDoc documentation for %{name}
 
 %prep
 %setup -q
-cp %{SOURCE4} %{SOURCE5} .
+cp %{SOURCE4} %{SOURCE5} %{SOURCE6} .
 # Remove bundled JARs and classes
 find \( -name *.jar -o -name *.class \) -delete
 
@@ -156,18 +157,20 @@ install -p -m644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom
 %{_mavendepmapfragdir}/*
 %{_mavenpomdir}/*
 %config(noreplace) %{_sysconfdir}/*
-%doc LICENSE.txt NOTICE.txt README.md cpl-v10.txt epl-v10.txt
+%doc README.md
+%doc LICENSE.txt LICENSE-2.0.txt NOTICE.txt cpl-v10.txt epl-v10.txt
 
 
 %files javadoc
 %{_javadocdir}/*
-%doc LICENSE.txt NOTICE.txt cpl-v10.txt epl-v10.txt
+%doc LICENSE.txt LICENSE-2.0.txt NOTICE.txt cpl-v10.txt epl-v10.txt
 
 %changelog
 * Thu Jun  6 2013 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.8.9-2
 - Remove bundled JARs and classes
 - Add workaround for rhbz#971483
 - Add Public Domain to licenses
+- Install ASL 2.0 license text, resolves: rhbz#858257
 
 * Sat Apr 20 2013 gil cattaneo <puntogil at libero.it> - 1.8.9-1
 - Update to 1.8.9
diff --git a/sources b/sources
index cc96962..9ab6dd5 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 5dac87f93f1a2981b38e4c659725175b  groovy-src-1.8.9.zip
+3b83ef96387f14655fc854ddc3c6bd57  LICENSE-2.0.txt


More information about the scm-commits mailing list