rpms/nekohtml/devel import.log, 1.1, 1.2 nekohtml-jars.patch, 1.1, 1.2 nekohtml.spec, 1.5, 1.6

Mon Jul 19 19:12:22 UTC 2010

Author: jlaska

Update of /cvs/pkgs/rpms/nekohtml/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv22436/devel

Modified Files:
	import.log nekohtml-jars.patch nekohtml.spec 
Log Message:
Update to 1.9.14 (for real this time)




Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/nekohtml/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2

--- import.log	16 Jul 2010 19:30:17 -0000	1.1
+++ import.log	19 Jul 2010 19:12:22 -0000	1.2
@@ -1 +1,2 @@
 nekohtml-1_9_14-1_fc14:HEAD:nekohtml-1.9.14-1.fc14.src.rpm:1279308346
+nekohtml-1_9_14-1_fc14:HEAD:nekohtml-1.9.14-1.fc14.src.rpm:1279566696

nekohtml-jars.patch:
 build.xml |   20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

Index: nekohtml-jars.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nekohtml/devel/nekohtml-jars.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- nekohtml-jars.patch	16 Jul 2010 19:30:17 -0000	1.1
+++ nekohtml-jars.patch	19 Jul 2010 19:12:22 -0000	1.2
@@ -1,5 +1,14 @@
---- nekohtml-1.9.14/build.xml.orig	2010-07-15 12:42:22.528978852 -0400
-+++ nekohtml-1.9.14/build.xml	2010-07-15 12:42:22.531978094 -0400
+--- nekohtml-1.9.14/build.xml.orig	2010-07-19 13:56:56.190200850 -0400
++++ nekohtml-1.9.14/build.xml	2010-07-19 14:06:07.908202000 -0400
+@@ -48,7 +48,7 @@
+  <property name='xerces.javadoc' value='http://xml.apache.org/xerces2-j/javadocs/xerces2/'/>
+ 
+  <!-- DEPENDENCIES -->
+- <available property='bcel.available' file='${lib.dir}/bcel-5.2.jar' />
++ <available property='bcel.available' file='${lib.dir}/bcel.jar' />
+ 
+  <property name="xerces.version" value="2.9.1"/>
+ 
 @@ -77,7 +77,7 @@
  			source='${compile.source}' target='${compile.target}'
  			includeAntRuntime='false'>
@@ -22,22 +31,31 @@
  		unless="compile.skip">
  	<mkdir dir="${build.classes.dir}"/>
  	
-+        <!--
++	<!--
  	<compileWith xercesVersion="2.0.2" bridge="2_0"/>
  	<compileWith xercesVersion="2.1.0" bridge="2_1"/>
  	<compileWith xercesVersion="2.2.1" bridge="2_2"/>
  	<compileWith xercesVersion="2.3.0" bridge="2_3"/>
  	<compileWith xercesVersion="2.8.1" bridge="2_3"/>
-+        -->
++	-->
  	<compileWith xercesVersion="2.9.1" bridge="2_3"/>
  
  	<copy todir="${build.classes.dir}">
+@@ -229,7 +231,7 @@
+  	<java classname='org.apache.tools.ant.Main'>
+  		<classpath>
+  			<pathelement path='${java.class.path}' />
+- 			<pathelement location='${lib.dir}/bcel-5.2.jar' />
++ 			<pathelement location='${lib.dir}/bcel.jar' />
+  		</classpath>
+  		<arg value='x-minimal' />
+  	</java>
 @@ -270,7 +272,7 @@
  	  		 source='${compile.source}' target='${compile.target}'
  	  		 includeAntRuntime='true'>
  	  	<classpath>
 -	  		<fileset dir='${lib.dir}' includes='xml-apis.jar,xerces*.jar, junit*.jar' />
-+	  		<fileset dir='${lib.dir}' includes='xml-commons-jaxp-1.3-apis.jar,xerces-j2.jar, junit.jar' />
++	  		<fileset dir='${lib.dir}' includes='xml-commons-apis.jar,xerces-j2.jar,junit.jar' />
  		    <pathelement location='${build.classes.dir}' />
  	  	</classpath>
  	    <src path='${src.test.dir}' />
@@ -52,7 +70,20 @@
  				</classpath>
  	
  				<formatter type="xml"/>
-@@ -351,7 +353,7 @@
+@@ -311,10 +313,12 @@
+ 		<mkdir dir="${build.dir}/junit"/>
+ 
+ 		<testWith xercesVersion="2.9.1"/>
++		<!--
+ 		<testWith xercesVersion="2.8.1"/>
+ 		<testWith xercesVersion="2.3.0"/>
+ 		<testWith xercesVersion="2.2.1"/>
+ 		<testWith xercesVersion="minimal"/>
++		-->
+ 		<!--
+ 		<testWith xercesVersion="2.1.0"/>
+ 		<testWith xercesVersion="2.0.2"/>
+@@ -351,7 +355,7 @@
  		    <fileset dir='${build.src.dir}' />
  		</jar>
  


Index: nekohtml.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nekohtml/devel/nekohtml.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- nekohtml.spec	16 Jul 2010 19:30:17 -0000	1.5
+++ nekohtml.spec	19 Jul 2010 19:12:22 -0000	1.6
@@ -34,14 +34,13 @@
 %define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}
 
 %bcond_without repolib
+%bcond_with gcj_support
 
 %define repodir %{_javadir}/repository.jboss.com/nekohtml/%{version}-brew
 %define repodirlib %{repodir}/lib
 %define repodirsrc %{repodir}/src
 
 %define section free
-%define _without_gcj_support 1 
-%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
 
 Name:           nekohtml
 Version:        1.9.14
@@ -72,11 +71,11 @@ BuildRequires:  xerces-j2 >= 0:2.7.1
 BuildRequires:  xerces-j2-javadoc-xni
 BuildRequires:  xerces-j2-javadoc-impl
 BuildRequires:  xml-commons-jaxp-1.3-apis
-%if %{gcj_support}
+%if %with gcj_support
 BuildRequires:  java-gcj-compat-devel
 %else
 BuildArch:      noarch
-BuildRequires:  java-devel
+BuildRequires:  java-devel >= 1.6.0
 %endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -175,14 +174,14 @@ tag=`/bin/echo %{name}-%{version}-%{rele
 %{__cp} -p %{buildroot}%{_javadir}/%{name}.jar %{buildroot}%{repodirlib}/nekohtml.jar
 %endif
 
-%if %{gcj_support}
+%if %with gcj_support
 %{_bindir}/aot-compile-rpm
 %endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%if %{gcj_support}
+%if %with gcj_support
 %post
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
@@ -204,7 +203,7 @@ fi
 %{_javadir}/%{name}.jar
 %{_javadir}/%{name}-xni-%{version}.jar
 %{_javadir}/%{name}-xni.jar
-%if %{gcj_support}
+%if %with gcj_support
 %dir %{_libdir}/gcj/%{name}
 %attr(-,root,root) %{_libdir}/gcj/%{name}/*
 %endif
@@ -226,7 +225,7 @@ fi
 %endif
 
 %changelog
-* Thu Jul 15 2010 James Laska <jlaska at redhat.com> 0:1.9.14-1
+* Mon Jul 19 2010 James Laska <jlaska at redhat.com> 0:1.9.14-1
 - Update to 1.9.14
 
 * Wed May 13 2009 Martha Benitez <mbenitez at redhat.com> 0:1.9.11-2.2

