diff --git a/nekohtml-1.9.20.pom b/nekohtml-1.9.20.pom new file mode 100644 index 0000000..d568241 --- /dev/null +++ b/nekohtml-1.9.20.pom @@ -0,0 +1,45 @@ + + 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/nekohtml.spec b/nekohtml.spec index 534b50a..f0f8604 100644 --- a/nekohtml.spec +++ b/nekohtml.spec @@ -30,11 +30,10 @@ Name: nekohtml Version: 1.9.22 -Release: 33%{?dist} +Release: 10%{?dist} Epoch: 0 Summary: HTML scanner and tag balancer -# Automatically converted from old format: ASL 2.0 - review is highly recommended. -License: Apache-2.0 +License: ASL 2.0 URL: http://nekohtml.sourceforge.net/ # No upstream tarball for this release # svn export svn://svn.code.sf.net/p/nekohtml/code/branches/nekohtml-1.9.22 nekohtml-1.9.22 @@ -48,19 +47,22 @@ Patch1: 0002-Jar-paths.patch # Add proper attributes to MANIFEST.MF file so bundle can be used by other OSGI bundles. Patch2: 0003-Add-OSGi-attributes.patch -Requires: xerces-j2 +Requires: bcel +Requires: xerces-j2 >= 0:2.7.1 Requires: xml-commons-apis # Explicit requires for javapackages-tools since nekohtml-filter script # uses /usr/share/java-utils/java-functions Requires: javapackages-tools -BuildRequires: javapackages-local-openjdk25 -BuildRequires: ant-openjdk25 +BuildRequires: javapackages-local +BuildRequires: ant BuildRequires: ant-junit -BuildRequires: xerces-j2 +BuildRequires: bcel +BuildRequires: bcel-javadoc +BuildRequires: xerces-j2 >= 0:2.7.1 +BuildRequires: xerces-j2-javadoc BuildRequires: xml-commons-apis BuildArch: noarch -ExclusiveArch: %{java_arches} noarch %description NekoHTML is a simple HTML scanner and tag balancer that enables @@ -90,16 +92,13 @@ Demonstrations and samples for %{name}. %prep %setup -q -%patch -P0 -p1 -%patch -P1 -p1 -%patch -P2 -p1 +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 find -name "*.jar" -delete sed -i 's/\r$//g' *.txt doc/*.html -# disable javadoc linting -sed -i -e '/<\/javadoc>/i' build.xml - # cannonization test fails on some whitespace, TODO investigate rm data/meta/test-meta-encoding3.html @@ -109,7 +108,7 @@ rm data/meta/test-meta-encoding3.html %build export CLASSPATH=$(build-classpath bcel xerces-j2 xml-commons-apis) -ant -Dcompile.source=1.8 -Dcompile.target=1.8 \ +%{ant} \ -Dbuild.sysclasspath=first \ -Dlib.dir=%{_javadir} \ -Djar.file=%{name}.jar \ @@ -141,72 +140,6 @@ ant -Dcompile.source=1.8 -Dcompile.target=1.8 \ %files demo -f .mfiles-demo %changelog -* Wed Jul 30 2025 jiri vanek - 0:1.9.22-32 -- Rrevert to jdk21 - -* Tue Jul 29 2025 jiri vanek - 0:1.9.22-31 -- Rebuilt for java-25-openjdk as preffered jdk - -* Thu Jul 24 2025 Fedora Release Engineering - 0:1.9.22-30 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Fri Jan 17 2025 Fedora Release Engineering - 0:1.9.22-29 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Wed Jul 24 2024 Miroslav Suchý - 0:1.9.22-28 -- convert license to SPDX - -* Thu Jul 18 2024 Fedora Release Engineering - 0:1.9.22-27 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Tue Feb 27 2024 Jiri Vanek - 0:1.9.22-26 -- Rebuilt for java-21-openjdk as system jdk - -* Thu Jan 25 2024 Fedora Release Engineering - 0:1.9.22-25 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sun Jan 21 2024 Fedora Release Engineering - 0:1.9.22-24 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Thu Jul 20 2023 Fedora Release Engineering - 0:1.9.22-23 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Thu Jan 19 2023 Fedora Release Engineering - 0:1.9.22-22 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Fri Jul 22 2022 Fedora Release Engineering - 0:1.9.22-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Fri Jul 08 2022 Jiri Vanek - 0:1.9.22-20 -- Rebuilt for Drop i686 JDKs - -* Sat Feb 05 2022 Jiri Vanek - 0:1.9.22-19 -- Rebuilt for java-17-openjdk as system jdk - -* Thu Jan 20 2022 Fedora Release Engineering - 0:1.9.22-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Thu Jul 22 2021 Fedora Release Engineering - 0:1.9.22-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Jan 26 2021 Fedora Release Engineering - 0:1.9.22-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Jul 28 2020 Fedora Release Engineering - 0:1.9.22-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Sat Jul 11 2020 Jiri Vanek - 0:1.9.22-14 -- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - -* Fri Jun 19 2020 Mat Booth - 0:1.9.22-13 -- Allow building against Java 11 - -* Sun May 17 2020 Mat Booth - 0:1.9.22-12 -- Remove unneeded dep on bcel - -* Wed Jan 29 2020 Fedora Release Engineering - 0:1.9.22-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - * Thu Jul 25 2019 Fedora Release Engineering - 0:1.9.22-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild