[xml-commons-resolver] - Add missing zip BR. - Remove perl and dos2unix usage. - Fix license - ASL 2.0 now.

[Alexander Kurtakov]

commit e0d639696e1a3545fb7595b532b50429680a9b50
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Wed Nov 3 22:14:05 2010 +0200

    - Add missing zip BR.
    - Remove perl and dos2unix usage.
    - Fix license - ASL 2.0 now.

 xml-commons-resolver.spec |   53 +++++++++++++++-----------------------------
 1 files changed, 18 insertions(+), 35 deletions(-)
---
diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec
index e5e78ce..89fda55 100644
--- a/xml-commons-resolver.spec
+++ b/xml-commons-resolver.spec
@@ -1,9 +1,9 @@
 Name:           xml-commons-resolver
 Version:        1.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Epoch:          0
 Summary:        Resolver subproject of xml-commons
-License:        ASL 1.1
+License:        ASL 2.0
 URL:            http://xml.apache.org/commons/
 Source0:        http://www.apache.org/dist/xml/commons/xml-commons-resolver-%{version}.tar.gz
 Source1:        xml-commons-resolver-resolver.sh
@@ -19,9 +19,7 @@ Requires(postun): jpackage-utils
 BuildRequires:  java-devel >= 1:1.6.0
 BuildRequires:  ant
 BuildRequires:  jpackage-utils
-BuildRequires:  dos2unix
-#BuildRequires:  %{_bindir}/xsltproc
-#BuildRequires:  docbook-style-xsl
+BuildRequires:  zip
 Group:          Development/Libraries
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
@@ -33,9 +31,6 @@ Resolver subproject of xml-commons.
 Summary:        Javadoc for %{name}
 Group:          Documentation
 Requires:       jpackage-utils
-# for /bin/rm and /bin/ln
-Requires(post):   coreutils
-Requires(postun): coreutils
 
 %description javadoc
 Javadoc for %{name}.
@@ -46,21 +41,13 @@ Javadoc for %{name}.
 # remove all binary libs and prebuilt javadocs
 find . -name "*.jar" -exec rm -f {} \;
 rm -rf docs
-dos2unix KEYS LICENSE.resolver.txt
+sed -i 's/\r//' KEYS LICENSE.resolver.txt
 
 %build
-perl -p -i -e 's|call Resolver|call resolver|g' resolver.xml
-perl -p -i -e 's|classname="org.apache.xml.resolver.Catalog"|fork="yes" classname="org.apache.xml.resolver.apps.resolver"|g' resolver.xml
-perl -p -i -e 's|org.apache.xml.resolver.Catalog|org.apache.xml.resolver.apps.resolver|g' src/manifest.resolver
-#DOCBOOK_XSL=`rpm -ql docbook-style-xsl | grep /html/docbook.xsl \
-#| sed 's#html/docbook.xsl##'`
-#
-#if [ -z $DOCBOOK_XSL ]; then
-#  echo "Unable to find docbook xsl directory"
-#  exit 1
-#fi
-
-#ant -Ddocbook.dir=$DOCBOOK_XSL -f resolver.xml main
+sed -i -e 's|call Resolver|call resolver|g' resolver.xml
+sed -i -e 's|classname="org.apache.xml.resolver.Catalog"|fork="yes" classname="org.apache.xml.resolver.apps.resolver"|g' resolver.xml
+sed -i -e 's|org.apache.xml.resolver.Catalog|org.apache.xml.resolver.apps.resolver|g' src/manifest.resolver
+
 ant -f resolver.xml jar javadocs
 
 %install
@@ -80,8 +67,8 @@ ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/xml-resolver-%{version}.
 (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
 
 # Javadocs
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr build/apidocs/resolver/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr build/apidocs/resolver/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 # Scripts
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
@@ -102,17 +89,8 @@ rm -rf $RPM_BUILD_ROOT
 %postun
 %update_maven_depmap
 
-%post javadoc
-rm -f %{_javadocdir}/%{name}
-ln -s %{name}-%{version} %{_javadocdir}/%{name}
-
-%postun javadoc
-if [ "$1" = "0" ]; then
-    rm -f %{_javadocdir}/%{name}
-fi
-
 %files
-%defattr(0644,root,root,0755)
+%defattr(-,root,root,-)
 %doc KEYS LICENSE.resolver.txt
 %{_mavendepmapfragdir}/*
 %{_mavenpomdir}/*
@@ -120,10 +98,15 @@ fi
 %attr(0755,root,root) %{_bindir}/*
 
 %files javadoc
-%defattr(0644,root,root,0755)
-%{_javadocdir}/%{name}-%{version}
+%defattr(-,root,root,-)
+%{_javadocdir}/%{name}
 
 %changelog
+* Wed Nov 3 2010 Alexander Kurtakov <akurtako at redhat.com> 0:1.2-5
+- Add missing zip BR.
+- Remove perl and dos2unix usage.
+- Fix license - ASL 2.0 now.
+
 * Fri Sep 24 2010 Mat Booth <fedora at matbooth.co.uk> 0:1.2-4
 - Forgot to actually install a jar with a name that maven users expect.