[greenmail] introduce license macro

[gil]

commit 154e093f9ac3c0be99d2f102d930c19517e3f1bc
Author: gil <puntogil at libero.it>
Date:   Wed Mar 4 00:34:16 2015 +0100

    introduce license macro

 greenmail.spec | 55 ++++++++++++++++++++++++++++---------------------------
 1 file changed, 28 insertions(+), 27 deletions(-)
---
diff --git a/greenmail.spec b/greenmail.spec
index 194b465..7389835 100644
--- a/greenmail.spec
+++ b/greenmail.spec
@@ -1,26 +1,28 @@
 # Disable running the test suite by default
 %bcond_with tests
 
-Name: greenmail
-Version: 1.3.1b
-Release: 2%{?dist}
-Summary: Suite of email servers for testing purposes
-License: ASL 2.0
-URL: http://www.icegreen.com/greenmail
+Name:          greenmail
+Version:       1.3.1b
+Release:       3%{?dist}
+Summary:       Suite of email servers for testing purposes
+License:       ASL 2.0
+URL:           http://www.icegreen.com/greenmail
 # FPC bundling exception: https://fedorahosted.org/fpc/ticket/392
-Source0: http://sourceforge.net/projects/greenmail/files/%{name}/%{version}/%{name}-%{version}-src.zip
-Source1: http://sourceforge.net/p/greenmail/code/HEAD/tree/branches/1.3/license.txt
-Source2: http://repo1.maven.org/maven2/com/icegreen/%{name}/%{version}/%{name}-%{version}.pom
+Source0:       http://sourceforge.net/projects/greenmail/files/%{name}/%{version}/%{name}-%{version}-src.zip
+Source1:       http://sourceforge.net/p/greenmail/code/HEAD/tree/branches/1.3/license.txt
+Source2:       http://repo1.maven.org/maven2/com/icegreen/%{name}/%{version}/%{name}-%{version}.pom
 # e-mail clearing up licensing issues
-Source3: %{name}-license-confusion.eml
-BuildArch: noarch
+Source3:       %{name}-license-confusion.eml
+BuildArch:     noarch
 
 BuildRequires: ant
 BuildRequires: ant-junit
 BuildRequires: java-devel
-BuildRequires: javamail
-BuildRequires: javapackages-tools
-BuildRequires: slf4j
+BuildRequires: javapackages-local
+BuildRequires: mvn(javax.mail:mail)
+BuildRequires: mvn(junit:junit)
+BuildRequires: mvn(org.slf4j:slf4j-api)
+BuildRequires: mvn(org.slf4j:slf4j-simple)
 
 %description
 GreenMail is an intuitive and easy-to-use test suite of email servers for
@@ -46,15 +48,10 @@ ant all
 install %{SOURCE3} .
 
 %install
-install -d -m 0755 %{buildroot}/%{_javadir}
-install -d -m 0755 %{buildroot}/%{_javadocdir}/%{name}
-install -d -m 0755 %{buildroot}/%{_mavenpomdir}
+%mvn_artifact %{SOURCE2} build/lib/%{name}-%{version}.jar
+%mvn_file com.icegreen:%{name} %{name}
+%mvn_install -J build/javadocs
 
-install -m 0644 build/lib/%{name}-%{version}.jar %{buildroot}/%{_javadir}/%{name}.jar
-install -m 0644 %{SOURCE2} %{buildroot}/%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
-
-cp -ar build/javadocs/* %{buildroot}/%{_javadocdir}/%{name}
 
 %if %{with tests}
 %check
@@ -62,14 +59,18 @@ ant test
 %endif
 
 %files -f .mfiles
-%doc LICENSE faq.html readme.html %{name}-license-confusion.eml
-%{_javadir}/%{name}.jar
+%doc readme.html
+%license LICENSE %{name}-license-confusion.eml
 
-%files javadoc
-%doc LICENSE readme.html %{name}-license-confusion.eml
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
+%license LICENSE %{name}-license-confusion.eml
 
 %changelog
+* Tue Mar 03 2015 gil cattaneo <puntogil at libero.it> 1.3.1b-3
+- introduce license macro
+- use newer javapackages macros
+- fix BR list
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3.1b-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild