[Jpackage-commits] dist/nekohtml/JPP-6 .cvsignore, 1.2, 1.3 nekohtml-1.9.14.pom, NONE, 1.1 nekohtml-crosslink.patch, 1.1, 1.2 nekohtml-jars.patch, 1.1, 1.2 nekohtml-skip-tests.patch, NONE, 1.1 nekohtml.spec, 1.2, 1.3 sources, 1.2, 1.3

David Walluck david at ryu.zarb.org
Sat Dec 11 02:26:18 CET 2010


Update of /home/projects/jpackage/cvs/dist/nekohtml/JPP-6
In directory ryu.zarb.org:/tmp/cvs-serv26012

Modified Files:
	.cvsignore nekohtml-crosslink.patch nekohtml-jars.patch 
	nekohtml.spec sources 
Added Files:
	nekohtml-1.9.14.pom nekohtml-skip-tests.patch 
Log Message:
- 1.9.14

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/nekohtml/JPP-6/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** .cvsignore	11 Feb 2009 21:11:35 -0000	1.2
--- .cvsignore	11 Dec 2010 01:26:15 -0000	1.3
***************
*** 1 ****
! nekohtml-1.9.11.tar.gz
--- 1 ----
! nekohtml-1.9.14.tar.gz

--- NEW FILE: nekohtml-1.9.14.pom ---
<project>
  <modelVersion>4.0.0</modelVersion>
  <groupId>net.sourceforge.nekohtml</groupId>
  <artifactId>nekohtml</artifactId>
  <name>Neko HTML</name>
  <version>1.9.14</version>
  <url>http://nekohtml.sourceforge.net/</url>
  <licenses>
    <license>
      <name>The Apache Software License, Version 2.0</name>
      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
      <distribution>repo</distribution>
    </license>
  </licenses>
  <scm>
    <url>http://nekohtml.svn.sourceforge.net/viewvc/nekohtml/</url>
  </scm>
  <dependencies>
    <dependency>
      <groupId>xerces</groupId>
      <artifactId>xercesImpl</artifactId>
      <version>2.9.1</version>
    </dependency>
  </dependencies>
    <distributionManagement>
        <repository>
            <id>nekohtml-m2-repo</id>
            <url>
                sftp://web.sourceforge.net/home/groups/n/ne/nekohtml/htdocs/m2-repo
            </url>
            <name>NekoHTML Maven 2 Repository</name>
        </repository>
        <snapshotRepository>
            <id>nekohtml-m2-repo-snapshots</id>
            <url>
                sftp://web.sourceforge.net/home/groups/n/ne/nekohtml/htdocs/m2-repo-snapshots
            </url>
            <name>NekoHTML Maven 2 Snapshots Repository</name>
        </snapshotRepository>
    </distributionManagement>
</project>

Index: nekohtml.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/nekohtml/JPP-6/nekohtml.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** nekohtml.spec	11 Feb 2009 21:22:09 -0000	1.2
--- nekohtml.spec	11 Dec 2010 01:26:15 -0000	1.3
***************
*** 1,3 ****
! # Copyright (c) 2000-2009, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2010, JPackage Project
  # All rights reserved.
  #
***************
*** 34,63 ****
  %define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}
  
  %bcond_without repolib
  
  %define repodir %{_javadir}/repository.jboss.com/nekohtml/%{version}-brew
  %define repodirlib %{repodir}/lib
  %define repodirsrc %{repodir}/src
  
  %define section free
- %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.11
! Release:        2%{?dist}
  Epoch:          0
  Summary:        HTML scanner and tag balancer
  License:        ASL 2.0
  URL:            http://nekohtml.sourceforge.net/
! Source0:        http://downloads.sourceforge.net/nekohtml/nekohtml-1.9.11.tar.gz
  # http://www.jpackage.org/cgi-bin/viewvc.cgi/*checkout*/rpms/devel/nekohtml/nekohtml-filter.sh?root=jpackage&content-type=text%2Fplain
  Source1:        %{name}-filter.sh
  Source2:        nekohtml-component-info.xml
  Patch0:         %{name}-crosslink.patch
  Patch1:         %{name}-jars.patch
! Group:          Development/Libraries/Java
  Requires:       bcel
! Requires:       jpackage-utils >= 0:1.6
! Requires:       xerces-j2 >= 0:2.7.1
  Requires:       xml-commons-jaxp-1.3-apis
  BuildRequires:  jpackage-utils
--- 34,75 ----
  %define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}
  
+ %bcond_with gcj_support
  %bcond_without repolib
  
+ %if %with gcj_support
+ %define gcj_support 1
+ %else
+ %define gcj_support 0
+ %endif
+ 
  %define repodir %{_javadir}/repository.jboss.com/nekohtml/%{version}-brew
  %define repodirlib %{repodir}/lib
  %define repodirsrc %{repodir}/src
  
+ %define xerces_version 2.9.1
+ 
  %define section free
  
  Name:           nekohtml
! Version:        1.9.14
! Release:        1%{?dist}
  Epoch:          0
  Summary:        HTML scanner and tag balancer
  License:        ASL 2.0
+ Group:          Development/Libraries/Java
  URL:            http://nekohtml.sourceforge.net/
! Source0:        http://downloads.sourceforge.net/nekohtml/nekohtml-1.9.14.tar.gz
  # http://www.jpackage.org/cgi-bin/viewvc.cgi/*checkout*/rpms/devel/nekohtml/nekohtml-filter.sh?root=jpackage&content-type=text%2Fplain
  Source1:        %{name}-filter.sh
  Source2:        nekohtml-component-info.xml
+ Source3:        http://nekohtml.sourceforge.net/m2-repo/net/sourceforge/nekohtml/nekohtml/1.9.14/nekohtml-1.9.14.pom
  Patch0:         %{name}-crosslink.patch
  Patch1:         %{name}-jars.patch
! Patch2:         %{name}-skip-tests.patch
! Requires(post): jpackage-utils
! Requires(postun): jpackage-utils
  Requires:       bcel
! Requires:       jpackage-utils
! Requires:       xerces-j2 >= 0:%{xerces_version}
  Requires:       xml-commons-jaxp-1.3-apis
  BuildRequires:  jpackage-utils
***************
*** 66,71 ****
  BuildRequires:  ant-trax
  BuildRequires:  java-javadoc
  BuildRequires:  bcel-javadoc
! BuildRequires:  xerces-j2 >= 0:2.7.1
  BuildRequires:  xerces-j2-javadoc-xni
  BuildRequires:  xerces-j2-javadoc-impl
--- 78,84 ----
  BuildRequires:  ant-trax
  BuildRequires:  java-javadoc
+ BuildRequires:  bcel
  BuildRequires:  bcel-javadoc
! BuildRequires:  xerces-j2 = 0:%{xerces_version}
  BuildRequires:  xerces-j2-javadoc-xni
  BuildRequires:  xerces-j2-javadoc-impl
***************
*** 120,125 ****
  %prep
  %setup -q
! %patch0 -p1
! %patch1 -p1
  %{_bindir}/find . -name "*.jar" | %{_bindir}/xargs -t %{__rm}
  %{__perl} -pi -e 's/\r$//g' *.txt doc/*.html
--- 133,139 ----
  %prep
  %setup -q
! %patch0 -p0 -b .sav0
! %patch1 -p0 -b .sav1
! #%%patch2 -p0 -b .sav2
  %{_bindir}/find . -name "*.jar" | %{_bindir}/xargs -t %{__rm}
  %{__perl} -pi -e 's/\r$//g' *.txt doc/*.html
***************
*** 127,132 ****
  
  %build
! export CLASSPATH=$(build-classpath bcel xerces-j2)
! export OPT_JAR_LIST="`%{__cat} %{_sysconfdir}/ant.d/{junit,trax}`"
  %{ant} \
      -Dbuild.sysclasspath=first \
--- 141,146 ----
  
  %build
! export CLASSPATH=$(%{_bindir}/build-classpath bcel xerces-j2)
! export OPT_JAR_LIST="`%{__cat} %{_sysconfdir}/ant.d/junit` ant/ant-trax xalan-j2"
  %{ant} \
      -Dbuild.sysclasspath=first \
***************
*** 135,138 ****
--- 149,153 ----
      -Djar.xni.file=%{name}-xni-%{version}.jar \
      -Djar.samples.file=%{name}-samples-%{version}.jar \
+     -Dxerces.version=%{xerces_version} \
      -Dbcel.javadoc=%{_javadocdir}/bcel \
      -Dj2se.javadoc=%{_javadocdir}/java \
***************
*** 142,174 ****
  
  %install
! rm -rf $RPM_BUILD_ROOT
  
  # Jars
! install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
! install -p -m 644 %{name}{,-samples,-xni}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/
! ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
! ln -s %{name}-samples-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-samples.jar
! ln -s %{name}-xni-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-xni.jar
  
  # Scripts
! install -Dpm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/%{name}-filter
  
  # Javadocs
! install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! cp -a build/doc/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
  
  %if %with repolib
! %{__install} -d -m 755 %{buildroot}%{repodir}
! %{__install} -d -m 755 %{buildroot}%{repodirlib}
! %{__install} -p -m 644 %{SOURCE2} %{buildroot}%{repodir}/component-info.xml
  tag=`/bin/echo %{name}-%{version}-%{release} | %{__sed} 's|\.|_|g'`
  %{__sed} -i "s/@TAG@/$tag/g" %{buildroot}%{repodir}/component-info.xml
  %{__sed} -i "s/@VERSION@/%{version}-brew/g" %{buildroot}%{repodir}/component-info.xml
! %{__install} -d -m 755 %{buildroot}%{repodirsrc}
! %{__install} -p -m 644 %{SOURCE0} %{buildroot}%{repodirsrc}
! %{__install} -p -m 644 %{SOURCE1} %{buildroot}%{repodirsrc}
! %{__install} -p -m 644 %{PATCH0} %{buildroot}%{repodirsrc}
! %{__install} -p -m 644 %{PATCH1} %{buildroot}%{repodirsrc}
  %{__cp} -p %{buildroot}%{_javadir}/%{name}.jar %{buildroot}%{repodirlib}/nekohtml.jar
  %endif
--- 157,197 ----
  
  %install
! rm -rf %{buildroot}
  
  # Jars
! mkdir -p %{buildroot}%{_javadir}
! cp -p %{name}{,-samples,-xni}-%{version}.jar %{buildroot}%{_javadir}/
! ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
! ln -s %{name}-samples-%{version}.jar %{buildroot}%{_javadir}/%{name}-samples.jar
! ln -s %{name}-xni-%{version}.jar %{buildroot}%{_javadir}/%{name}-xni.jar
! 
! # pom
! %{__mkdir_p} %{buildroot}%{_datadir}/maven2/poms
! %{__cp} -p %{SOURCE3} %{buildroot}%{_datadir}/maven2/poms/JPP-%{name}.pom
! %add_to_maven_depmap net.sourceforge.nekohtml nekohtml %{version} JPP %{name}
  
  # Scripts
! mkdir -p %{buildroot}%{_bindir}
! install -p -m 0755 %{SOURCE1} %{buildroot}%{_bindir}/%{name}-filter
  
  # Javadocs
! mkdir -p %{buildroot}%{_javadocdir}/%{name}-%{version}
! cp -pr build/doc/javadoc/* %{buildroot}%{_javadocdir}/%{name}-%{version}
! ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
  
  %if %with repolib
! mkdir -p %{buildroot}%{repodir}
! mkdir -p %{buildroot}%{repodirlib}
! cp -p %{SOURCE2} %{buildroot}%{repodir}/component-info.xml
  tag=`/bin/echo %{name}-%{version}-%{release} | %{__sed} 's|\.|_|g'`
  %{__sed} -i "s/@TAG@/$tag/g" %{buildroot}%{repodir}/component-info.xml
  %{__sed} -i "s/@VERSION@/%{version}-brew/g" %{buildroot}%{repodir}/component-info.xml
! mkdir -p %{buildroot}%{repodirsrc}
! cp -p %{SOURCE0} %{buildroot}%{repodirsrc}
! cp -p %{SOURCE1} %{buildroot}%{repodirsrc}
! cp -p %{PATCH0} %{buildroot}%{repodirsrc}
! cp -p %{PATCH1} %{buildroot}%{repodirsrc}
! #cp -p %{PATCH2} %{buildroot}%{repodirsrc}
! %{__cp} -p %{buildroot}%{_datadir}/maven2/poms/JPP-%{name}.pom %{buildroot}%{repodirlib}/nekohtml.pom
  %{__cp} -p %{buildroot}%{_javadir}/%{name}.jar %{buildroot}%{repodirlib}/nekohtml.jar
  %endif
***************
*** 179,192 ****
  
  %clean
! rm -rf $RPM_BUILD_ROOT
  
- %if %{gcj_support}
  %post
  if [ -x %{_bindir}/rebuild-gcj-db ]
  then
    %{_bindir}/rebuild-gcj-db
  fi
  
  %postun
  if [ -x %{_bindir}/rebuild-gcj-db ]
  then
--- 202,219 ----
  
  %clean
! rm -rf %{buildroot}
  
  %post
+ %if %{gcj_support}
  if [ -x %{_bindir}/rebuild-gcj-db ]
  then
    %{_bindir}/rebuild-gcj-db
  fi
+ %endif
+ %update_maven_depmap
  
  %postun
+ %update_maven_depmap
+ %if %{gcj_support}
  if [ -x %{_bindir}/rebuild-gcj-db ]
  then
***************
*** 199,206 ****
  %doc LICENSE.txt README.txt doc/*.html
  %attr(755,root,root) %{_bindir}/%{name}-filter
! %{_javadir}/%{name}-%{version}.jar
! %{_javadir}/%{name}.jar
! %{_javadir}/%{name}-xni-%{version}.jar
! %{_javadir}/%{name}-xni.jar
  %if %{gcj_support}
  %dir %{_libdir}/gcj/%{name}
--- 226,235 ----
  %doc LICENSE.txt README.txt doc/*.html
  %attr(755,root,root) %{_bindir}/%{name}-filter
! %{_javadir}*/%{name}-%{version}.jar
! %{_javadir}*/%{name}.jar
! %{_javadir}*/%{name}-xni-%{version}.jar
! %{_javadir}*/%{name}-xni.jar
! %{_datadir}/maven2/poms/JPP-%{name}.pom
! %{_mavendepmapfragdir}/%{name}
  %if %{gcj_support}
  %dir %{_libdir}/gcj/%{name}
***************
*** 215,228 ****
  %files demo
  %defattr(0644,root,root,0755)
! %{_javadir}/%{name}-samples-%{version}.jar
! %{_javadir}/%{name}-samples.jar
  
  %if %with repolib
  %files repolib
  %defattr(0644,root,root,0755)
! %{_javadir}/repository.jboss.com
  %endif
  
  %changelog
  * Wed Feb 11 2009 David Walluck <dwalluck at redhat.com> 0:1.9.11-2
  - add repolib
--- 244,272 ----
  %files demo
  %defattr(0644,root,root,0755)
! %{_javadir}*/%{name}-samples-%{version}.jar
! %{_javadir}*/%{name}-samples.jar
  
  %if %with repolib
  %files repolib
  %defattr(0644,root,root,0755)
! %dir %{_javadir}*
! %{_javadir}*/repository.jboss.com
  %endif
  
  %changelog
+ * Fri Dec 10 2010 David Walluck <dwalluck at redhat.com> 0:1.9.14-1
+ - 1.9.14
+ 
+ * Fri Aug 13 2010 David Walluck <dwalluck at redhat.com> 0:1.9.11-2.3
+ - bump release
+ 
+ * Fri Aug 13 2010 David Walluck <dwalluck at redhat.com> 0:1.9.11-2.2
+ - add pom
+ - fix GCJ support option
+ 
+ * Thu Mar 19 2009 David Walluck <dwalluck at redhat.com> 0:1.9.11-2.1
+ - BuildRequires: bcel
+ - force use of xalan-j2
+ 
  * Wed Feb 11 2009 David Walluck <dwalluck at redhat.com> 0:1.9.11-2
  - add repolib

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/nekohtml/JPP-6/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** sources	11 Feb 2009 21:11:35 -0000	1.2
--- sources	11 Dec 2010 01:26:15 -0000	1.3
***************
*** 1 ****
! 325fd84b00fdc359bc4188b3621f2005  nekohtml-1.9.11.tar.gz
--- 1 ----
! d6576e9d2040bce54c3266ddc37cf0aa  nekohtml-1.9.14.tar.gz

Index: nekohtml-crosslink.patch
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/nekohtml/JPP-6/nekohtml-crosslink.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** nekohtml-crosslink.patch	11 Feb 2009 21:11:35 -0000	1.1
--- nekohtml-crosslink.patch	11 Dec 2010 01:26:15 -0000	1.2
***************
*** 1,4 ****
! --- nekohtml-1.9.11/build.xml.orig	2008-12-29 15:13:42.000000000 -0500
! +++ nekohtml-1.9.11/build.xml	2009-02-11 14:27:05.352730458 -0500
  @@ -42,6 +42,11 @@
    <property name='version.java.dir' value='${build.src.dir}/org/cyberneko/html'/>
--- 1,4 ----
! --- build.xml.orig	2008-12-29 15:13:42.000000000 -0500
! +++ build.xml	2009-02-11 14:27:05.352730458 -0500
  @@ -42,6 +42,11 @@
    <property name='version.java.dir' value='${build.src.dir}/org/cyberneko/html'/>

--- NEW FILE: nekohtml-skip-tests.patch ---
--- test/java/org/cyberneko/html/DOMFragmentParserTest.java~	2009-08-18 10:59:02.000000000 -0400
+++ test/java/org/cyberneko/html/DOMFragmentParserTest.java	2010-12-10 20:22:49.490775792 -0500
@@ -24,14 +24,14 @@
 	 * See <a href="http://sourceforge.net/support/tracker.php?aid=2828553">Bug 2828553</a>.
 	 */
     public void testInvalidProcessingInstruction() throws Exception {
-    	doTest("<html><?9 ?></html>", "<HTML/>");
+    	//doTest("<html><?9 ?></html>", "<HTML/>");
     }
 
 	/**
 	 * See <a href="http://sourceforge.net/support/tracker.php?aid=2828534">Bug 2828534</a>.
 	 */
     public void testInvalidAttributeName() throws Exception {
-    	doTest("<html 9='id'></html>", "<HTML/>");
+    	//doTest("<html 9='id'></html>", "<HTML/>");
     }
 
     private void doTest(final String html, final String expected) throws Exception {

Index: nekohtml-jars.patch
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/nekohtml/JPP-6/nekohtml-jars.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** nekohtml-jars.patch	11 Feb 2009 21:11:35 -0000	1.1
--- nekohtml-jars.patch	11 Dec 2010 01:26:15 -0000	1.2
***************
*** 1,16 ****
! --- nekohtml-1.9.11/build.xml.orig	2009-02-11 14:59:06.926732735 -0500
! +++ nekohtml-1.9.11/build.xml	2009-02-11 15:00:27.811113280 -0500
! @@ -48,9 +48,9 @@
!   <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.8.1"/>
! + <property name="xerces.version" value="2.9.1"/>
!  
!   <!-- TARGETS --> 
!   <target name='all' depends='zip,tgz'/>
  @@ -77,7 +77,7 @@
   			source='${compile.source}' target='${compile.target}'
--- 1,4 ----
! --- build.xml.orig	2010-12-10 20:11:24.609861107 -0500
! +++ build.xml	2010-12-10 20:12:44.696723905 -0500
  @@ -77,7 +77,7 @@
   			source='${compile.source}' target='${compile.target}'
***************
*** 45,49 ****
   
   	<copy todir="${build.classes.dir}">
! @@ -267,7 +269,7 @@
   	  		 source='${compile.source}' target='${compile.target}'
   	  		 includeAntRuntime='true'>
--- 33,37 ----
   
   	<copy todir="${build.classes.dir}">
! @@ -270,7 +272,7 @@
   	  		 source='${compile.source}' target='${compile.target}'
   	  		 includeAntRuntime='true'>
***************
*** 54,58 ****
   	  	</classpath>
   	    <src path='${src.test.dir}' />
! @@ -288,8 +290,8 @@
   				<classpath>
   				    <pathelement path='${build.test-classes.dir}'/>
--- 42,46 ----
   	  	</classpath>
   	    <src path='${src.test.dir}' />
! @@ -291,8 +293,8 @@
   				<classpath>
   				    <pathelement path='${build.test-classes.dir}'/>
***************
*** 65,81 ****
   	
   				<formatter type="xml"/>
! @@ -308,9 +310,11 @@
   		<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="2.1.0"/>
   		<testWith xercesVersion="2.0.2"/>
! @@ -347,7 +351,7 @@
   		    <fileset dir='${build.src.dir}' />
   		</jar>
--- 53,72 ----
   	
   				<formatter type="xml"/>
! @@ -310,11 +312,11 @@
!  		<delete dir="${build.dir}/junit"/>
   		<mkdir dir="${build.dir}/junit"/>
   
! -		<testWith xercesVersion="2.9.1"/>
! -		<testWith xercesVersion="2.8.1"/>
! +		<testWith xercesVersion="${xerces.version}"/>
! +		<!--<testWith xercesVersion="2.8.1"/>
   		<testWith xercesVersion="2.3.0"/>
   		<testWith xercesVersion="2.2.1"/>
! -		<testWith xercesVersion="minimal"/>
! +		<testWith xercesVersion="minimal"/>-->
   		<!--
   		<testWith xercesVersion="2.1.0"/>
   		<testWith xercesVersion="2.0.2"/>
! @@ -351,7 +353,7 @@
   		    <fileset dir='${build.src.dir}' />
   		</jar>




More information about the JPackage-commits mailing list