[jettison] Added patch

[Sandro Mathys]

commit 826bb475f738846c65250945fbcca210e44ada60
Author: Sandro Mathys <red at fedoraproject.org>
Date:   Thu Mar 1 15:40:07 2012 +0100

    Added patch

 .gitignore    |    1 +
 jettison.spec |   90 ++++++++++++++++++++++++++++-----------------------------
 sources       |    1 +
 3 files changed, 46 insertions(+), 46 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2eb81aa..1cde450 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /jettison-1.3.1-sources.jar
+/jettison-update-woodstox-version.patch
diff --git a/jettison.spec b/jettison.spec
index 19e7a51..fa9d50c 100644
--- a/jettison.spec
+++ b/jettison.spec
@@ -1,35 +1,35 @@
-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
+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/
+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)
 
 # 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
+%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
+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
 
 
 %description
@@ -40,31 +40,26 @@ frameworks like XStream.
 
 
 %package javadoc
-Summary: Javadocs for %{name}
-Group: Documentation
-Requires: jpackage-utils
-
+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
+%setup -q -c
 %patch0 -p1
 
-%build
 
+%build
 # Disable the tests until BZ#796739 is fixed:
-mvn-rpmbuild \
-  -Dproject.build.sourceEncoding=UTF-8 \
-  -Dmaven.test.skip=true \
-  install \
-  javadoc:aggregate
+mvn-rpmbuild -Dproject.build.sourceEncoding=UTF-8 -Dmaven.test.skip=true install javadoc:aggregate
 
 
 %install
-
 # Jar files:
 install -d -m 755 %{buildroot}%{_javadir}
 cp -p target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
@@ -77,25 +72,29 @@ cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/.
 install -d -m 755 %{buildroot}%{_mavenpomdir}
 cp -p pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
 
+
+%clean
 # Dependencies map:
 %add_maven_depmap JPP-%{name}.pom %{name}.jar
 
 
 %files
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
-%{_javadir}/*
 %doc src/main/resources/META-INF/LICENSE
+%{_javadir}/%{name}-%{version}.jar
+%{_javadir}/%{name}.jar
+#{_mavenpomdir}/*
+#{_mavendepmapfragdir}/*
+#{_javadir}/*
 
 
 %files javadoc
 %{_javadocdir}/%{name}
-%doc src/main/resources/META-INF/LICENSE
+%{_javadocdir}/%{name}-%{version}/*
 
 
 %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
+- Use 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
@@ -117,4 +116,3 @@ cp -p pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
 
 * Sun Jun 28 2009 Sandro Mathys <red at fedoraproject.org> - 1.1-1
 - initial build
-
diff --git a/sources b/sources
index 100f0a3..f46a696 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 129cb7c442ae4a7db56ad57ea36bf26d  jettison-1.3.1-sources.jar
+d989ac1168c6fcdbcb2e1d0bc30f790a  jettison-update-woodstox-version.patch