[java-sig-commits] [decentxml] Update to 1.4 upstream release.

[Alexander Kurtakov]

commit 11a8ced98bdac2da279bdc3ef84e1fcb632c7ef2
Author: Alexander Kurtakov < <akurtako at redhat.com>
Date:   Wed Feb 1 22:55:21 2012 +0200

    Update to 1.4 upstream release.

 .gitignore     |    1 +
 decentxml.spec |   28 ++++++++--------------------
 sources        |    2 +-
 3 files changed, 10 insertions(+), 21 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b06b3c5..93cce44 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /decentxml-1.3.tar.xz
 /xmlts20031210.zip
+decentxml-1.4-src.zip
diff --git a/decentxml.spec b/decentxml.spec
index ce3d87e..1dd0004 100644
--- a/decentxml.spec
+++ b/decentxml.spec
@@ -1,14 +1,11 @@
 Name:             decentxml
-Version:          1.3
-Release:          2%{?dist}
+Version:          1.4
+Release:          1%{?dist}
 Summary:          XML parser optimized for round-tripping and code reuse
 License:          BSD
 Group:            Development/Libraries
 URL:              http://code.google.com/p/%{name}
-# request for tarball: https://code.google.com/p/decentxml/issues/detail?id=1
-# svn export http://decentxml.googlecode.com/svn/tags/r1.3 decentxml-1.3
-# tar caf decentxml-1.3.tar.xz decentxml-1.3
-Source0:          %{name}-%{version}.tar.xz
+Source0:          https://decentxml.googlecode.com/files/decentxml-1.4-src.zip
 # for running w3c conformance test suite
 Source1:          http://www.w3.org/XML/Test/xmlts20031210.zip
 BuildArch:        noarch
@@ -21,8 +18,6 @@ BuildRequires:    apache-commons-parent
 
 Requires:         java
 Requires:         jpackage-utils
-Requires(post):   jpackage-utils
-Requires(postun): jpackage-utils
 
 %description
 XML parser optimized for round-tripping and code reuse with main
@@ -50,8 +45,7 @@ This package contains the API documentation for %{name}.
 # here and symlink there
 unzip %{SOURCE1}
 ln -sf %{name}-%{version}/xmlconf ../xmlconf
-
-sed -i 's:\r::g' TODO CHANGES
+sed -i -e "s|junit-dep|junit|g" pom.xml
 
 %build
 mvn-rpmbuild install
@@ -70,28 +64,22 @@ install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
 install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
 cp -pr target/apidocs/* %{buildroot}%{_javadocdir}/%{name}
 
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
 %files
-%defattr(-,root,root,-)
-%doc LICENSE TODO CHANGES
+%doc LICENSE README
 %{_javadir}/%{name}.jar
 %{_mavenpomdir}/JPP-%{name}.pom
 %{_mavendepmapfragdir}/%{name}
 
 %files javadoc
-%defattr(-,root,root,-)
 %doc LICENSE
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Wed Feb 1 2012 Alexander Kurtakov <akurtako at redhat.com> 1.4-1
+- Update to 1.4 upstream release.
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
 * Fri Feb 25 2011 Stanislav Ochotnicky <sochotnicky at redhat.com> - 1.3-1
 - Initial version of the package
-
diff --git a/sources b/sources
index d287e03..88093fd 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-3e8f717d8b717fa7c66dda4238853e53  decentxml-1.3.tar.xz
 b09f340780c6ff995bf6ff81ad341585  xmlts20031210.zip
+bdfa12918451f34d83b409148a17a599  decentxml-1.4-src.zip