[jettison] Fix rhbz#796831

[Sandro Mathys]

commit 5bdfa423fe62c01405904fc74825b0f7b6b35646
Author: Sandro Mathys <red at fedoraproject.org>
Date:   Thu Mar 1 10:51:07 2012 +0100

    Fix rhbz#796831

 jettison.spec |  119 +++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 70 insertions(+), 49 deletions(-)
---
diff --git a/jettison.spec b/jettison.spec
index e8f98cd..19e7a51 100644
--- a/jettison.spec
+++ b/jettison.spec
@@ -1,23 +1,36 @@
-Name:           jettison
-Version:        1.3.1
-Release:        2%{?dist}
-Summary:        A JSON StAX implementation
-Group:          Development/Libraries
-License:        ASL 2.0
-URL:            http://jettison.codehaus.org/
-Source0:        http://repo1.maven.org/maven2/org/codehaus/%{name}/%{name}/%{version}/%{name}-%{version}-sources.jar
-BuildArch:      noarch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-%if 0%{?rhel} <= 5
-BuildRequires:     java-devel
-Requires:          java
-%else
-BuildRequires:     java-devel >= 1:1.6.0
-Requires:          java >= 1:1.6.0
-%endif
-BuildRequires:     jpackage-utils
-Requires:          jpackage-utils
+Name: jettison
+Version: 1.3.1
+Release: 3%{?dist}
+Summary: A JSON StAX Implementation
+Group: Development/Libraries
+License: ASL 2.0
+URL: http://jettison.codehaus.org
+
+# svn export http://svn.codehaus.org/jettison/tags/jettison-1.3.1 jettison-1.3.1
+# rm -rf jettison-1.3.1/trunk
+# tar cvfz jettison-1.3.1.tar.gz jettison-1.3.1
+Source0: %{name}-%{version}.tar.gz
+
+# Change the POM to use the version of woodstox that we have available:
+Patch0: %{name}-update-woodstox-version.patch
+
+BuildArch: noarch
+
+BuildRequires: jpackage-utils
+BuildRequires: java-devel
+BuildRequires: maven
+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
+Requires: java
+
 
 %description
 Jettison is a collection of Java APIs (like STaX and DOM) which read
@@ -27,56 +40,63 @@ frameworks like XStream.
 
 
 %package javadoc
-Summary:           Javadocs for jettison
-Group:             Documentation
-Requires:          %{name} = %{version}-%{release}
-Requires:          jpackage-utils
+Summary: Javadocs for %{name}
+Group: Documentation
+Requires: jpackage-utils
+
 
 %description javadoc
-jettison development documentation.
+This package contains the API documentation for %{name}.
 
 
 %prep
-%setup -q -c
-mkdir target doc
-
+%setup -q
+%patch0 -p1
 
 %build
-javac -d target `find -name '*.java'`
-jar -cf %{name}-%{version}.jar -C target .
-javadoc -author -version -public -d doc `find . -name '*.java'`
+
+# Disable the tests until BZ#796739 is fixed:
+mvn-rpmbuild \
+  -Dproject.build.sourceEncoding=UTF-8 \
+  -Dmaven.test.skip=true \
+  install \
+  javadoc:aggregate
+
 
 %install
-rm -rf $RPM_BUILD_ROOT
 
-# jar
-install -d $RPM_BUILD_ROOT%{_javadir}
-install -m644 %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+# Jar files:
+install -d -m 755 %{buildroot}%{_javadir}
+cp -p target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
 
-# javadoc
-install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -rp doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+# Javadoc files:
+install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
+cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/.
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+# 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
-%defattr(-,root,root,-)
-%doc META-INF/LICENSE
-%{_javadir}/%{name}-%{version}.jar
-%{_javadir}/%{name}.jar
+%{_mavenpomdir}/*
+%{_mavendepmapfragdir}/*
+%{_javadir}/*
+%doc src/main/resources/META-INF/LICENSE
+
 
 %files javadoc
-%defattr(-,root,root,-)
-%dir %{_javadocdir}/%{name}-%{version}
 %{_javadocdir}/%{name}
-%{_javadocdir}/%{name}-%{version}/*
+%doc src/main/resources/META-INF/LICENSE
 
 
 %changelog
+* Thu Feb 23 2012 Juan Hernandez <juan.hernandez at redhat.com> - 1.3.1-3
+- Uset maven to build and add the POM to the package
+
 * Sun Jan 15 2012 Sandro Mathys <red at fedoraproject.org> - 1.3.1-2
 - Drop the requirement for java* >= 1.6.0 for EL <= 5
 
@@ -97,3 +117,4 @@ rm -rf $RPM_BUILD_ROOT
 
 * Sun Jun 28 2009 Sandro Mathys <red at fedoraproject.org> - 1.1-1
 - initial build
+