rpms/nekohtml/devel nekohtml-HTMLScanner.patch, NONE, 1.1 nekohtml-crosslink.patch, NONE, 1.1 nekohtml-filter.sh, NONE, 1.1 nekohtml.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Matt Wringe (mwringe)
fedora-extras-commits at redhat.com
Mon Mar 12 15:01:50 UTC 2007
- Previous message (by thread): rpms/nekohtml import.log,1.1,1.2
- Next message (by thread): rpms/plexus-utils/devel Makefile, NONE, 1.1 plexus-utils-1.2-build.xml, NONE, 1.1 plexus-utils.spec, NONE, 1.1 sources, NONE, 1.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mwringe
Update of /cvs/extras/rpms/nekohtml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6169/devel
Modified Files:
.cvsignore sources
Added Files:
nekohtml-HTMLScanner.patch nekohtml-crosslink.patch
nekohtml-filter.sh nekohtml.spec
Log Message:
auto-import nekohtml-0.9.5-4jpp.1 on branch devel from nekohtml-0.9.5-4jpp.1.src.rpm
nekohtml-HTMLScanner.patch:
--- NEW FILE nekohtml-HTMLScanner.patch ---
--- src/html/org/cyberneko/html/HTMLScanner.java.sav 2005-06-19 06:04:02.000000000 +0200
+++ src/html/org/cyberneko/html/HTMLScanner.java 2005-10-11 07:46:06.000000000 +0200
@@ -558,6 +558,11 @@
// XMLLocator methods
//
+ /** Returns the xml version. */
+ public String getXMLVersion() {
+ return null;
+ } // getXMLVersion():String
+
/** Returns the encoding. */
public String getEncoding() {
return fCurrentEntity != null ? fCurrentEntity.encoding : null;
@@ -584,6 +589,11 @@
} // getExpandedSystemId():String
/** Returns the current line number. */
+ public int getCharacterOffset() {
+ return -1;
+ } // getCharacterOffset():int
+
+ /** Returns the current line number. */
public int getLineNumber() {
return fCurrentEntity != null ? fCurrentEntity.lineNumber : -1;
} // getLineNumber():int
nekohtml-crosslink.patch:
--- NEW FILE nekohtml-crosslink.patch ---
--- build-html.xml~ 2004-06-30 09:03:39.000000000 +0300
+++ build-html.xml 2004-07-03 19:52:56.973843825 +0300
@@ -35,6 +35,10 @@
<property name='version.dir' value='bin/html/src'/>
<property name='version.manifest' value='${version.dir}/MANIFEST_html'/>
<property name='version.dir.java' value='${version.dir}/org/cyberneko/html'/>
+ <property name='j2se.javadoc' value='http://java.sun.com/j2se/1.4.2/docs/api/'/>
+ <property name='xni.javadoc' value='http://xml.apache.org/xerces2-j/javadocs/xni/'/>
+ <property name='xerces.javadoc' value='http://xml.apache.org/xerces2-j/javadocs/xerces2/'/>
+
<property name='version.java' value='${version.dir.java}/Version.java'/>
<!-- TARGETS -->
@@ -101,7 +105,11 @@
windowtitle="${Name} Implementation"
doctitle="${Name}"
bottom="${copyright}"
- />
+ >
+ <link href="${j2se.javadoc}"/>
+ <link href="${xni.javadoc}"/>
+ <link href="${xerces.javadoc}"/>
+ </javadoc>
<property name='docs.done' value='true'/>
</target>
--- NEW FILE nekohtml-filter.sh ---
#!/bin/sh
#
# nekohtml filter script
# JPackage Project <http://www.jpackage.org/>
# Source functions library
if [ -f /usr/share/java-utils/java-functions ] ; then
. /usr/share/java-utils/java-functions
else
echo "Can't find functions library, aborting"
exit 1
fi
# Configuration
MAIN_CLASS=org.cyberneko.html.filters.Writer
BASE_JARS="nekohtml xerces-j2"
# Set parameters
set_jvm
set_classpath $BASE_JARS
# Let's start
run "$@"
--- NEW FILE nekohtml.spec ---
# Copyright (c) 2000-2005, JPackage Project
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the
# distribution.
# 3. Neither the name of the JPackage Project nor the names of its
# contributors may be used to endorse or promote products derived
# from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
%define section free
Name: nekohtml
Version: 0.9.5
Release: 4jpp.1%{?dist}
Epoch: 0
Summary: HTML scanner and tag balancer
License: Apache License
URL: http://www.apache.org/~andyc/neko/doc/html/
Source0: http://www.apache.org/~andyc/neko/nekohtml-0.9.5.tar.gz
# Source 1 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
Patch0: %{name}-crosslink.patch
Patch1: %{name}-HTMLScanner.patch
Group: Applications/Text
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: jpackage-utils >= 0:1.6
BuildRequires: ant
BuildRequires: java-javadoc
BuildRequires: xerces-j2 >= 0:2.7.1
BuildRequires: xerces-j2-javadoc-xni
BuildRequires: xerces-j2-javadoc-impl
Requires: jpackage-utils >= 0:1.6
Requires: xerces-j2 >= 0:2.7.1
%description
NekoHTML is a simple HTML scanner and tag balancer that enables
application programmers to parse HTML documents and access the
information using standard XML interfaces. The parser can scan HTML
files and "fix up" many common mistakes that human (and computer)
authors make in writing HTML documents. NekoHTML adds missing parent
elements; automatically closes elements with optional end tags; and
can handle mismatched inline element tags.
NekoHTML is written using the Xerces Native Interface (XNI) that is
the foundation of the Xerces2 implementation. This enables you to use
the NekoHTML parser with existing XNI tools without modification or
rewriting code.
%package javadoc
Summary: Javadoc for %{name}
Group: Documentation
Requires: jpackage-utils >= 0:1.6
Requires(postun): jpackage-utils >= 0:1.6
%description javadoc
Javadoc for %{name}.
%package demo
Summary: Demo for %{name}
Group: Applications/Text
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: jpackage-utils >= 0:1.6
Requires(postun): jpackage-utils >= 0:1.6
%description demo
Demonstrations and samples for %{name}.
%prep
%setup -q
%patch0 -p0
%patch1 -b .sav
find . -name "*.jar" -exec rm -f {} \;
%build
export CLASSPATH=$(build-classpath xerces-j2)
ant -f build-html.xml \
-Djarfile=%{name}-%{version}.jar \
-DjarfileXni=%{name}-xni-%{version}.jar \
-DjarfileSamples=%{name}-samples-%{version}.jar \
-Dj2se.javadoc=%{_javadocdir}/java \
-Dxni.javadoc=%{_javadocdir}/xerces-j2-xni \
-Dxerces.javadoc=%{_javadocdir}/xerces-j2-impl \
clean package jar-xni test
%install
rm -rf $RPM_BUILD_ROOT
# Jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
install -p -m 644 %{name}{,-xni}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/
ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.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
# Samples
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
install -p -m 644 %{name}-samples-%{version}.jar \
$RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}/
# Javadocs
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -pr bin/package/nekohtml-*/doc/html/javadoc/* \
$RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/
# Avoid having javadocs in %doc.
rm -rf bin/package/nekohtml-*/doc/html/javadoc
# Fix EOL in files
pushd bin/package/nekohtml-*/doc/html
for x in *.html; do tr -d \\r <$x >$x.tmp; mv $x.tmp $x; done
tr -d \\r <.htaccess >.htaccess.tmp; mv .htaccess.tmp .htaccess
# Rename .htaccess file to sample version.
mv .htaccess sample.htaccess
# ln -sf %{_javadocdir}/%{name}-%{version} javadoc
popd
pushd bin/package/nekohtml-*/doc
tr -d \\r <style.css >style.css.tmp; mv style.css.tmp style.css
popd
for x in LICENSE*; do tr -d \\r <$x >$x.tmp; mv $x.tmp $x; done
for x in README*; do tr -d \\r <$x >$x.tmp; mv $x.tmp $x; done
for x in TODO*; do tr -d \\r <$x >$x.tmp; mv $x.tmp $x; done
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(0644,root,root,0755)
%doc LICENSE* README* TODO* bin/package/nekohtml-*/doc/*
%attr(755,root,root) %{_bindir}/%{name}-filter
%{_javadir}/%{name}*.jar
%files javadoc
%defattr(0644,root,root,0755)
%doc %{_javadocdir}/*
%files demo
%defattr(0644,root,root,0755)
%{_datadir}/%{name}-%{version}
%changelog
* Mon Feb 12 2007 Jeff Johnston <jjohnstn at redhat.com> - 0:0.9.5-4jpp.1
- Update to address Fedora review comments.
* Mon May 08 2006 Ralph Apel <r.apel at r-apel.de> - 0:0.9.5-4jpp
- First JPP-1.7 release
* Tue Oct 11 2005 Ralph Apel <r.apel at r-apel.de> - 0:0.9.5-3jpp
- Patch to JAXP13
* Mon Aug 1 2005 Ville Skyttä <scop at jpackage.org> - 0:0.9.5-2jpp
- Fix unversioned xni jar symlink (#10).
* Wed Jul 6 2005 Ville Skyttä <scop at jpackage.org> - 0:0.9.5-1jpp
- 0.9.5.
* Wed Dec 15 2004 Ville Skyttä <scop at jpackage.org> - 0:0.9.4-1jpp
- Update to 0.9.4.
* Tue Aug 24 2004 Fernando Nasser <fnasser at redhat.com> - 0:0.9.3-2jpp
- Rebuild with Ant 1.6.2
* Sat Jul 3 2004 Ville Skyttä <scop at jpackage.org> - 0:0.9.3-1jpp
- Update to 0.9.3.
- Add nekohtml-filter script.
* Thu Apr 1 2004 Ville Skyttä <scop at jpackage.org> - 0:0.9.2-1jpp
- Update to 0.9.2.
* Sat Dec 13 2003 Ville Skyttä <scop at jpackage.org> - 0:0.8.3-1jpp
- Update to 0.8.3.
* Sat Nov 15 2003 Ville Skyttä <scop at jpackage.org> - 0:0.8.2-1jpp
- Update to 0.8.2.
* Wed Oct 1 2003 Ville Skyttä <scop at jpackage.org> - 0:0.8.1-1jpp
- Update to 0.8.1.
- Crosslink with local J2SE and XNI javadocs.
- Save .spec in UTF-8.
* Thu Jun 26 2003 Ville Skyttä <scop at jpackage.org> - 0:0.7.7-1jpp
- Update to 0.7.7.
* Sun May 11 2003 David Walluck <david at anti-microsoft.org> 0:0.7.6-1jpp
- 0.7.6
- update for JPackage 1.5
* Sat Mar 29 2003 Ville Skyttä <scop at jpackage.org> - 0.7.4-2jpp
- Rebuilt for JPackage 1.5.
* Tue Mar 4 2003 Ville Skyttä <scop at jpackage.org> - 0.7.4-1jpp
- Update to 0.7.4.
* Mon Feb 24 2003 Ville Skyttä <scop at jpackage.org> - 0.7.3-1jpp
- Update to 0.7.3.
- Built with IBM's 1.3.1 SR3 and xerces-j2 2.3.0.
* Sat Jan 11 2003 Ville Skyttä <scop at jpackage.org> - 0.7.2-1jpp
- Update to 0.7.2.
- Run unit tests when building.
* Tue Dec 10 2002 Ville Skyttä <scop at jpackage.org> - 0.7.1-1jpp
- Update to 0.7.1.
* Sun Nov 3 2002 Ville Skyttä <scop at jpackage.org> - 0.6.8-1jpp
- 0.6.8, first JPackage release.
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nekohtml/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 9 Mar 2007 01:35:53 -0000 1.1
+++ .cvsignore 12 Mar 2007 15:01:17 -0000 1.2
@@ -0,0 +1 @@
+nekohtml-0.9.5.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nekohtml/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 9 Mar 2007 01:35:53 -0000 1.1
+++ sources 12 Mar 2007 15:01:17 -0000 1.2
@@ -0,0 +1 @@
+a5b22b189f23d0648eabc308fcfd4542 nekohtml-0.9.5.tar.gz
- Previous message (by thread): rpms/nekohtml import.log,1.1,1.2
- Next message (by thread): rpms/plexus-utils/devel Makefile, NONE, 1.1 plexus-utils-1.2-build.xml, NONE, 1.1 plexus-utils.spec, NONE, 1.1 sources, NONE, 1.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list