[jettison] Re-doing the new patch with more care

Sandro Mathys red at fedoraproject.org
Tue Mar 6 13:16:02 UTC 2012


commit 707e92e1e14e87384fad92670df479a49b0c8bc0
Author: Sandro Mathys <red at fedoraproject.org>
Date:   Tue Mar 6 14:14:20 2012 +0100

    Re-doing the new patch with more care

 .gitignore    |    1 +
 jettison.spec |   13 ++++++-------
 sources       |    5 ++---
 3 files changed, 9 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1cde450..8dd3176 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /jettison-1.3.1-sources.jar
 /jettison-update-woodstox-version.patch
+/jettison-1.3.1.tar.bz2
diff --git a/jettison.spec b/jettison.spec
index fa9d50c..e01b8bc 100644
--- a/jettison.spec
+++ b/jettison.spec
@@ -5,7 +5,10 @@ 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
+# svn export http://svn.codehaus.org/jettison/tags/jettison-1.3.1 jettison-1.3.1
+# rm -rf jettison-1.3.1/trunk
+# tar cjvf jettison-1.3.1.tar.gz jettison-1.3.1
+Source0: %{name}-%{version}.tar.bz2
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -50,7 +53,7 @@ This package contains the API documentation for %{name}.
 
 
 %prep
-%setup -q -c
+%setup -q
 %patch0 -p1
 
 
@@ -80,16 +83,12 @@ cp -p pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
 
 %files
 %doc src/main/resources/META-INF/LICENSE
-%{_javadir}/%{name}-%{version}.jar
 %{_javadir}/%{name}.jar
-#{_mavenpomdir}/*
-#{_mavendepmapfragdir}/*
-#{_javadir}/*
+%{_mavenpomdir}/JPP-%{name}.pom
 
 
 %files javadoc
 %{_javadocdir}/%{name}
-%{_javadocdir}/%{name}-%{version}/*
 
 
 %changelog
diff --git a/sources b/sources
index 78031d7..94cee7d 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
-129cb7c442ae4a7db56ad57ea36bf26d  jettison-1.3.1-sources.jar
-d989ac1168c6fcdbcb2e1d0bc30f790a  jettison-update-woodstox-version.patch
-1860a01f67293b4fe92f730bbdfd07ac  jettison-update-woodstox-version.patch
+6d84922d4bf915a87a2049be6364ec93  jettison-1.3.1.tar.bz2
+ea3abe1584cdbe8c0467ae4baefe1025  jettison-update-woodstox-version.patch


More information about the scm-commits mailing list