Compare commits

...
Sign in to create a new pull request.

23 commits

Author SHA1 Message Date
Jiri Vanek
5dcdbf72b7 Bumped to jdk25 2026-01-06 14:53:26 +01:00
Jiri Vanek
ee8be08942 Rrevert to jdk21
during rebuild for https://fedoraproject.org/wiki/Changes/Java25AndNoMoreSystemJdk
your package failed to build. Is preemptively reverted back to versioned jdk21
2025-07-30 14:09:16 +02:00
Jiri Vanek
4149f6a6f5 Rebuilt for java-25-openjdk as preffered jdk
https://fedoraproject.org/wiki/Changes/Java25AndNoMoreSystemJdk
Note, that since f43, you should be always explicit on what jdk to use.
This commit should do exactly that.
2025-07-30 00:48:55 +02:00
Fedora Release Engineering
a4cc38356c Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-24 22:42:13 +00:00
Fedora Release Engineering
3a9bf99b63 Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-17 19:51:08 +00:00
Miroslav Suchý
3547ded898 convert ASL 2.0 license to SPDX
This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4
2024-07-24 16:43:48 +02:00
Fedora Release Engineering
bd5822d619 Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-18 19:17:17 +00:00
Software Management Team
6415340f5b Eliminate use of obsolete %patchN syntax (#2283636) 2024-05-30 12:46:48 +02:00
Jiri Vanek
88248f3660 Rebuilt for java-21-openjdk as system jdk
https://fedoraproject.org/wiki/Changes/Java21
2024-02-27 17:28:53 +01:00
Fedora Release Engineering
5ec25baaa1 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-25 08:44:51 +00:00
Fedora Release Engineering
4924f4b07d Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-21 09:24:55 +00:00
Fedora Release Engineering
efec353b9d Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-07-20 16:26:05 +00:00
Fedora Release Engineering
98a488de4d Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-01-19 21:21:51 +00:00
Fedora Release Engineering
5135b309c1 Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-22 00:21:06 +00:00
Jiri
f906e28544 Rebuilt for Drop i686 JDKs
https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs
2022-07-08 16:20:00 +02:00
Jiri
3cab7e9c72 Rebuilt for java-17-openjdk as system jdk
https://fedoraproject.org/wiki/Changes/Java17
2022-02-05 23:08:12 +01:00
Fedora Release Engineering
a010ca87dd - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-01-20 20:59:58 +00:00
Fedora Release Engineering
6203e5da8a - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-22 15:56:30 +00:00
Fedora Release Engineering
0a51eda033 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-01-26 21:20:26 +00:00
Fedora Release Engineering
0df7f80b28 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-07-28 08:58:35 +00:00
Jiri
7a1fc1d50e Rebuilt for JDK-11 2020-07-11 03:16:00 +02:00
Mat Booth
f41c932044 Allow building against Java 11 2020-06-19 21:15:06 +01:00
Mat Booth
03af1a5c3f Remove unneeded dep on bcel 2020-05-17 17:27:50 +01:00
2 changed files with 78 additions and 59 deletions

View file

@ -1,45 +0,0 @@
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>net.sourceforge.nekohtml</groupId>
<artifactId>nekohtml</artifactId>
<name>Neko HTML</name>
<description>An HTML parser and tag balancer.</description>
<version>1.9.20</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.10.0</version>
</dependency>
</dependencies>
<developers>
<developer>
<name>Andy Clark</name>
</developer>
<developer>
<name>Marc Guillemot</name>
<id>mguillem</id>
<email>mguillem@users.sourceforge.net</email>
<url>http://mguillem.wordpress.com/</url>
<timezone>+1</timezone>
</developer>
</developers>
<distributionManagement>
<repository>
<id>nexus-releases</id>
<name>Nexus Release Repository</name>
<url>http://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
</distributionManagement>
</project>

View file

@ -30,10 +30,11 @@
Name: nekohtml
Version: 1.9.22
Release: 11%{?dist}
Release: 33%{?dist}
Epoch: 0
Summary: HTML scanner and tag balancer
License: ASL 2.0
# Automatically converted from old format: ASL 2.0 - review is highly recommended.
License: Apache-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
@ -47,22 +48,19 @@ 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: bcel
Requires: xerces-j2 >= 0:2.7.1
Requires: xerces-j2
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
BuildRequires: ant
BuildRequires: javapackages-local-openjdk25
BuildRequires: ant-openjdk25
BuildRequires: ant-junit
BuildRequires: bcel
BuildRequires: bcel-javadoc
BuildRequires: xerces-j2 >= 0:2.7.1
BuildRequires: xerces-j2-javadoc
BuildRequires: xerces-j2
BuildRequires: xml-commons-apis
BuildArch: noarch
ExclusiveArch: %{java_arches} noarch
%description
NekoHTML is a simple HTML scanner and tag balancer that enables
@ -92,13 +90,16 @@ Demonstrations and samples for %{name}.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch -P0 -p1
%patch -P1 -p1
%patch -P2 -p1
find -name "*.jar" -delete
sed -i 's/\r$//g' *.txt doc/*.html
# disable javadoc linting
sed -i -e '/<\/javadoc>/i<arg value="-Xdoclint:none"\/>' build.xml
# cannonization test fails on some whitespace, TODO investigate
rm data/meta/test-meta-encoding3.html
@ -108,7 +109,7 @@ rm data/meta/test-meta-encoding3.html
%build
export CLASSPATH=$(build-classpath bcel xerces-j2 xml-commons-apis)
%{ant} \
ant -Dcompile.source=1.8 -Dcompile.target=1.8 \
-Dbuild.sysclasspath=first \
-Dlib.dir=%{_javadir} \
-Djar.file=%{name}.jar \
@ -140,6 +141,69 @@ export CLASSPATH=$(build-classpath bcel xerces-j2 xml-commons-apis)
%files demo -f .mfiles-demo
%changelog
* Wed Jul 30 2025 jiri vanek <jvanek@redhat.com> - 0:1.9.22-32
- Rrevert to jdk21
* Tue Jul 29 2025 jiri vanek <jvanek@redhat.com> - 0:1.9.22-31
- Rebuilt for java-25-openjdk as preffered jdk
* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.9.22-30
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.9.22-29
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Wed Jul 24 2024 Miroslav Suchý <msuchy@redhat.com> - 0:1.9.22-28
- convert license to SPDX
* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.9.22-27
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Tue Feb 27 2024 Jiri Vanek <jvanek@redhat.com> - 0:1.9.22-26
- Rebuilt for java-21-openjdk as system jdk
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.9.22-25
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.9.22-24
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.9.22-23
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.9.22-22
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.9.22-21
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Fri Jul 08 2022 Jiri Vanek <jvanek@redhat.com> - 0:1.9.22-20
- Rebuilt for Drop i686 JDKs
* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 0:1.9.22-19
- Rebuilt for java-17-openjdk as system jdk
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.9.22-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.9.22-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.9.22-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.9.22-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 0:1.9.22-14
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
* Fri Jun 19 2020 Mat Booth <mat.booth@redhat.com> - 0:1.9.22-13
- Allow building against Java 11
* Sun May 17 2020 Mat Booth <mat.booth@redhat.com> - 0:1.9.22-12
- Remove unneeded dep on bcel
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.9.22-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild