[geronimo-osgi-support] Fix license tag

Stanislav Ochotnicky sochotni at fedoraproject.org
Thu Aug 23 08:55:09 UTC 2012


commit aba3e01af9bf188c8109b06e587f0ae96a6854c8
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Thu Aug 23 08:27:52 2012 +0200

    Fix license tag
    
    - Install NOTICE files

 geronimo-osgi-support.spec |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/geronimo-osgi-support.spec b/geronimo-osgi-support.spec
index f30b340..97d671c 100644
--- a/geronimo-osgi-support.spec
+++ b/geronimo-osgi-support.spec
@@ -3,10 +3,10 @@
 
 Name:             geronimo-osgi-support
 Version:          1.0
-Release:          8%{?dist}
+Release:          9%{?dist}
 Summary:          OSGI spec bundle support
 Group:            Development/Libraries
-License:          ASL 2.0
+License:          ASL 2.0 and W3C
 URL:              http://geronimo.apache.org/
 
 Source0:          http://repo2.maven.org/maven2/org/apache/geronimo/specs/%{name}/%{version}/%{name}-%{version}-source-release.tar.gz
@@ -50,7 +50,7 @@ This package contains the API documentation for %{name}.
 %prep
 %setup -q
 iconv -f iso8859-1 -t utf-8 LICENSE > LICENSE.conv && mv -f LICENSE.conv LICENSE
-sed -i 's/\r//' LICENSE 
+sed -i 's/\r//' LICENSE NOTICE
 %patch1 -p0
 %patch2 -p0
 
@@ -84,16 +84,20 @@ install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
 cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
 
 %files
-%doc LICENSE
+%doc LICENSE NOTICE
 %{_javadir}/*
 %{_mavenpomdir}/*
 %{_mavendepmapfragdir}/*
 
 %files javadoc
-%doc LICENSE
+%doc LICENSE NOTICE
 %{_javadocdir}/%{name}
 
 %changelog
+* Thu Aug 23 2012 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.0-9
+- Fix license tag
+- Install NOTICE files
+
 * Mon Aug  6 2012 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.0-8
 - Add explicit OSGi export, resolves 812827
 


More information about the scm-commits mailing list