[bea-stax] update to 1.2.0 + addition of depmap & pom files

[Jaromír Cápík]

commit b103e9d87a6ede635a0b09396eff47d0c89555b9
Author: Jaromir Capik <jcapik at redhat.com>
Date:   Thu Sep 29 15:31:59 2011 +0200

    update to 1.2.0 + addition of depmap & pom files

 .gitignore    |    3 ++
 bea-stax.spec |   78 ++++++++++++++++++++++++++++++--------------------------
 sources       |    4 ++-
 3 files changed, 48 insertions(+), 37 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 29ad469..02247a3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,4 @@
 stax-src-1.2.0_rc1-dev.zip
+/stax-1.2.0.pom
+/stax-api-1.0.1.pom
+/stax-src-1.2.0.zip
diff --git a/bea-stax.spec b/bea-stax.spec
index 3baa677..e9eea7e 100644
--- a/bea-stax.spec
+++ b/bea-stax.spec
@@ -28,40 +28,41 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
+%global mainver 1.2.0
+%global apiver  1.0.1
+
 Summary:        Streaming API for XML
-URL:            http://dev2dev.bea.com/technologies/stax/index.jsp
-Source0:        http://dist.codehaus.org/stax/distributions/stax-src-1.2.0_rc1-dev.zip
+URL:            http://stax.codehaus.org/Home
+Source0:        http://dist.codehaus.org/stax/distributions/stax-src-1.2.0.zip
+Source1:        http://dist.codehaus.org/stax/jars/stax-1.2.0.pom
+Source2:        http://dist.codehaus.org/stax/jars/stax-api-1.0.1.pom
 # XXX: 
-# since libgcj already includes classes in javax.xml.stream.events.* which 
-# are not api compliant with those in the api jar, the build fails in gcj 
+# since libgcj already includes classes in javax.xml.stream.events.* which
+# are not api compliant with those in the api jar, the build fails in gcj
 # unless added to bootclasspath
 Patch0:         %{name}-ecj-bootclasspath.patch
 Name:           bea-stax
-Version:        1.2.0
-Release:        0.8.rc1%{?dist}
-Epoch:          0
+Version:        %{mainver}
+Release:        1%{?dist}
 License:        ASL 2.0
 Group:          Development/Libraries/Java
 BuildArch:      noarch
 
-BuildRequires:          jpackage-utils >= 0:1.6
+BuildRequires:          jpackage-utils
 BuildRequires:          ant
 BuildRequires:          xerces-j2,xalan-j2
-BuildRequires:          java-devel >= 1:1.6.0
-Requires:               jpackage-utils >= 0:1.6
-Requires:       %{name}-api = %{epoch}:%{version}-%{release}
-
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:          java-devel
+Requires:               jpackage-utils
 
 %description
-The Streaming API for XML (StAX) is a groundbreaking 
-new Java API for parsing and writing XML easily and 
-efficiently. 
+The Streaming API for XML (StAX) is a groundbreaking
+new Java API for parsing and writing XML easily and
+efficiently.
 
 %package api
 Summary:        The StAX API
 Group:          Development/Documentation
-Requires:               jpackage-utils >= 0:1.6
+Requires:       jpackage-utils
 
 %description api
 %{summary}
@@ -69,53 +70,58 @@ Requires:               jpackage-utils >= 0:1.6
 %package javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
-Requires:               jpackage-utils >= 0:1.6
+Requires:       jpackage-utils
 
 %description javadoc
 %{summary}
 
 %prep
 %setup -q -c -n %{name}-%{version}
+
+# Convert CR+LF to LF
 %{__sed} -i 's/\r//' ASF2.0.txt
 
 %build
-export CLASSPATH=`pwd`/build/stax-api-1.0.jar
+export CLASSPATH=`pwd`/build/stax-api-%{apiver}.jar
 ant all javadoc
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 # jar
-install -d -m 0755 $RPM_BUILD_ROOT%{_javadir}
-install -p -m 0644 build/stax-api-1.0.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-api-%{version}.jar
-install -p -m 0644 build/stax-1.2.0_rc1-dev.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-ri-%{version}.jar
-ln -s %{name}-api-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-api.jar
-ln -s %{name}-ri-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-ri.jar
+install -Dpm 0644 build/stax-api-%{apiver}.jar %{buildroot}%{_javadir}/%{name}-api.jar
+install -Dpm 0644 build/stax-%{version}-dev.jar %{buildroot}%{_javadir}/%{name}.jar
 
 # javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -pr build/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr build/javadoc/* %{buildroot}%{_javadocdir}/%{name}
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+# pom
+install -Dpm 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+install -Dpm 644 %{SOURCE2} %{buildroot}%{_mavenpomdir}/JPP-%{name}-api.pom
+
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
+%add_maven_depmap -f api -a "javax.xml.stream:stax-api" JPP-%{name}-api.pom %{name}-api.jar
 
 %files
-%defattr(-,root,root,-)
 %doc ASF2.0.txt
-%{_javadir}/%{name}-ri-%{version}.jar
-%{_javadir}/%{name}-ri.jar
+%{_javadir}/%{name}.jar
+%{_mavenpomdir}/JPP-%{name}.pom
+%{_mavendepmapfragdir}/%{name}
 
 %files api
-%defattr(-,root,root,-)
 %doc ASF2.0.txt
-%{_javadir}/%{name}-api-%{version}.jar
 %{_javadir}/%{name}-api.jar
+%{_mavenpomdir}/JPP-%{name}-api.pom
+%{_mavendepmapfragdir}/%{name}-api
 
 %files javadoc
-%defattr(0644,root,root,0755)
+%doc ASF2.0.txt
 %doc %{_javadocdir}/*
 
 %changelog
+* Thu Sep 29 2011 Jaromir Capik <jcapik at redhat.com> - 1.2.0-1
+- Update to 1.2.0
+- Introduction of POM files and depmaps
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.2.0-0.8.rc1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index c0b4d70..d7284eb 100644
--- a/sources
+++ b/sources
@@ -1 +1,3 @@
-e12dab65656f4f9df420e562cc00a776  stax-src-1.2.0_rc1-dev.zip
+2a869dca4ef00ccae8edbf8ba99e71ab  stax-1.2.0.pom
+13c75570be77eaf09cd6ef0ae59d812a  stax-api-1.0.1.pom
+980143f96b3f6ce45d2e4947da21a5e9  stax-src-1.2.0.zip