[maven-skins] Adapt to current guidelines.

[Alexander Kurtakov]

commit 36cd9be3b1796182b6a15d2f1fe4f9651a904586
Author: Alexander Kurtakov < <akurtako at redhat.com>
Date:   Fri Nov 25 14:28:37 2011 +0200

    Adapt to current guidelines.

 maven-skins.spec |   49 +++++++++++++++----------------------------------
 1 files changed, 15 insertions(+), 34 deletions(-)
---
diff --git a/maven-skins.spec b/maven-skins.spec
index b8d6019..353c1b5 100644
--- a/maven-skins.spec
+++ b/maven-skins.spec
@@ -5,7 +5,7 @@
 
 Name:           maven-skins
 Version:        5
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Maven Skins
 
 Group:          Development/Libraries
@@ -14,10 +14,9 @@ URL:            http://maven.apache.org/skins/
 # svn export http://svn.apache.org/repos/asf/maven/skins/tags/maven-skins-5
 # tar caf maven-skins-5-tar.xz maven-skins-5/
 Source0:        %{name}-%{version}.tar.xz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
-BuildRequires:  maven2
+BuildRequires:  maven
 BuildRequires:  maven-install-plugin
 BuildRequires:  maven-resources-plugin
 BuildRequires:  maven-compiler-plugin
@@ -25,8 +24,6 @@ BuildRequires:  maven-jar-plugin
 BuildRequires:  maven-surefire-plugin
 BuildRequires:  maven-site-plugin
 Requires:       jpackage-utils
-Requires(post):       jpackage-utils
-Requires(postun):     jpackage-utils
 Requires:       java
 
 %description
@@ -42,61 +39,45 @@ sed -i -e "s|5-SNAPSHOT|5|g" maven-stylus-skin/pom.xml
 rm -fr src/site/site.xml
 
 %build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mvn-jpp \
-        -e \
-        -Dmaven2.jpp.mode=true \
-        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
-        install
+mvn-rpmbuild install
 
 %install
 rm -rf %{buildroot}
 
 # jars
 install -d -m 0755 %{buildroot}%{_javadir}/%{name}
-install -m 644 maven-application-skin/target/maven-application-skin-%{app_version}.jar   %{buildroot}%{_javadir}/%{name}/maven-application-skin-%{app_version}.jar
-install -m 644 maven-default-skin/target/maven-default-skin-%{def_version}.jar   %{buildroot}%{_javadir}/%{name}/maven-default-skin-%{def_version}.jar
-install -m 644 maven-classic-skin/target/maven-classic-skin-%{cla_version}.jar   %{buildroot}%{_javadir}/%{name}/maven-classic-skin-%{cla_version}.jar
-install -m 644 maven-stylus-skin/target/maven-stylus-skin-%{sty_version}.jar   %{buildroot}%{_javadir}/%{name}/maven-stylus-skin-%{sty_version}.jar
-
-(cd %{buildroot}%{_javadir}/%{name} && for jar in *-SNAPSHOT*; \
-    do ln -sf ${jar} `echo $jar| sed "s|-[0-9].[0-9]-SNAPSHOT||g"`; done)
-
+install -m 644 maven-application-skin/target/maven-application-skin-%{app_version}.jar   %{buildroot}%{_javadir}/%{name}/maven-application-skin.jar
+install -m 644 maven-default-skin/target/maven-default-skin-%{def_version}.jar   %{buildroot}%{_javadir}/%{name}/maven-default-skin.jar
+install -m 644 maven-classic-skin/target/maven-classic-skin-%{cla_version}.jar   %{buildroot}%{_javadir}/%{name}/maven-classic-skin.jar
+install -m 644 maven-stylus-skin/target/maven-stylus-skin-%{sty_version}.jar   %{buildroot}%{_javadir}/%{name}/maven-stylus-skin.jar
 
 # poms
 install -d -m 755 %{buildroot}%{_mavenpomdir}
 install -pm 644 pom.xml \
     %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_to_maven_depmap org.apache.maven.skins maven-skins %{version} JPP maven-skins
+%add_maven_depmap JPP-%{name}.pom
 install -pm 644 maven-application-skin/pom.xml \
     %{buildroot}%{_mavenpomdir}/JPP.%{name}-maven-application-skin.pom
-%add_to_maven_depmap org.apache.maven.skins maven-application-skin %{version} JPP/maven-skins maven-application-skin
+%add_maven_depmap JPP.%{name}-maven-application-skin.pom %{name}/maven-application-skin.jar
 install -pm 644 maven-default-skin/pom.xml \
     %{buildroot}%{_mavenpomdir}/JPP.%{name}-maven-default-skin.pom
-%add_to_maven_depmap org.apache.maven.skins maven-default-skin %{version} JPP/maven-skins maven-default-skin
+%add_maven_depmap JPP.%{name}-maven-default-skin.pom %{name}/maven-default-skin.jar
 install -pm 644 maven-classic-skin/pom.xml \
     %{buildroot}%{_mavenpomdir}/JPP.%{name}-maven-classic-skin.pom
-%add_to_maven_depmap org.apache.maven.skins maven-classic-skin %{version} JPP/maven-skins maven-classic-skin
+%add_maven_depmap JPP.%{name}-maven-classic-skin.pom %{name}/maven-classic-skin.jar
 install -pm 644 maven-stylus-skin/pom.xml \
     %{buildroot}%{_mavenpomdir}/JPP.%{name}-maven-stylus-skin.pom
-%add_to_maven_depmap org.apache.maven.skins maven-stylus-skin %{version} JPP/maven-skins maven-stylus-skin
-
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
-%clean
-%{__rm} -rf %{buildroot}
+%add_maven_depmap JPP.%{name}-maven-stylus-skin.pom %{name}/maven-stylus-skin.jar
 
 %files
-%defattr(-,root,root,-)
 %{_javadir}/*
 %{_mavenpomdir}/*
 %{_mavendepmapfragdir}/*
 
 %changelog
+* Fri Nov 25 2011 Alexander Kurtakov <akurtako at redhat.com> 5-4
+- Adapt to current guidelines.
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild