[jsilver] Update for latest guidelines

[Mat Booth]

commit eaa3225864f6f312b9d1ea5712fbe08917d79e60
Author: Mat Booth <mat.booth at redhat.com>
Date:   Mon Jun 9 16:30:32 2014 +0100

    Update for latest guidelines

 .gitignore   |    4 ++++
 jsilver.spec |   51 ++++++++++++++-------------------------------------
 2 files changed, 18 insertions(+), 37 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8a3d657..60728ee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,5 @@
 /jsilver-1.0.0.tar.xz
+/jsilver-1.0.0/
+/.build-*.log
+/noarch
+/*.src.rpm
diff --git a/jsilver.spec b/jsilver.spec
index 7779a13..354e7a4 100644
--- a/jsilver.spec
+++ b/jsilver.spec
@@ -1,9 +1,8 @@
 Name:           jsilver
 Version:        1.0.0
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        A pure-Java implementation of Clearsilver
 
-Group:          Development/Libraries
 License:        ASL 2.0 
 
 URL:            http://code.google.com/p/jsilver/
@@ -13,29 +12,15 @@ Source0:        jsilver-1.0.0.tar.xz
 
 BuildArch:      noarch
 
-BuildRequires:  jpackage-utils
-BuildRequires:  java-devel
 BuildRequires:  maven-local
-BuildRequires:  maven-compiler-plugin
-BuildRequires:  maven-install-plugin
-BuildRequires:  maven-jar-plugin
-BuildRequires:  maven-javadoc-plugin
-BuildRequires:  maven-release-plugin
-BuildRequires:  maven-resources-plugin
-BuildRequires:  maven-surefire-plugin
-BuildRequires:  maven-plugin-exec
-BuildRequires:  maven-surefire-provider-junit4
+BuildRequires:  exec-maven-plugin
 BuildRequires:  sablecc
 
-Requires:       jpackage-utils
-
 %description
 A pure-Java implementation of Clearsilver, an HTML template system.
 
 %package javadoc
 Summary:        API docs for %{name}
-Group:          Documentation
-Requires:       jpackage-utils
 
 %description javadoc
 This package contains the API documentation for %{name}.
@@ -45,33 +30,25 @@ This package contains the API documentation for %{name}.
 find . -name *.jar -exec rm -f {} \;
 ln -s %{_javadir}/sablecc.jar sablecc/
 
+# non default target dir doesn't work well with xmvn
+sed -i -e "s/>build</>target</" pom.xml
+sed -i -e "s/build/target/" build.xml
+
 %build
-mvn-rpmbuild install javadoc:javadoc
+%mvn_build
 
 %install
+%mvn_install
 
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-cp -p build/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -rp build/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
+%files -f .mfiles
+%dir %{_javadir}/jsilver
 
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
-
-
-%files
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
-%{_javadir}/%{name}.jar
-
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
 
 %changelog
+* Mon Jun 09 2014 Mat Booth <mat.booth at redhat.com> - 1.0.0-8
+- Update for latest guidelines
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.0-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild