diff --git a/groovy18.spec b/groovy18.spec index 5867428..9e4b520 100644 --- a/groovy18.spec +++ b/groovy18.spec @@ -22,20 +22,14 @@ Name: groovy18 Version: 1.8.9 Release: 0 Summary: Dynamic language for the Java Platform -# Some of the files are licensed under BSD and CPL terms, but the CPL has been superceded -# by the EPL. We include copies of both for completeness. -# groovyConsole uses CC-BY licensed icons -# thanks to Michal Srb and Mikolaj Izdebski, and Tom Callaway -License: Apache-2.0 AND BSD AND EPL-1.0 AND SUSE-Public-Domain AND CC-BY +License: Apache-2.0 Group: Development/Libraries/Java URL: http://groovy-lang.org Source0: https://github.com/groovy/groovy-core/archive/GROOVY_%{archiver}.zip # thanks to Johannes Lips and Matt Spaulding Source1: groovy18-script Source2: groovy18-starter.conf -Source4: cpl-v10.txt -Source5: epl-v10.txt -Source6: http://www.apache.org/licenses/LICENSE-2.0.txt +Source3: http://www.apache.org/licenses/LICENSE-2.0.txt # thanks to Andy Grimm Patch0: groovy-inner-interface-annotations.patch Patch1: groovy-build-with-java8.patch @@ -126,7 +120,7 @@ JavaDoc documentation for %{name} find . -name "*.class" -delete find . -name "*.jar" -delete -cp %{SOURCE4} %{SOURCE5} %{SOURCE6} . +cp %{SOURCE3} . %patch0 -p1 %patch1 -p1 @@ -204,13 +198,13 @@ install -p -m644 %{SOURCE2} \ %{_bindir}/* %config(noreplace) %{_sysconfdir}/%{name}-starter.conf %doc README.md -%license LICENSE.txt LICENSE-2.0.txt NOTICE.txt cpl-v10.txt epl-v10.txt +%license LICENSE.txt LICENSE-2.0.txt NOTICE.txt %files lib -f .mfiles-%{name}-lib -%license LICENSE.txt LICENSE-2.0.txt NOTICE.txt cpl-v10.txt epl-v10.txt +%license LICENSE.txt LICENSE-2.0.txt NOTICE.txt %files javadoc %{_javadocdir}/%{name} -%license LICENSE.txt LICENSE-2.0.txt NOTICE.txt cpl-v10.txt epl-v10.txt +%license LICENSE.txt LICENSE-2.0.txt NOTICE.txt %changelog