diff --git a/.devtoolset-3-nekohtml.metadata b/.devtoolset-3-nekohtml.metadata
index a21ebbf..ac9573e 100644
--- a/.devtoolset-3-nekohtml.metadata
+++ b/.devtoolset-3-nekohtml.metadata
@@ -1 +1 @@
-da77d70d552c59c69179fcdbc2d86062e27b9846 SOURCES/nekohtml-1.9.20.tar.gz
+32a77b36fd58808f3f4e7c7ce1a6c436d2809eaa SOURCES/nekohtml-1.9.21.tar.gz
diff --git a/.gitignore b/.gitignore
index fc2a97e..28b7454 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/nekohtml-1.9.20.tar.gz
+SOURCES/nekohtml-1.9.21.tar.gz
diff --git a/SOURCES/nekohtml-1.9.20.pom b/SOURCES/nekohtml-1.9.20.pom
deleted file mode 100644
index d568241..0000000
--- a/SOURCES/nekohtml-1.9.20.pom
+++ /dev/null
@@ -1,45 +0,0 @@
-
- 4.0.0
- net.sourceforge.nekohtml
- nekohtml
- Neko HTML
- An HTML parser and tag balancer.
- 1.9.20
- http://nekohtml.sourceforge.net/
-
-
- The Apache Software License, Version 2.0
- http://www.apache.org/licenses/LICENSE-2.0.txt
- repo
-
-
-
- http://nekohtml.svn.sourceforge.net/viewvc/nekohtml/
-
-
-
- xerces
- xercesImpl
- 2.10.0
-
-
-
-
- Andy Clark
-
-
- Marc Guillemot
- mguillem
- mguillem@users.sourceforge.net
- http://mguillem.wordpress.com/
- +1
-
-
-
-
- nexus-releases
- Nexus Release Repository
- http://oss.sonatype.org/service/local/staging/deploy/maven2/
-
-
-
diff --git a/SOURCES/nekohtml-1.9.21.pom b/SOURCES/nekohtml-1.9.21.pom
new file mode 100644
index 0000000..bc4b703
--- /dev/null
+++ b/SOURCES/nekohtml-1.9.21.pom
@@ -0,0 +1,45 @@
+
+ 4.0.0
+ net.sourceforge.nekohtml
+ nekohtml
+ Neko HTML
+ An HTML parser and tag balancer.
+ 1.9.21
+ http://nekohtml.sourceforge.net/
+
+
+ The Apache Software License, Version 2.0
+ http://www.apache.org/licenses/LICENSE-2.0.txt
+ repo
+
+
+
+ http://nekohtml.svn.sourceforge.net/viewvc/nekohtml/
+
+
+
+ xerces
+ xercesImpl
+ 2.10.0
+
+
+
+
+ Andy Clark
+
+
+ Marc Guillemot
+ mguillem
+ mguillem@users.sourceforge.net
+ http://mguillem.wordpress.com/
+ +1
+
+
+
+
+ nexus-releases
+ Nexus Release Repository
+ http://oss.sonatype.org/service/local/staging/deploy/maven2/
+
+
+
diff --git a/SOURCES/nekohtml-osgi.patch b/SOURCES/nekohtml-osgi.patch
index a57b38a..2b4903a 100644
--- a/SOURCES/nekohtml-osgi.patch
+++ b/SOURCES/nekohtml-osgi.patch
@@ -7,8 +7,8 @@ diff -up ./build.xml.fix ./build.xml
+
+
-+
+
++
diff --git a/SPECS/nekohtml.spec b/SPECS/nekohtml.spec
index 17f2160..6ee26de 100644
--- a/SPECS/nekohtml.spec
+++ b/SPECS/nekohtml.spec
@@ -1,8 +1,6 @@
%{?scl:%scl_package nekohtml}
%{!?scl:%global pkg_name %{name}}
-%global _unpackaged_files_terminate_build 0
-
# Copyright (c) 2000-2009, JPackage Project
# All rights reserved.
#
@@ -34,8 +32,8 @@
#
Name: %{?scl_prefix}nekohtml
-Version: 1.9.20
-Release: 2%{?dist}
+Version: 1.9.21
+Release: 6%{?dist}
Epoch: 0
Summary: HTML scanner and tag balancer
License: ASL 2.0
@@ -48,21 +46,20 @@ Patch1: %{pkg_name}-jars.patch
# Add proper attributes to MANIFEST.MF file so bundle can be used by other OSGI bundles.
Patch2: %{pkg_name}-osgi.patch
-Requires: bcel
-Requires: xerces-j2 >= 0:2.7.1
-Requires: xml-commons-apis
-BuildRequires: maven-local
-BuildRequires: ant
-BuildRequires: ant-junit
+Requires: %{?scl_prefix_java_common}bcel
+Requires: %{?scl_prefix_java_common}xerces-j2 >= 0:2.7.1
+Requires: %{?scl_prefix_java_common}xml-commons-apis
+BuildRequires: %{?scl_prefix_java_common}maven-local
+BuildRequires: %{?scl_prefix_java_common}ant
+BuildRequires: %{?scl_prefix_java_common}ant-junit
BuildRequires: java-javadoc
-BuildRequires: bcel
-BuildRequires: bcel-javadoc
-BuildRequires: xerces-j2 >= 0:2.7.1
-BuildRequires: xerces-j2-javadoc
-BuildRequires: xml-commons-apis
+BuildRequires: %{?scl_prefix_java_common}bcel
+BuildRequires: %{?scl_prefix_java_common}bcel-javadoc
+BuildRequires: %{?scl_prefix_java_common}xerces-j2 >= 0:2.7.1
+BuildRequires: %{?scl_prefix_java_common}xerces-j2-javadoc
+BuildRequires: %{?scl_prefix_java_common}xml-commons-apis
-Requires: java-headless
-%{?scl:Requires: %scl_runtime}
+Requires: java
BuildArch: noarch
@@ -80,17 +77,17 @@ the NekoHTML parser with existing XNI tools without modification or
rewriting code.
%package javadoc
-Summary: Javadoc for %{name}
+Summary: Javadoc for %{pkg_name}
%description javadoc
-Javadoc for %{name}.
+Javadoc for %{pkg_name}.
%package demo
-Summary: Demo for %{name}
+Summary: Demo for %{pkg_name}
Requires: %{name} = %{epoch}:%{version}-%{release}
%description demo
-Demonstrations and samples for %{name}.
+Demonstrations and samples for %{pkg_name}.
%prep
%setup -q -n %{pkg_name}-%{version}
@@ -101,64 +98,197 @@ find . -name "*.jar" | xargs -t %{__rm}
%{__perl} -pi -e 's/\r$//g' *.txt doc/*.html
%{__rm} -r doc/javadoc
-scl enable %{scl} - <<"EOF"
+%{?scl:scl enable %{scl_maven} %{scl} - << "EOF"}
%mvn_alias net.sourceforge.%{pkg_name}:%{pkg_name} %{pkg_name}:%{pkg_name}
%mvn_package net.sourceforge.%{pkg_name}:%{pkg_name}-samples demo
%mvn_file ':{*}' @1
-
-%mvn_config installerSettings/jarDir %{_jardir}
-EOF
+%{?scl:EOF}
%build
-export JAVA_HOME=%{java_home}
-
+%{?scl:scl enable %{scl_maven} %{scl} - << "EOF"}
export CLASSPATH=$(build-classpath bcel xerces-j2)
%{ant} \
-Dbuild.sysclasspath=first \
- -Dlib.dir=%{_root_datadir}/java \
+ -Dlib.dir=%{?_scl_prefix}/%{scl_java_common}/root%{_root_datadir}/java \
-Djar.file=%{pkg_name}.jar \
-Djar.xni.file=%{pkg_name}-xni.jar \
-Djar.samples.file=%{pkg_name}-samples.jar \
- -Dbcel.javadoc=%{_root_datadir}/javadoc/bcel \
- -Dj2se.javadoc=%{_root_datadir}/javadoc/java \
- -Dxni.javadoc=%{_root_datadir}/javadoc/xerces-j2-xni \
- -Dxerces.javadoc=%{_root_datadir}/javadoc/xerces-j2-impl \
+ -Dbcel.javadoc=%{_javadocdir}/bcel \
+ -Dj2se.javadoc=%{_javadocdir}/java \
+ -Dxni.javadoc=%{_javadocdir}/xerces-j2-xni \
+ -Dxerces.javadoc=%{_javadocdir}/xerces-j2-impl \
clean jar jar-xni doc
# test - disabled because it makes the build failing
+%{?scl:EOF}
-scl enable %{scl} - <<"EOF"
+%{?scl:scl enable %{scl_maven} %{scl} - << "EOF"}
%mvn_artifact %{SOURCE3} %{pkg_name}.jar
%mvn_artifact net.sourceforge.%{pkg_name}:%{pkg_name}-xni:%{version} %{pkg_name}-xni.jar
%mvn_artifact net.sourceforge.%{pkg_name}:%{pkg_name}-samples:%{version} %{pkg_name}-samples.jar
-EOF
+%{?scl:EOF}
%install
-scl enable %{scl} - <<"EOF"
-
-%mvn_install
-EOF
-
-install -dm755 ${RPM_BUILD_ROOT}%{_javadocdir}/nekohtml
-cp -pr build/doc/javadoc/*.html build/doc/javadoc/package-list build/doc/javadoc/resources build/doc/javadoc/stylesheet.css ${RPM_BUILD_ROOT}%{_javadocdir}/nekohtml
+%{?scl:scl enable %{scl_maven} %{scl} - << "EOF"}
+%mvn_install -J build/doc/javadoc
+%{?scl:EOF}
# Scripts
%jpackage_script org.cyberneko.html.filters.Writer "" "" "nekohtml:xerces-j2" nekohtml-filter true
-
%files -f .mfiles
%doc LICENSE.txt README.txt doc/*.html
%{_bindir}/%{pkg_name}-filter
-%files javadoc
-%dir %{_javadocdir}/nekohtml
-%{_javadocdir}/nekohtml
+%files javadoc -f .mfiles-javadoc
%files demo -f .mfiles-demo
%changelog
-* Wed May 28 2014 Jeff Johnston - 0:1.9.20-2
-- Add requires of org.apache.xerces to MANIFEST.MF
-- Clean up %%install section
+* Wed Jan 21 2015 Mat Booth - 0:1.9.21-6
+- Fix requires on demo sub-package
+
+* Wed Jan 14 2015 Roland Grunberg - 0:1.9.21-5
+- Fix requires.
+
+* Tue Jan 13 2015 Roland Grunberg - 0:1.9.21-4
+- SCL-ize.
+
+* Tue Aug 19 2014 Mat Booth - 0:1.9.21-3
+- Add "Import-Package" to OSGi metadata so that classes from xerces can
+ be resolved.
+
+* Sat Jun 07 2014 Fedora Release Engineering - 0:1.9.21-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Thu Jun 5 2014 Mikolaj Izdebski - 0:1.9.21-1
+- Update to upstream version 1.9.21
+
+* Mon May 12 2014 Jeff Johnston - 0:1.9.20-4
+- Add Export-Package statement to MANIFEST.MF.
+
+* Mon May 12 2014 Jeff Johnston - 0:1.9.20-3
+- Change Bundle-Name to be Bundle-SymbolicName.
+
+* Mon May 12 2014 Jeff Johnston - 0:1.9.20-2
+- Add OSGI Bundle-Name and Bundle-Version to generated manifest
+
+* Tue Mar 18 2014 Michael Simacek - 0:1.9.20-1
+- Update to upstream version 1.9.20
+- Use XMvn for installation
+- Require java-headless
+
+* Sat Aug 03 2013 Fedora Release Engineering - 0:1.9.14-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Thu Feb 14 2013 Fedora Release Engineering - 0:1.9.14-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Thu Nov 1 2012 Mikolaj Izdebski - 0:1.9.14-10
+- Add addiotional depmap
+
+* Fri Jul 20 2012 Fedora Release Engineering - 0:1.9.14-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Tue Jun 12 2012 Bill Nottingham 0:1.9.14-7
+- Update buildreqs to packages that currently exist
+
+* Fri Jan 13 2012 Fedora Release Engineering - 0:1.9.14-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Tue Nov 1 2011 Alexander Kurtakov 0:1.9.14-6
+- Adapt to current guidelines.
+
+* Mon Oct 10 2011 Andy Grimm - 0:1.9.14-5
+- Add POM file (BZ #735521)
+
+* Tue Feb 08 2011 Fedora Release Engineering - 0:1.9.14-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Wed Oct 6 2010 Alexander Kurtakov 0:1.9.14-3
+- Drop gcj support and rpeolib.
+
+* Mon Jul 19 2010 James Laska 0:1.9.14-2
+- Disable gcj_support
+- Updated nekohtml-jars.patch
+
+* Thu Jul 15 2010 James Laska 0:1.9.14-1
+- Update to 1.9.14
+
+* Wed May 13 2009 Martha Benitez 0:1.9.11-2.2
+- Build without aot-compile
+
+* Thu Mar 19 2009 David Walluck 0:1.9.11-2.1
+- BuildRequires: bcel
+- force use of xalan-j2
+
+* Wed Feb 11 2009 David Walluck 0:1.9.11-2
+- add repolib
+
+* Wed Feb 11 2009 David Walluck 0:1.9.11-1
+- 1.9.6.1
+
+* Mon Feb 12 2007 Jeff Johnston - 0:0.9.5-4jpp.1
+- Update to address Fedora review comments.
+
+* Mon May 08 2006 Ralph Apel - 0:0.9.5-4jpp
+- First JPP-1.7 release
+
+* Tue Oct 11 2005 Ralph Apel - 0:0.9.5-3jpp
+- Patch to JAXP13
+
+* Mon Aug 1 2005 Ville Skyttä - 0:0.9.5-2jpp
+- Fix unversioned xni jar symlink (#10).
+
+* Wed Jul 6 2005 Ville Skyttä - 0:0.9.5-1jpp
+- 0.9.5.
+
+* Wed Dec 15 2004 Ville Skyttä - 0:0.9.4-1jpp
+- Update to 0.9.4.
+
+* Tue Aug 24 2004 Fernando Nasser - 0:0.9.3-2jpp
+- Rebuild with Ant 1.6.2
+
+* Sat Jul 3 2004 Ville Skyttä - 0:0.9.3-1jpp
+- Update to 0.9.3.
+- Add nekohtml-filter script.
+
+* Thu Apr 1 2004 Ville Skyttä - 0:0.9.2-1jpp
+- Update to 0.9.2.
+
+* Sat Dec 13 2003 Ville Skyttä - 0:0.8.3-1jpp
+- Update to 0.8.3.
+
+* Sat Nov 15 2003 Ville Skyttä - 0:0.8.2-1jpp
+- Update to 0.8.2.
+
+* Wed Oct 1 2003 Ville Skyttä - 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ä - 0:0.7.7-1jpp
+- Update to 0.7.7.
+
+* Sun May 11 2003 David Walluck 0:0.7.6-1jpp
+- 0.7.6
+- update for JPackage 1.5
+
+* Sat Mar 29 2003 Ville Skyttä - 0.7.4-2jpp
+- Rebuilt for JPackage 1.5.
+
+* Tue Mar 4 2003 Ville Skyttä - 0.7.4-1jpp
+- Update to 0.7.4.
+
+* Mon Feb 24 2003 Ville Skyttä - 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ä - 0.7.2-1jpp
+- Update to 0.7.2.
+- Run unit tests when building.
+
+* Tue Dec 10 2002 Ville Skyttä - 0.7.1-1jpp
+- Update to 0.7.1.
-* Tue May 13 2014 Jeff Johnston - 0:1.9.20-1
-- Initial import of 1.9.20 package from F21 rawhide, scl-ized.
+* Sun Nov 3 2002 Ville Skyttä - 0.6.8-1jpp
+- 0.6.8, first JPackage release.