[jboss-httpserver] New guidelines

[Marek Goldmann]

commit 69c9b18bf8628f777647f8c347b9fce5f5f9a42d
Author: Marek Goldmann <marek.goldmann at gmail.com>
Date:   Tue Jul 1 12:04:06 2014 +0200

    New guidelines

 jboss-httpserver.spec |   35 +++++++++++------------------------
 1 files changed, 11 insertions(+), 24 deletions(-)
---
diff --git a/jboss-httpserver.spec b/jboss-httpserver.spec
index 1bcc553..e2f0333 100644
--- a/jboss-httpserver.spec
+++ b/jboss-httpserver.spec
@@ -4,7 +4,7 @@
 
 Name:             jboss-%{realname}
 Version:          1.0.0
-Release:          8%{?dist}
+Release:          9%{?dist}
 Summary:          JBoss httpserver
 Group:            Development/Libraries
 License:          GPLv2 and GPLv2 with exceptions
@@ -16,7 +16,6 @@ Source0:          %{name}-%{namedversion}.tar.xz
 
 BuildArch:        noarch
 
-BuildRequires:    jpackage-utils
 BuildRequires:    java-devel
 BuildRequires:    maven-local
 BuildRequires:    maven-compiler-plugin
@@ -27,19 +26,16 @@ BuildRequires:    maven-release-plugin
 BuildRequires:    maven-resources-plugin
 BuildRequires:    maven-enforcer-plugin
 BuildRequires:    maven-surefire-plugin
-BuildRequires:    maven-surefire-provider-junit4
-BuildRequires:    junit4
+BuildRequires:    maven-surefire-provider-junit
+BuildRequires:    junit
 BuildRequires:    jboss-parent
 
-Requires:         jpackage-utils
-
 %description
 This package contains JBoss httpserver
 
 %package javadoc
 Summary:          Javadocs for %{name}
 Group:            Documentation
-Requires:         jpackage-utils
 
 %description javadoc
 This package contains the API documentation for %{name}.
@@ -48,29 +44,20 @@ This package contains the API documentation for %{name}.
 %setup -q -n %{name}-%{namedversion}
 
 %build
-mvn-rpmbuild install javadoc:aggregate
+%mvn_build
 
 %install
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -pm 644 target/%{realname}-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -rp target/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
+%mvn_install
 
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
+%files -f .mfiles
+%dir %{_javadir}/%{name}
 
-%files
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
-%{_javadir}/*
-
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
 
 %changelog
+* Tue Jul 01 2014 Marek Goldmann <mgoldman at redhat.com> - 1.0.0-9
+- New guidelines
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.0-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild