From 4384a0cdce27414180870cb9674b433a3f78cc2a Mon Sep 17 00:00:00 2001
From: Marek Goldmann <marek.goldmann@gmail.com>
Date: Tue, 6 Aug 2013 12:13:10 +0200
Subject: [PATCH] New guidelines

---
 jansi-native.spec | 43 ++++++++++---------------------------------
 1 file changed, 10 insertions(+), 33 deletions(-)

diff --git a/jansi-native.spec b/jansi-native.spec
index 8c3e03f..1f38c60 100644
--- a/jansi-native.spec
+++ b/jansi-native.spec
@@ -7,7 +7,7 @@
 
 Name:             jansi-native
 Version:          1.4
-Release:          6%{?dist}
+Release:          7%{?dist}
 Summary:          Jansi Native implements the JNI Libraries used by the Jansi project
 Group:            Development/Libraries
 License:          ASL 2.0
@@ -19,8 +19,6 @@ Source0:          jansi-native-%{version}.tar.xz
 
 Patch0:           0001-Fixing-archiver-requires-AM_PROG_AR-in-configure.ac-.patch
 
-BuildRequires:    jpackage-utils
-BuildRequires:    java-devel
 BuildRequires:    maven-local
 BuildRequires:    maven-compiler-plugin
 BuildRequires:    maven-javadoc-plugin
@@ -39,10 +37,7 @@ BuildRequires:    make
 BuildRequires:    fusesource-pom
 BuildRequires:    maven-surefire-provider-junit4
 BuildRequires:    maven-hawtjni-plugin
-
-Requires:         hawtjni
-Requires:         java
-Requires:         jpackage-utils
+BuildRequires:    maven-install-plugin
 
 %description
 Jansi is a small java library that allows you to use ANSI escape sequences
@@ -63,40 +58,22 @@ This package contains the API documentation for %{name}.
 %patch0 -p1
 
 %build
-mvn-rpmbuild install javadoc:aggregate
+%mvn_build
 
 %install
-# JAR
-mkdir -p $RPM_BUILD_ROOT%{_jnidir}
-mkdir -p $RPM_BUILD_ROOT%{_javadir}
+%mvn_install
 
-cp -p target/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-cp -p target/%{name}-%{version}-linux%{bits}.jar $RPM_BUILD_ROOT%{_jnidir}/%{name}-linux.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
-
-# DEPMAP
-%add_to_maven_depmap org.fusesource.jansi jansi-native %{version} JPP %{name}
-%add_to_maven_depmap org.fusesource.jansi jansi-native-linux%{bits} %{version} JPP %{name}-linux
-
-%files
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
-%{_jnidir}/*
-%{_javadir}/*
+%files -f .mfiles
+%dir %{_javadir}/%{name}
 %doc readme.md license.txt changelog.md
 
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
 %doc license.txt
 
 %changelog
+* Tue Aug 06 2013 Marek Goldmann <mgoldman@redhat.com> - 1.4-7
+- New guidelines
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild