[jettison] Update to current packaging guidelines

[Mikolaj Izdebski]

commit e4de4d76e6d4d22358377dfdde561450ec8fd6f1
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Wed May 21 19:09:27 2014 +0200

    Update to current packaging guidelines

 jettison.spec |   70 +++++++++++++-------------------------------------------
 1 files changed, 17 insertions(+), 53 deletions(-)
---
diff --git a/jettison.spec b/jettison.spec
index 426e567..4d9d4a2 100644
--- a/jettison.spec
+++ b/jettison.spec
@@ -1,39 +1,26 @@
 Name:           jettison
 Version:        1.3.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A JSON StAX implementation
-Group:          Development/Libraries
 License:        ASL 2.0
 URL:            http://jettison.codehaus.org/
+BuildArch:      noarch
+
 # svn export http://svn.codehaus.org/jettison/tags/jettison-%{version} jettison-%{version}
 # rm -rf jettison-%{version}/trunk
 # tar cvJf jettison-%{version}.tar.xz jettison-%{version}
 Source0:        %{name}-%{version}.tar.xz
-BuildArch:      noarch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Change the POM to use the version of woodstox that we have available:
 Patch0: %{name}-update-woodstox-version.patch
 
-%if 0%{?rhel} <= 5
-BuildRequires:     java-devel
-Requires:          java
-%else
-BuildRequires:     java-devel >= 1:1.6.0
-Requires:          java-headless >= 1:1.6.0
-%endif
-BuildRequires:     jpackage-utils
-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:     woodstox-core
-BuildRequires:     stax2-api
-Requires:          jpackage-utils
-
+BuildRequires:  maven-local
+BuildRequires:  mvn(junit:junit)
+BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-release-plugin)
+BuildRequires:  mvn(org.codehaus:codehaus-parent:pom:)
+BuildRequires:  mvn(org.codehaus.woodstox:woodstox-core-asl)
+BuildRequires:  mvn(stax:stax-api)
 
 %description
 Jettison is a collection of Java APIs (like STaX and DOM) which read
@@ -41,17 +28,12 @@ and write JSON. This allows nearly transparent enablement of JSON based
 web services in services frameworks like CXF or XML serialization
 frameworks like XStream.
 
-
 %package javadoc
 Summary:           Javadocs for %{name}
-Group:             Documentation
-Requires:          %{name} = %{version}-%{release}
-Requires:          jpackage-utils
 
 %description javadoc
 This package contains the API documentation for %{name}.
 
-
 %prep
 %setup -q
 %patch0 -p1
@@ -60,39 +42,21 @@ This package contains the API documentation for %{name}.
 
 %build
 # Disable the tests until BZ#796739 is fixed:
-mvn-rpmbuild -Dproject.build.sourceEncoding=UTF-8 -Dmaven.test.skip=true install javadoc:aggregate
-
+%mvn_build -f
 
 %install
-# Jar files:
-install -d -m 755 %{buildroot}%{_javadir}
-cp -p target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
+%mvn_install
 
-# Javadoc files:
-install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
-cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/.
-
-# POM files:
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-cp -p pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-
-# Dependencies map:
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
-
-
-%files
+%files -f .mfiles
 %doc src/main/resources/META-INF/LICENSE
-%{_javadir}/%{name}.jar
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
 
-
-%files javadoc
+%files javadoc -f .mfiles-javadoc
 %doc src/main/resources/META-INF/LICENSE
-%{_javadocdir}/%{name}
-
 
 %changelog
+* Wed May 21 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.3.4-3
+- Update to current packaging guidelines
+
 * Tue Mar 04 2014 Stanislav Ochotnicky <sochotnicky at redhat.com> - 1.3.4-2
 - Use Requires: java-headless rebuild (#1067528)