[httpunit] Fix build.

Alexander Kurtakov akurtakov at fedoraproject.org
Tue Dec 6 13:16:18 UTC 2011


commit 896a70e7e9ad945b9cd339cdd5aa68e67939f98b
Author: Alexander Kurtakov < <akurtako at redhat.com>
Date:   Tue Dec 6 15:15:55 2011 +0200

    Fix build.
    
    - Adapt to current guidelines.

 httpunit.spec |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/httpunit.spec b/httpunit.spec
index 09e8adf..c6eb5bd 100644
--- a/httpunit.spec
+++ b/httpunit.spec
@@ -30,7 +30,7 @@
 
 Name:           httpunit
 Version:        1.7
-Release:        4%{?dist}
+Release:        5%{?dist}
 Epoch:          0
 Summary:        Automated web site testing toolkit
 License:        MIT
@@ -91,6 +91,8 @@ Documentation for %{name}
 #%%{__unzip} -qd META-INF lib/httpunit.jar "*.dtd" # 1.6 dist zip is borked
 # remove all binary libs and javadocs
 
+sed -i -e 's|destdir|encoding="iso-8859-1" destdir|g' build.xml
+
 sed -i -e 's|setCharEncoding( org.w3c.tidy.Configuration.UTF8 )|setInputEncoding("UTF-8")|g' src/com/meterware/httpunit/parsing/JTidyHTMLParser.java
 find . -name "*.jar" -exec rm -f {} \;
 rm -rf doc/api
@@ -106,6 +108,7 @@ ln -s \
 
 %build
 export CLASSPATH=$(build-classpath javamail)
+export ANT_OPTS="-Dfile.encoding=iso-8859-1"
 ant -Dbuild.compiler=modern -Dbuild.sysclasspath=last \
   jar javadocs test servlettest 
 
@@ -122,22 +125,23 @@ rm -rf doc/api
 
 # Fix link between doc and javadoc
 pushd doc
-ln -sf %{_javadocdir}/%{name}-%{version} api
+ln -sf %{_javadocdir}/%{name} api
 popd
 
 %files
-%defattr(-,root,root,-)
 %{_javadir}/*
 
 %files javadoc
-%defattr(-,root,root,-)
 %{_javadocdir}/%{name}
 
 %files doc
-%defattr(-,root,root,-)
 %doc doc/*
 
 %changelog
+* Tue Dec 6 2011 Alexander Kurtakov <akurtako at redhat.com> 0:1.7-5
+- Fix build.
+- Adapt to current guidelines.
+
 * Mon Mar 7 2011 Alexander Kurtakov <akurtako at redhat.com> 0:1.7-4
 - Adopt to current guidelines.
 - Fix various rpmlint errors/warnings.


More information about the scm-commits mailing list