[openwebbeans] introduce license macro

[gil]

commit 99cb7c1a43d5082ed9cbdad913ecc37cdc57dbbc
Author: gil <puntogil at libero.it>
Date:   Wed Feb 11 16:06:33 2015 +0100

    introduce license macro

 openwebbeans.spec |   65 +++++++++++++++++++++++-----------------------------
 1 files changed, 29 insertions(+), 36 deletions(-)
---
diff --git a/openwebbeans.spec b/openwebbeans.spec
index c316328..89594eb 100644
--- a/openwebbeans.spec
+++ b/openwebbeans.spec
@@ -1,6 +1,6 @@
 Name:          openwebbeans
 Version:       1.2.0
-Release:       3%{?dist}
+Release:       4%{?dist}
 Summary:       Implementation of the JSR-299 WebBeans
 License:       ASL 2.0
 URL:           http://openwebbeans.apache.org/
@@ -12,16 +12,10 @@ Patch2:        %{name}-1.2.0-xbean-312.patch
 # Add missing tomcat7 method
 Patch3:        %{name}-1.2.0-tomcat7.patch
 
-BuildRequires: java-devel
 BuildRequires: mvn(asm:asm)
 # BuildRequires: glassfish-annotation-api
 BuildRequires: mvn(javax.annotation:javax.annotation-api) >= 1.2
-%if %{?fedora} > 19
 BuildRequires: mvn(javax.enterprise:cdi-api)
-%else
-# BuildRequires: cdi-api11
-BuildRequires: mvn(javax.enterprise:cdi-api:1)
-%endif
 BuildRequires: mvn(javax.inject:javax.inject)
 BuildRequires: mvn(org.apache.geronimo.specs:geronimo-ejb_3.1_spec)
 BuildRequires: mvn(org.apache.geronimo.specs:geronimo-jcdi_1.0_spec)
@@ -62,7 +56,6 @@ BuildRequires: maven-dependency-plugin
 BuildRequires: maven-plugin-build-helper
 BuildRequires: maven-plugin-bundle
 BuildRequires: maven-remote-resources-plugin
-BuildRequires: maven-surefire-provider-junit
 BuildRequires: replacer
 BuildRequires: geronimo-parent-poms
 BuildRequires: httpcomponents-project
@@ -91,11 +84,6 @@ This is intended for running in unit tests.
 
 %package cdi11
 Summary:       OpenWebBeans Core for CDI 1.1
-%if %{?fedora} > 19
-Requires:      cdi-api
-%else
-Requires:      cdi-api11
-%endif
 
 %description cdi11
 Apache OpenWebBeans Implementation core module implementing CDI 1.1.
@@ -445,12 +433,14 @@ rm -rf webbeans-clustering/src/test/java/org/apache/webbeans/web/failover/tests/
 # Break build
 %pom_remove_plugin org.apache.rat:apache-rat-plugin
 
-%build
-
 # merge parents poms with proper project subpackage
 %mvn_package org.apache.openwebbeans.arquillian: arquillian
 %mvn_package org.apache.openwebbeans.test: test
 
+%build
+
+
+
 # some tests fails, e.g. :
 # java.lang.NoClassDefFoundError: Could not fully load class: org.apache.webbeans.newtests.interceptors.resolution.beans.UtilitySampleBean
 # due to:org/apache/xbean/finder/AnnotationFinder$InfoBuildingVisitor
@@ -469,69 +459,72 @@ install -m 644 webbeans-impl/target/%{name}-impl-%{version}-tests.jar %{buildroo
 
 %files -f .mfiles-%{name}
 %dir %{_javadir}/%{name}
-%doc LICENSE NOTICE
+%license LICENSE NOTICE
 
 %files arquillian -f .mfiles-arquillian
-%doc LICENSE NOTICE
+%license LICENSE NOTICE
 
 %files cdi11 -f .mfiles-%{name}-cdi11
-%doc LICENSE NOTICE
+%license LICENSE NOTICE
 
 %files clustering -f .mfiles-%{name}-clustering
-%doc LICENSE NOTICE
+%license LICENSE NOTICE
 
 %files ee -f .mfiles-%{name}-ee
-%doc LICENSE NOTICE
+%license LICENSE NOTICE
 
 %files ee-common -f .mfiles-%{name}-ee-common
-%doc LICENSE NOTICE
+%license LICENSE NOTICE
 
 %files ejb -f .mfiles-%{name}-ejb
-%doc LICENSE NOTICE
+%license LICENSE NOTICE
 
 %files el22 -f .mfiles-%{name}-el22
-%doc LICENSE NOTICE
+%license LICENSE NOTICE
 
 %files impl -f .mfiles-%{name}-impl
 %{_javadir}/%{name}/%{name}-impl-tests.jar
-%doc LICENSE NOTICE
+%license LICENSE NOTICE
 
 %files jee5-ejb-resource -f .mfiles-%{name}-jee5-ejb-resource
-%doc LICENSE NOTICE
+%license LICENSE NOTICE
 
 %files jms -f .mfiles-%{name}-jms
-%doc LICENSE NOTICE
+%license LICENSE NOTICE
 
 %files jsf -f .mfiles-%{name}-jsf
-%doc LICENSE NOTICE
+%license LICENSE NOTICE
 
 %files osgi -f .mfiles-%{name}-osgi
-%doc LICENSE NOTICE
+%license LICENSE NOTICE
 
 %files resource -f .mfiles-%{name}-resource
-%doc LICENSE NOTICE
+%license LICENSE NOTICE
 
 %files spi -f .mfiles-%{name}-spi
-%doc LICENSE NOTICE
+%license LICENSE NOTICE
 
 %files test -f .mfiles-test
-%doc LICENSE NOTICE
+%license LICENSE NOTICE
 
 %if 0
 %files tomcat6 -f .mfiles-%{name}-tomcat6
-%doc LICENSE NOTICE
+%license LICENSE NOTICE
 %endif
 
 %files tomcat7 -f .mfiles-%{name}-tomcat7
-%doc LICENSE NOTICE
+%license LICENSE NOTICE
 
 %files web -f .mfiles-%{name}-web
-%doc LICENSE NOTICE
+%license LICENSE NOTICE
 
 %files javadoc -f .mfiles-javadoc
-%doc LICENSE NOTICE
+%license LICENSE NOTICE
 
 %changelog
+* Wed Feb 11 2015 gil cattaneo <puntogil at libero.it> 1.2.0-4
+- introduce license macro
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
@@ -559,4 +552,4 @@ install -m 644 webbeans-impl/target/%{name}-impl-%{version}-tests.jar %{buildroo
 - update to 1.1.7
 
 * Wed Oct 24 2012 gil cattaneo <puntogil at libero.it> 1.1.6-1
-- initial rpm
\ No newline at end of file
+- initial rpm