[picketbox-commons] Use the new Maven macros

[Ricardo Arguello]

commit 7ddd33454d640455b278c2b0ca3109803a8fc25b
Author: Ricardo Arguello <ricardo at fedoraproject.org>
Date:   Thu Jul 11 01:57:55 2013 -0500

    Use the new Maven macros

 picketbox-commons.spec |   83 ++++++++++++++++++-----------------------------
 sources                |    2 +-
 2 files changed, 33 insertions(+), 52 deletions(-)
---
diff --git a/picketbox-commons.spec b/picketbox-commons.spec
index e910fde..6ecab69 100644
--- a/picketbox-commons.spec
+++ b/picketbox-commons.spec
@@ -1,75 +1,56 @@
 %global namedreltag .final
 %global namedversion %{version}%{?namedreltag}
 
-Name:             picketbox-commons
-Version:          1.0.0
-Release:          6%{?dist}
-Summary:          Common classes for security projects
-Group:            Development/Libraries
-License:          LGPLv2+
-URL:              http://www.jboss.org/picketbox
+Name:           picketbox-commons
+Version:        1.0.0
+Release:        7%{?dist}
+Summary:        Common classes for security projects
+Group:          Development/Libraries
+License:        LGPLv2+
+URL:            http://www.jboss.org/picketbox
 
 # svn export http://anonsvn.jboss.org/repos/picketbox/commons/tags/1.0.0.final/picketbox-commons/ picketbox-commons-1.0.0.final
-# tar cafJ picketbox-commons-1.0.0.final.tar.xz picketbox-commons-1.0.0.final
-Source0:          %{name}-%{namedversion}.tar.xz
+# tar cJf picketbox-commons-1.0.0.final.tar.xz picketbox-commons-1.0.0.final
+Source0:        %{name}-%{namedversion}.tar.xz
 
-BuildArch:        noarch
+BuildArch:      noarch
 
-BuildRequires:    jpackage-utils
-BuildRequires:    java-devel
-BuildRequires:    maven-local
-BuildRequires:    maven-compiler-plugin
-BuildRequires:    maven-enforcer-plugin
-BuildRequires:    maven-install-plugin
-BuildRequires:    maven-jar-plugin
-BuildRequires:    maven-javadoc-plugin
+BuildRequires:  java-devel
+BuildRequires:  jpackage-utils
+BuildRequires:  maven-local
 
-Requires:         jpackage-utils
-Requires:         java
+Requires:       java
+Requires:       jpackage-utils
 
 %description
-This file contains common classes for security projects
+Common classes for security projects.
 
 %package javadoc
-Summary:          Javadocs for %{name}
-Group:            Documentation
-Requires:         jpackage-utils
+Summary:        Javadocs for %{name}
+Group:          Documentation
+Requires:       jpackage-utils
 
 %description javadoc
-This package contains the API documentation for %{name}.
+API documentation for %{name}.
 
 %prep
 %setup -q -n %{name}-%{namedversion}
-rm -rf .classpath .project .settings
 
 %build
-mvn-rpmbuild install javadoc:aggregate
+%mvn_build
 
 %install
-# JAR
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -pm 644 target/%{name}-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+%mvn_install
 
-# POM
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
+%files -f .mfiles
+%dir %{_javadir}/%{name}
 
-# DEPMAP
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
-
-# APIDOCS
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-%files
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
-%{_javadir}/*
-
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
 
 %changelog
+* Fri Jul 12 2013 Ricardo Arguello <ricardo at fedoraproject.org> - 1.0.0-7
+- Use the new Maven macros
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
@@ -77,17 +58,17 @@ cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 - Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild
 - Replace maven BuildRequires with maven-local
 
-* Mon Aug 6 2012 Ricardo Arguello <ricardo at fedoraproject.org> 1.0.0-4
+* Mon Aug 6 2012 Ricardo Arguello <ricardo at fedoraproject.org> - 1.0.0-4
 - Added BR: maven-enforcer-plugin
 
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
-* Fri Mar 2 2012 Ricardo Arguello <ricardo at fedoraproject.org> 1.0.0-2
+* Fri Mar 2 2012 Ricardo Arguello <ricardo at fedoraproject.org> - 1.0.0-2
 - Relocated jars to _javadir
 
-* Sat Feb 18 2012 Ricardo Arguello <ricardo at fedoraproject.org> 1.0.0-1
+* Sat Feb 18 2012 Ricardo Arguello <ricardo at fedoraproject.org> - 1.0.0-1
 - Updated to Final
 
-* Mon Nov 21 2011 Marek Goldmann <mgoldman at redhat.com> 1.0.0-0.1.CR1
+* Mon Nov 21 2011 Marek Goldmann <mgoldman at redhat.com> - 1.0.0-0.1.CR1
 - Initial packaging
diff --git a/sources b/sources
index 1a1af73..44b30c3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4dc27fc06a9758ec9a32e6aeaef97f58  picketbox-commons-1.0.0.final.tar.xz
+968ba61772b06cdf6a50bde2cb4daf38  picketbox-commons-1.0.0.final.tar.xz