[ws-jaxme] Guideline fixes.

[Alexander Kurtakov]

commit d1f712517140518d1fd57445c2488eca88d832fa
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Fri Apr 6 14:57:07 2012 +0300

    Guideline fixes.

 ws-jaxme.spec |   28 ++++++++--------------------
 1 files changed, 8 insertions(+), 20 deletions(-)
---
diff --git a/ws-jaxme.spec b/ws-jaxme.spec
index 1996c9f..c65c7c2 100644
--- a/ws-jaxme.spec
+++ b/ws-jaxme.spec
@@ -32,7 +32,7 @@
 
 Name:           ws-jaxme
 Version:        0.5.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch:          0
 Summary:        Open source implementation of JAXB
 
@@ -52,16 +52,13 @@ Patch4:         ws-jaxme-ant-scripts.patch
 Patch5:         ws-jaxme-use-commons-codec.patch
 # Remove xmldb-api, deprecated since f17
 Patch6:         ws-jaxme-remove-xmldb.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  jpackage-utils >= 0:1.6
 BuildRequires:	java-devel >= 1.6.0
 BuildRequires:  ant >= 0:1.6
 BuildRequires:  ant-apache-resolver
-BuildRequires:  ant-nodeps >= 0:1.6
 BuildRequires:  antlr
-BuildRequires:  jaxp_transform_impl
-BuildRequires:  jakarta-commons-codec
+BuildRequires:  apache-commons-codec
 BuildRequires:  junit
 BuildRequires:  hsqldb
 BuildRequires:  log4j
@@ -73,8 +70,7 @@ BuildRequires:	docbook-style-xsl
 BuildRequires:  docbook-dtds
 BuildRequires:  zip
 Requires:       antlr
-Requires:       jaxp_transform_impl
-Requires:       jakarta-commons-codec
+Requires:       apache-commons-codec
 Requires:       junit
 Requires:       hsqldb
 Requires:       log4j
@@ -82,7 +78,6 @@ Requires:       xalan-j2
 Requires:       xerces-j2
 Requires:       xml-commons-apis
 Requires:       jpackage-utils
-Requires(postun): jpackage-utils
 
 %description
 A Java/XML binding compiler takes as input a schema 
@@ -131,7 +126,6 @@ DOCBOOKX_DTD=`%{_bindir}/xmlcatalog %{_datadir}/sgml/docbook/xmlcatalog "-//OASI
 %patch6 -p1
 
 %build
-export OPT_JAR_LIST="xalan-j2 ant/ant-nodeps xalan-j2-serializer xml-commons-resolver ant/ant-apache-resolver"
 export CLASSPATH=$(build-classpath antlr hsqldb commons-codec junit log4j xerces-j2 xml-commons-jaxp-1.3-apis)
 ant all Docs.all \
 -Dbuild.sysclasspath=first \
@@ -144,7 +138,6 @@ touch META-INF/MANIFEST.MF
 zip -u dist/jaxmeapi-%{version}.jar META-INF/MANIFEST.MF
 
 %install
-rm -rf $RPM_BUILD_ROOT
 install -dm 755 $RPM_BUILD_ROOT%{_javadir}/%{base_name}
 for jar in dist/*.jar; do
    install -m 644 ${jar} $RPM_BUILD_ROOT%{_javadir}/%{base_name}/
@@ -162,10 +155,9 @@ done
 )
 
 #javadoc
-install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 cp -pr build/docs/src/documentation/content/apidocs \
-    $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+    $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 rm -rf build/docs/src/documentation/content/apidocs
 
 #manual
@@ -173,24 +165,20 @@ install -dm 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 cp -pr build/docs/src/documentation/content/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 install -pm 644 LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
-%defattr(-,root,root,-)
 %doc %{_docdir}/%{name}-%{version}/LICENSE
 %{_javadir}/%{base_name}
 
 %files javadoc
-%defattr(-,root,root,-)
-%doc %{_javadocdir}/%{name}-%{version}
 %doc %{_javadocdir}/%{name}
 
 %files manual
-%defattr(-,root,root,-)
 %doc %{_docdir}/%{name}-%{version}
 
 %changelog
+* Fri Apr 6 2012 Alexander Kurtakov <akurtako at redhat.com> 0:0.5.2-2
+- Guideline fixes.
+
 * Wed Feb 8 2012 Roland Grunberg <rgrunber at redhat.com> 0:0.5.2-1
 - Update to 0.5.2.
 - Remove xmldb-api due to deprecation.