[osgi-resource-locator] introduce license macro

gil gil at fedoraproject.org
Wed Feb 11 17:03:23 UTC 2015


commit 3b57a392d45a37de037338a85fa29be2b14067f6
Author: gil <puntogil at libero.it>
Date:   Wed Feb 11 18:03:06 2015 +0100

    introduce license macro

 osgi-resource-locator.spec |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/osgi-resource-locator.spec b/osgi-resource-locator.spec
index a63fd34..ec07ede 100644
--- a/osgi-resource-locator.spec
+++ b/osgi-resource-locator.spec
@@ -1,6 +1,6 @@
 Name:          osgi-resource-locator
 Version:       1.0.1
-Release:       5%{?dist}
+Release:       6%{?dist}
 Summary:       OSGi resource locator bundle
 License:       CDDL or GPLv2 with exceptions
 Url:           http://hk2.java.net/
@@ -11,8 +11,6 @@ Source0:       %{name}-%{version}-src-svn.tar.gz
 # glassfish-master-pom package don't include the license file
 Source1:       glassfish-LICENSE.txt
 
-BuildRequires: java-devel
-
 BuildRequires: felix-osgi-compendium
 BuildRequires: felix-osgi-core
 BuildRequires: glassfish-master-pom
@@ -39,21 +37,25 @@ sed -i 's/\r//' LICENSE.txt
 
 %pom_xpath_inject "pom:build/pom:plugins/pom:plugin[pom:artifactId ='maven-jar-plugin']" "<version>2.4</version>"
 
+%mvn_file :%{name} %{name}
+
 %build
 
-%mvn_file :%{name} %{name}
 %mvn_build -- -Dproject.build.sourceEncoding=UTF-8
 
 %install
 %mvn_install
 
 %files -f .mfiles
-%doc LICENSE.txt
+%license LICENSE.txt
 
 %files javadoc -f .mfiles-javadoc
-%doc LICENSE.txt
+%license LICENSE.txt
 
 %changelog
+* Wed Feb 11 2015 gil cattaneo <puntogil at libero.it> 1.0.1-6
+- introduce license macro
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 


More information about the scm-commits mailing list