[maven-license-plugin] Adapt to current guidelines.

[Alexander Kurtakov]

commit be8df479f081079cf99d9cc6120d5f1489cc5838
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Tue Jul 5 14:36:15 2011 +0300

    Adapt to current guidelines.

 001-mavenlicenseplugin-fixbuild.patch |    2 +-
 maven-license-plugin.spec             |   31 ++++++-------------------------
 2 files changed, 7 insertions(+), 26 deletions(-)
---
diff --git a/001-mavenlicenseplugin-fixbuild.patch b/001-mavenlicenseplugin-fixbuild.patch
index 65a4118..e2ca48c 100644
--- a/001-mavenlicenseplugin-fixbuild.patch
+++ b/001-mavenlicenseplugin-fixbuild.patch
@@ -39,7 +39,7 @@
 +        </dependency>
 +        <dependency>
 +            <groupId>org.apache.maven</groupId>
-+            <artifactId>maven-artifact</artifactId>
++            <artifactId>maven-compat</artifactId>
 +            <version>2.2.1</version>
          </dependency>
          <dependency>
diff --git a/maven-license-plugin.spec b/maven-license-plugin.spec
index 0bd3c05..edc4835 100644
--- a/maven-license-plugin.spec
+++ b/maven-license-plugin.spec
@@ -1,6 +1,6 @@
 Name:           maven-license-plugin
 Version:        1.8.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Maven plugin to update header licenses of source files
 
 Group:          Development/Libraries
@@ -14,7 +14,6 @@ Source0:        %{name}-%{version}.tar.xz
 # remove testng dep (tests are skipped) and maven-license-plugin call
 Patch0:         001-mavenlicenseplugin-fixbuild.patch
 BuildArch:      noarch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  java-devel
 BuildRequires:  jpackage-utils
@@ -53,9 +52,6 @@ Requires:       jpackage-utils
 Requires:       maven
 Requires:       xmltool
 
-Requires(post):   jpackage-utils
-Requires(postun): jpackage-utils
-
 %description
 maven-license-plugin is a Maven plugin that help you managing license 
 headers in source files. Basically, when you are developing a project 
@@ -86,11 +82,9 @@ sed -i 's/\r//' NOTICE.txt
 
 
 %build
-mvn-local -Dmaven.test.skip=true install javadoc:aggregate
-
+mvn-rpmbuild -Dmaven.test.skip=true install javadoc:aggregate
 
 %install
-rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_javadir}
 
 # jar
@@ -105,34 +99,21 @@ cp -rp target/site/apidocs/  $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
 install -pm 644 pom.xml  $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
 
-%add_to_maven_depmap com.mycila.maven-license-plugin %{name} %{version} JPP %{name}
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
 
 %files
-%defattr(-,root,root,-)
 %doc NOTICE.txt LICENSE.txt
 %{_mavenpomdir}/*
 %{_mavendepmapfragdir}/*
 %{_javadir}/*
 
-
 %files javadoc
-%defattr(-,root,root,-)
 %{_javadocdir}/%{name}
 
-
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
-
 %changelog
+* Tue Jul 5 2011 Alexander Kurtakov <akurtako at redhat.com> 1.8.0-5
+- Adapt to current guidelines.
+
 * Fri Jun 24 2011 Guido Grazioli <guido.grazioli at gmail.com> - 1.8.0-4
 - Fix FTBFS
 - Update to maven 3