From 427e1b12fe27640e18319685e271743817dcd33f Mon Sep 17 00:00:00 2001
From: Marek Goldmann <marek.goldmann@gmail.com>
Date: Aug 06 2013 10:26:42 +0000
Subject: New guidelines


---

diff --git a/hawtjni.spec b/hawtjni.spec
index 98cef49..d6cf819 100644
--- a/hawtjni.spec
+++ b/hawtjni.spec
@@ -1,6 +1,6 @@
 Name:             hawtjni
 Version:          1.8
-Release:          2%{?dist}
+Release:          3%{?dist}
 Summary:          Code generator that produces the JNI code
 Group:            Development/Libraries
 License:          ASL 2.0 and EPL and BSD
@@ -16,8 +16,6 @@ Patch3:           0004-Remove-eclipse-plugin.patch
 
 BuildArch:        noarch
 
-BuildRequires:    jpackage-utils
-BuildRequires:    java-devel
 BuildRequires:    maven-local
 BuildRequires:    maven-compiler-plugin
 BuildRequires:    maven-plugin-plugin
@@ -34,12 +32,6 @@ BuildRequires:    junit4
 BuildRequires:    fusesource-pom
 BuildRequires:    xbean
 
-Requires:         java
-Requires:         jpackage-utils
-Requires:         xbean
-Requires:         apache-commons-cli
-Requires:         objectweb-asm
-
 %description
 HawtJNI is a code generator that produces the JNI code needed to
 implement java native methods. It is based on the jnigen code generator
@@ -49,20 +41,13 @@ JNI code which powers the eclipse platform.
 %package javadoc
 Summary:          Javadocs for %{name}
 Group:            Documentation
-Requires:         jpackage-utils
 
 %description javadoc
 This package contains the API documentation for %{name}.
 
-%package -n maven-%{name}-plugin
+%package -n maven-hawtjni-plugin
 Summary:          Use HawtJNI from a maven plugin
 Group:            Development/Libraries
-Requires:         maven
-Requires:         plexus-utils
-Requires:         plexus-interpolation
-Requires:         maven-archiver
-Requires:         plexus-archiver
-Requires:         plexus-io
 Requires:         hawtjni = %{version}-%{release}
 
 %description -n maven-%{name}-plugin
@@ -75,50 +60,28 @@ This package allows to use HawtJNI from a maven plugin.
 %patch2 -p1
 %patch3 -p1
 
+%mvn_package ":maven-hawtjni-plugin" maven-plugin
+
 %build
-mvn-rpmbuild install javadoc:aggregate
+%mvn_build
 
 %install
-# JAR
-mkdir -p $RPM_BUILD_ROOT%{_javadir}
-cp -p %{name}-generator/target/%{name}-generator-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-generator.jar
-cp -p %{name}-runtime/target/%{name}-runtime-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-runtime.jar
-cp -p maven-%{name}-plugin/target/maven-%{name}-plugin-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/maven-%{name}-plugin.jar
-
-# JAVADOC
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-# POM
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-pom.pom
-install -pm 644 %{name}-generator/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-generator.pom
-install -pm 644 %{name}-runtime/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-runtime.pom
-install -pm 644 maven-%{name}-plugin/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-maven-%{name}-plugin.pom
-
-# DEPMAP
-%add_maven_depmap JPP-%{name}-pom.pom
-%add_maven_depmap JPP-%{name}-generator.pom %{name}-generator.jar
-%add_maven_depmap JPP-%{name}-runtime.pom %{name}-runtime.jar
-%add_maven_depmap JPP-maven-%{name}-plugin.pom maven-%{name}-plugin.jar
-
-%files
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
-%{_javadir}/*
+%mvn_install
+
+%files -f .mfiles
+%dir %{_javadir}/%{name}
 %doc readme.md license.txt changelog.md
-%exclude %{_mavenpomdir}/JPP-maven-%{name}-plugin.pom
-%exclude %{_javadir}/maven-%{name}-plugin.jar
 
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
 %doc license.txt
 
-%files -n maven-%{name}-plugin
-%{_mavenpomdir}/JPP-maven-%{name}-plugin.pom
-%{_javadir}/maven-%{name}-plugin.jar
+%files -n maven-hawtjni-plugin -f .mfiles-maven-plugin
+%doc license.txt
 
 %changelog
+* Tue Aug 06 2013 Marek Goldmann <mgoldman@redhat.com> - 1.8-3
+- New guidelines
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild