[httpunit] Adopt to current guidelines.

[Alexander Kurtakov]

commit f8e149d0b6e458d4ff9f52923cb9aeef271adb1b
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Mon Mar 7 11:36:53 2011 +0200

    Adopt to current guidelines.
    
    Fix various rpmlint errors/warnings

 httpunit.build.patch |   43 -------------------------------------------
 httpunit.spec        |   28 ++++++++++------------------
 2 files changed, 10 insertions(+), 61 deletions(-)
---
diff --git a/httpunit.spec b/httpunit.spec
index bd0372e..09e8adf 100644
--- a/httpunit.spec
+++ b/httpunit.spec
@@ -30,12 +30,11 @@
 
 Name:           httpunit
 Version:        1.7
-Release:        3%{?dist}
+Release:        4%{?dist}
 Epoch:          0
 Summary:        Automated web site testing toolkit
 License:        MIT
 Source0:        http://download.sourceforge.net/httpunit/httpunit-%{version}.zip
-Patch0:         %{name}.build.patch
 Patch1:         %{name}-JavaScript-NotAFunctionException.patch
 Patch2:         %{name}-servlettest.patch
 URL:            http://httpunit.sourceforge.net/
@@ -52,13 +51,11 @@ BuildRequires:  java-devel >= 1:1.6.0
 Requires:       junit >= 0:3.8
 Requires:       jpackage-utils
 Requires:       servlet
-Requires:       jaxp_parser_impl
 # As of 1.5, requires either nekohtml or jtidy, and prefers nekohtml.
 Requires:       nekohtml
 Requires:       rhino
 Group:          Development/Tools
 BuildArch:      noarch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes:      %{name}-demo < %{epoch}:%{version}
 
 %description
@@ -70,14 +67,14 @@ A companion framework, ServletUnit is included in the package.
 
 %package        javadoc
 Summary:        Javadoc for %{name}
-Group:          Development/Documentation
+Group:          Documentation
 
 %description    javadoc
 Javadoc for %{name}
 
 %package        doc
 Summary:        Documentation for %{name}
-Group:          Development/Documentation
+Group:          Documentation
 Requires:       %{name}-javadoc
 
 %description    doc
@@ -86,12 +83,12 @@ Documentation for %{name}
 %prep
 %setup -q
 # to create the test and examples jar
-#%patch0 -p0
+#%%patch0 -p0
 # patch to work with rhino 1.5
 %patch1 -b .sav
 # add META-INF
 %patch2
-#%{__unzip} -qd META-INF lib/httpunit.jar "*.dtd" # 1.6 dist zip is borked
+#%%{__unzip} -qd META-INF lib/httpunit.jar "*.dtd" # 1.6 dist zip is borked
 # remove all binary libs and javadocs
 
 sed -i -e 's|setCharEncoding( org.w3c.tidy.Configuration.UTF8 )|setInputEncoding("UTF-8")|g' src/com/meterware/httpunit/parsing/JTidyHTMLParser.java
@@ -113,14 +110,8 @@ ant -Dbuild.compiler=modern -Dbuild.sysclasspath=last \
   jar javadocs test servlettest 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 mkdir -p $RPM_BUILD_ROOT%{_javadir}
-cp -p lib/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-
-# Jar versioning
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; \
- do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+cp -p lib/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 
 # Javadoc
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
@@ -134,9 +125,6 @@ pushd doc
 ln -sf %{_javadocdir}/%{name}-%{version} api
 popd
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
 %defattr(-,root,root,-)
 %{_javadir}/*
@@ -150,6 +138,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc doc/*
 
 %changelog
+* Mon Mar 7 2011 Alexander Kurtakov <akurtako at redhat.com> 0:1.7-4
+- Adopt to current guidelines.
+- Fix various rpmlint errors/warnings.
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.7-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild