[jboss-jacc-1.4-api] Fix FTBFS (Resolves: rhbz#1106872)

[Michal Srb]

commit f4b84282bcfb663c76f4dac7a05a499c77b4398f
Author: Michal Srb <msrb at redhat.com>
Date:   Thu Feb 19 08:57:35 2015 +0100

    Fix FTBFS (Resolves: rhbz#1106872)
    
    - Adapt to current packaging guidelines

 jboss-jacc-1.4-api.spec |   74 ++++++++++++++++------------------------------
 1 files changed, 26 insertions(+), 48 deletions(-)
---
diff --git a/jboss-jacc-1.4-api.spec b/jboss-jacc-1.4-api.spec
index f957bf8..bc4a3de 100644
--- a/jboss-jacc-1.4-api.spec
+++ b/jboss-jacc-1.4-api.spec
@@ -1,42 +1,32 @@
 %global namedreltag .Final
 %global namedversion %{version}%{?namedreltag}
 
-Name:             jboss-jacc-1.4-api
-Version:          1.0.2
-Release:          8%{dist}
-Summary:          JBoss JACC 1.4 API
-Group:            Development/Libraries
-License:          CDDL or GPLv2 with exceptions
-URL:              http://www.jboss.org
+Name:           jboss-jacc-1.4-api
+Version:        1.0.2
+Release:        9%{dist}
+Summary:        JBoss JACC 1.4 API
+License:        CDDL or GPLv2 with exceptions
+URL:            http://www.jboss.org
 
 # git clone git://github.com/jboss/jboss-jacc-api_spec.git jboss-jacc-1.4-api
 # cd jboss-jacc-1.4-api/ && git archive --format=tar --prefix=jboss-jacc-1.4-api/ jboss-jacc-api_1.4_spec-1.0.2.Final | xz > jboss-jacc-1.4-api-1.0.2.Final.tar.xz
 
-Source0:          %{name}-%{namedversion}.tar.xz
+Source0:        %{name}-%{namedversion}.tar.xz
 
-BuildRequires:    java-devel
-BuildRequires:    jboss-servlet-3.0-api
-BuildRequires:    jpackage-utils
-BuildRequires:    maven-local
-BuildRequires:    maven-compiler-plugin
-BuildRequires:    maven-enforcer-plugin
-BuildRequires:    maven-install-plugin
-BuildRequires:    maven-jar-plugin
-BuildRequires:    maven-javadoc-plugin
-BuildRequires:    maven-surefire-provider-junit4
+BuildRequires:  maven-local
+BuildRequires:  mvn(junit:junit)
+BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-source-plugin)
+BuildRequires:  mvn(org.jboss:jboss-parent:pom:)
+BuildRequires:  mvn(org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec)
 
-Requires:         jpackage-utils
-Requires:         jboss-servlet-3.0-api
-
-BuildArch:        noarch
+BuildArch:      noarch
 
 %description
-JBoss Java Authorization Contract for Containers 1.4 API
+JBoss Java Authorization Contract for Containers 1.4 API.
 
 %package javadoc
-Summary:          Javadocs for %{name}
-Group:            Documentation
-Requires:         jpackage-utils
+Summary:        Javadocs for %{name}
 
 %description javadoc
 This package contains the API documentation for %{name}.
@@ -44,37 +34,25 @@ This package contains the API documentation for %{name}.
 %prep
 %setup -q -n %{name}
 
+%mvn_file : %{name}/%{name} %{name}
+
 %build
-mvn-rpmbuild install javadoc:aggregate
+%mvn_build
 
 %install
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-# JAR
-install -pm 644 target/jboss-jacc-api_1.4_spec-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-
-# POM
-install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
+%mvn_install
 
-# DEPMAP
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
-
-# APIDOCS
-cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-%files
-%{_javadir}/%{name}.jar
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
+%files -f .mfiles
 %doc README LICENSE
 
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
 %doc LICENSE README
 
 %changelog
+* Thu Feb 19 2015 Michal Srb <msrb at redhat.com> - 1.0.2-9
+- Fix FTBFS (Resolves: rhbz#1106872)
+- Adapt to current packaging guidelines
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.2-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild