From 640166ff76b53a1f391c830c46f5e7ecb84afdd9 Mon Sep 17 00:00:00 2001
From: Michal Srb <msrb@redhat.com>
Date: Mon, 5 Aug 2013 13:34:33 +0200
Subject: [PATCH] Adapt to current guidelines

---
 maven-script-interpreter.spec | 48 +++++++++++------------------------
 1 file changed, 15 insertions(+), 33 deletions(-)

diff --git a/maven-script-interpreter.spec b/maven-script-interpreter.spec
index 8d31fb9..a2fb0c3 100644
--- a/maven-script-interpreter.spec
+++ b/maven-script-interpreter.spec
@@ -1,8 +1,7 @@
 Name:           maven-script-interpreter
 Version:        1.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Maven Script Interpreter
-Group:          Development/Libraries  
 License:        ASL 2.0
 URL:            http://maven.apache.org/shared/%{name}
 Source0:        http://central.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/%{name}-%{version}-source-release.zip
@@ -12,19 +11,15 @@ Patch0:         %{name}-plexus.patch
 
 BuildArch:      noarch
 
-BuildRequires:  java-devel >= 1:1.6.0
-BuildRequires:  jpackage-utils
-BuildRequires:  groovy
 BuildRequires:  maven-local
-BuildRequires:  maven-surefire-provider-junit4
-BuildRequires:  plexus-containers-component-metadata
+BuildRequires:  mvn(junit:junit)
+BuildRequires:  mvn(org.apache.ant:ant)
+BuildRequires:  mvn(org.apache.maven.shared:maven-shared-components)
+BuildRequires:  mvn(org.apache.maven:maven-plugin-api)
+BuildRequires:  mvn(org.beanshell:bsh)
+BuildRequires:  mvn(org.codehaus.groovy:groovy)
+BuildRequires:  mvn(org.codehaus.plexus:plexus-utils)
 
-Requires:       java
-Requires:       jpackage-utils
-Requires:       bsh
-Requires:       groovy
-Requires:       maven
-Requires:       plexus-utils
 
 %description
 This component provides some utilities to interpret/execute some scripts for
@@ -32,9 +27,7 @@ various implementations: Groovy or BeanShell.
 
 
 %package javadoc
-Group:          Documentation
 Summary:        Javadoc for %{name}
-Requires:       jpackage-utils
     
 %description javadoc
 API documentation for %{name}.
@@ -45,33 +38,22 @@ API documentation for %{name}.
 %patch0 -p1
 
 %build
-mvn-rpmbuild install javadoc:aggregate -Dproject.build.sourceEncoding=UTF-8
+%mvn_build -- -Dproject.build.sourceEncoding=UTF-8
 
 %install
-# JAR
-install -Dpm 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
+%mvn_install
 
-# POM
-install -Dpm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-
-# JavaDoc
-install -Ddm 755 %{buildroot}/%{_javadocdir}/%{name}
-cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
-
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
-
-%files
+%files -f .mfiles
 %doc DEPENDENCIES LICENSE NOTICE
-%{_javadir}/%{name}.jar
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
 
-%files javadoc
+%files javadoc -f .mfiles-javadoc
 %doc LICENSE NOTICE
-%doc %{_javadocdir}/%{name}
 
 
 %changelog
+* Mon Aug 05 2013 Michal Srb <msrb@redhat.com> - 1.0-5
+- Adapt to current guidelines
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild