diff --git a/.gitignore b/.gitignore index 941c332..01e50dc 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /stax-ex-1.7.tar.gz +/stax-ex-1.7.1.tar.gz diff --git a/sources b/sources index a62471b..c5b221b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -eadf0c40de992283c99e8b20789d0de3 stax-ex-1.7.tar.gz +78633ebac7bc304fed7e351eb70b4779 stax-ex-1.7.1.tar.gz diff --git a/stax-ex-pom.patch b/stax-ex-pom.patch deleted file mode 100644 index 74b8661..0000000 --- a/stax-ex-pom.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/pom.xml b/pom.xml -index 0b19a91..f94f916 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -41,12 +41,6 @@ - --> - - -- -- net.java -- jvnet-parent -- 1 -- -- - 4.0.0 - org.jvnet.staxex - stax-ex -@@ -89,11 +83,6 @@ - 1.0-2 - - -- javax.activation -- activation -- 1.1 -- -- - junit - junit - 3.8 diff --git a/stax-ex.spec b/stax-ex.spec index d586d64..674a04f 100644 --- a/stax-ex.spec +++ b/stax-ex.spec @@ -1,24 +1,23 @@ Name: stax-ex -Version: 1.7 -Release: 2%{?dist} +Version: 1.7.1 +Release: 1%{?dist} Summary: StAX API extensions Group: Development/Libraries License: CDDL or GPLv2 Url: https://stax-ex.dev.java.net -# svn export https://svn.java.net/svn/stax-ex~svn/tags/stax-ex-1.7 stax-ex-1.7 -# find stax-ex-1.7/ -name '*.jar' -delete -# tar czf stax-ex-1.7.tar.gz stax-ex-1.7 +# svn export https://svn.java.net/svn/stax-ex~svn/tags/stax-ex-1.7.1 stax-ex-1.7.1 +# find stax-ex-1.7.1/ -name '*.jar' -delete +# tar czf stax-ex-1.7.1.tar.gz stax-ex-1.7.1 Source0: %{name}-%{version}.tar.gz -Patch0: %{name}-pom.patch - BuildRequires: bea-stax -BuildRequires: maven +BuildRequires: dos2unix BuildRequires: java-devel -BuildRequires: junit BuildRequires: jpackage-utils -BuildRequires: dos2unix +BuildRequires: junit +BuildRequires: jvnet-parent +BuildRequires: maven Requires: bea-stax Requires: jpackage-utils @@ -49,7 +48,7 @@ This package contains javadoc for %{name}. %prep %setup -q -%patch0 -p1 +%pom_remove_dep javax.activation:activation # Convert the license to UTF-8: mv LICENSE.txt LICENSE.txt.tmp @@ -95,6 +94,9 @@ cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name} %changelog +* Tue Aug 28 2012 gil cattaneo 1.7.1-1 +- Updated to upstream version 1.7.1 + * Sat Jul 21 2012 Fedora Release Engineering - 1.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild