[htmlparser] Compiling for generics, see #842598

[Ismael Olea]

commit 36b5b92bf4dfd931fb9359cbf61bf2a7aa64f148
Author: Ismael Olea <ismael at olea.org>
Date:   Tue Jul 24 12:51:53 2012 +0200

    Compiling for generics, see #842598

 htmlparser-build.patch |   53 ++++++++++++++++++++++++++++++++++++++++++++++++
 htmlparser.spec        |    7 +++++-
 2 files changed, 59 insertions(+), 1 deletions(-)
---
diff --git a/htmlparser-build.patch b/htmlparser-build.patch
new file mode 100644
index 0000000..3215073
--- /dev/null
+++ b/htmlparser-build.patch
@@ -0,0 +1,53 @@
+--- htmlparser1_6-orig/build.xml	2006-06-04 15:17:22.000000000 +0200
++++ htmlparser1_6/build.xml	2012-07-24 12:34:48.194666133 +0200
+@@ -260,12 +260,12 @@
+ 
+   <target name="compile" description="compile all java files">
+     <mkdir dir="${classes}"/>
+-    <javac srcdir="${src}" destdir="${classes}" includes="org/htmlparser/**" excludes="org/htmlparser/tests/**" debug="on" classpath="${classes}" source="1.3"/>
++    <javac srcdir="${src}" destdir="${classes}" includes="org/htmlparser/**" excludes="org/htmlparser/tests/**" debug="on" classpath="${classes}" target="1.5" source="1.3"/>
+   </target>
+ 
+   <target name="compilelexer" description="compile lexer java files">
+     <mkdir dir="${classes}"/>
+-    <javac srcdir="${src}" destdir="${classes}" debug="on" classpath="{classes}" target="1.1" source="1.3">
++    <javac srcdir="${src}" destdir="${classes}" debug="on" classpath="{classes}" target="1.5" source="1.3">
+       <include name="org/htmlparser/lexer/*.java"/>
+       <include name="org/htmlparser/nodes/*.java"/>
+       <include name="org/htmlparser/Attribute.java"/>
+@@ -290,7 +290,7 @@
+ 
+   <target name="compileparser" depends="compilelexer" description="compile parser java files">
+     <mkdir dir="${classes}"/>
+-    <javac srcdir="${src}" destdir="${classes}" debug="on" classpath="{classes}:${sax2.jar}" source="1.3">
++    <javac srcdir="${src}" destdir="${classes}" debug="on" classpath="{classes}:${sax2.jar}" source="1.3" target="1.5">
+       <include name="org/htmlparser/**/*.java"/>
+       <exclude name="org/htmlparser/tests/**"/>
+       <exclude name="org/htmlparser/lexerapplications/**/*.java"/>
+@@ -371,7 +371,7 @@
+     <!-- Create the lib directory -->
+     <mkdir dir="${lib}"/>
+     <mkdir dir="${classes}"/>
+-    <javac srcdir="${src}" destdir="${classes}" debug="on" classpath="${classes}:${lib}/htmllexer.jar" source="1.5">
++    <javac srcdir="${src}" destdir="${classes}" debug="on" classpath="${classes}:${lib}/htmllexer.jar" source="1.5" target="1.5">
+       <include name="org/htmlparser/lexerapplications/thumbelina/**/*.java"/>
+     </javac>
+     <jar jarfile="${lib}/thumbelina.jar"
+@@ -390,7 +390,7 @@
+     <!-- Create the lib directory -->
+     <mkdir dir="${lib}"/>
+     <mkdir dir="${classes}"/>
+-    <javac srcdir="${src}" destdir="${classes}" debug="on" classpath="${classes}:${lib}/htmlparser.jar" source="1.3">
++    <javac srcdir="${src}" destdir="${classes}" debug="on" classpath="${classes}:${lib}/htmlparser.jar" source="1.3" target="1.5">
+       <include name="org/htmlparser/parserapplications/filterbuilder/**/*.java"/>
+     </javac>
+     <jar jarfile="${lib}/filterbuilder.jar"
+@@ -414,7 +414,7 @@
+   <!-- Run the unit tests -->
+   <target name="test" depends="jar" description="run the JUnit tests">
+     <mkdir dir="${classes}"/>
+-    <javac srcdir="${src}" destdir="${classes}" includes="org/htmlparser/tests/**" debug="on" source="1.3">
++    <javac srcdir="${src}" destdir="${classes}" includes="org/htmlparser/tests/**" debug="on" source="1.3" target="1.5">
+       <classpath>
+         <pathelement location="${classes}"/>
+         <pathelement location="${junit.jar}"/>
diff --git a/htmlparser.spec b/htmlparser.spec
index 43b774e..0fd4737 100644
--- a/htmlparser.spec
+++ b/htmlparser.spec
@@ -1,11 +1,12 @@
 Name:		htmlparser
 Version:	1.6
-Release:	9%{?dist}
+Release:	10%{?dist}
 Summary:	HTML Parser, a Java library used to parse HTML
 Group:		Development/Tools
 License:	LGPLv2+
 URL:		http://htmlparser.sourceforge.net/
 Source0:	http://downloads.sourceforge.net/htmlparser/htmlparser1_6_20060610.zip
+Patch1:         htmlparser-build.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 
@@ -38,6 +39,7 @@ This package contains the API documentation for %{name}.
 
 find -name '*.jar' -o -name '*.class' -exec rm -f '{}' \;
 %{__unzip} -qq src.zip
+%patch1 -p1
 
 
 %build
@@ -77,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_javadocdir}/*
 
 %changelog
+* Tue Jul 24 2012 <ismael at olea.org> - 1.6-10
+- Compiling for generics, see #842598
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild