[geronimo-commonj] introduce license macro

[gil]

commit d3f96b5578a3b098ecc26cd0d6c041b5d7194929
Author: gil <puntogil at libero.it>
Date:   Tue Feb 10 19:14:09 2015 +0100

    introduce license macro

 geronimo-commonj.spec |   70 ++++++++++++------------------------------------
 1 files changed, 18 insertions(+), 52 deletions(-)
---
diff --git a/geronimo-commonj.spec b/geronimo-commonj.spec
index 1411e62..f031a2c 100644
--- a/geronimo-commonj.spec
+++ b/geronimo-commonj.spec
@@ -1,89 +1,55 @@
-Name: geronimo-commonj
+%global spec_ver 1.1
+%global spec_name geronimo-commonj_%{spec_ver}_spec
+Name:    geronimo-commonj
 Version: 1.1.0
-Release: 10%{?dist}
+Release: 11%{?dist}
 Summary: CommonJ Specification
-Group: Development/Libraries
 License: ASL 2.0
-URL: http://geronimo.apache.org/
-
+URL:     http://geronimo.apache.org/
 # svn export https://svn.apache.org/repos/asf/geronimo/specs/tags/specs-1.4/geronimo-commonj_1.1_spec geronimo-commonj-1.1.0
 # tar cvfJ geronimo-commonj-1.1.0.tar.xz geronimo-commonj-1.1.0
-Source: %{name}-%{version}.tar.xz
+Source:  %{name}-%{version}.tar.xz
 
 # Remove the SNAPSHOT tag from the version in the POM file:
-Patch0: %{name}-version-fix.patch
+Patch0:  %{name}-version-fix.patch
 
 BuildArch: noarch
-
 BuildRequires: geronimo-parent-poms
-BuildRequires: java-devel
-BuildRequires: jpackage-utils
-BuildRequires: maven-compiler-plugin
-BuildRequires: maven-install-plugin
-BuildRequires: maven-jar-plugin
-BuildRequires: maven-javadoc-plugin
 BuildRequires: maven-local
 
-
-Requires: jpackage-utils
-
-
 %description
 Geronimo CommonJ Specification.
 
-
 %package javadoc
-Summary: Javadocs for %{name}
-Group: Documentation
-Requires: jpackage-utils
-
+Summary: Javadoc for %{name}
 
 %description javadoc
 This package contains the API documentation for %{name}.
 
-
 %prep
 %setup -q
 %patch0 -p0
 
+%mvn_file :%{spec_name} %{name}
 
 %build
-mvn-rpmbuild \
-  -Dproject.build.sourceEncoding=UTF-8 \
-  install \
-  javadoc:aggregate
 
+%mvn_build -- -Dproject.build.sourceEncoding=UTF-8
 
 %install
-
-# Jar files:
-install -d -m 755 %{buildroot}%{_javadir}
-install -pm 644 target/%{name}_1.1_spec-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
-
-# POM files:
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-
-# Javadoc files:
-install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
-cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
-
-# Dependencies map:
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
-
+%mvn_install
 
 %files -f .mfiles
-%doc LICENSE.txt
-%doc NOTICE.txt
-
-
-%files javadoc
-%{_javadocdir}/%{name}
-%doc LICENSE.txt
-%doc NOTICE.txt
+%license LICENSE.txt NOTICE.txt
 
+%files javadoc -f .mfiles-javadoc
+%license LICENSE.txt NOTICE.txt
 
 %changelog
+* Tue Feb 10 2015 gil cattaneo <puntogil at libero.it> 1.1.0-11
+- introduce license macro
+- adapt to current guideline
+
 * Sun Aug 03 2014 Yaakov Selkowitz <yselkowi at redhat.com> - 1.1.0-10
 - Fix FTBFS due to F21 XMvn changes (#1106494)