Compare commits

..

54 commits

Author SHA1 Message Date
Fedora Release Engineering
04d33f6e5f Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild 2026-01-16 21:59:34 +00:00
Jiri Vanek
09714b668b Bumped to jdk25 2026-01-06 14:53:26 +01:00
Jiri Vanek
c2d94ac1ec 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
f0486d02a8 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
500b3fb805 Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-24 22:42:13 +00:00
Fedora Release Engineering
dea32f8e2f Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-17 19:51:08 +00:00
Miroslav Suchý
36cf1b548f 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
24c18e72f0 Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-18 19:17:17 +00:00
Software Management Team
d3df538167 Eliminate use of obsolete %patchN syntax (#2283636) 2024-05-30 12:46:48 +02:00
Jiri Vanek
a19872b683 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
db9dac6064 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-25 08:44:51 +00:00
Fedora Release Engineering
fd65eb1ad3 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-21 09:24:55 +00:00
Fedora Release Engineering
97a6780777 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
9b5116d47f 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
10b8231ca3 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
515d1ae280 Rebuilt for Drop i686 JDKs
https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs
2022-07-08 16:20:00 +02:00
Jiri
44770b6c2a 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
64d758c5e6 - 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
a754d3e043 - 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
48e4b8b2df - 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
376d487077 - 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
5671b968be Rebuilt for JDK-11 2020-07-11 03:16:00 +02:00
Mat Booth
0fc410d0b2 Allow building against Java 11 2020-06-19 21:15:06 +01:00
Mat Booth
7ed7dd9b15 Remove unneeded dep on bcel 2020-05-17 17:27:50 +01:00
Fedora Release Engineering
c3081529b6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-01-29 14:45:11 +00:00
Fedora Release Engineering
84ea708a9c - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-07-25 18:26:18 +00:00
Fedora Release Engineering
46f607b1a2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-02-01 12:08:31 +00:00
Severin Gehwolf
00c454993e Add explicit requirement on javapackages-tools 2018-08-31 12:16:58 +02:00
Fedora Release Engineering
3f40a9448a - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-07-13 11:28:05 +00:00
Fedora Release Engineering
30815375e2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-02-08 03:58:10 +00:00
Fedora Release Engineering
7dcbcd517b - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild 2017-07-26 22:46:12 +00:00
Michael Simacek
4394c73345 Add xml-commons-apis to classpath for tests 2017-03-30 12:45:36 +02:00
Fedora Release Engineering
2832bd411a - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild 2017-02-10 22:09:33 +00:00
Fedora Release Engineering
a0e5d2ecae - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild 2016-02-04 09:11:05 +00:00
Michael Simacek
1a97016e6e Update to upstream version 1.9.22 2015-07-14 13:29:33 +02:00
Dennis Gilmore
ef707f80a0 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild 2015-06-17 21:36:09 +00:00
Mat Booth
64c141937c Add "Import-Package" to OSGi metadata so that classes from xerces can
be resolved.
2014-08-19 17:50:49 +01:00
Mikolaj Izdebski
8621639e53 Upload POM file to lookaside cache 2014-07-09 09:15:40 +02:00
Dennis Gilmore
8fe49eab8a - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild 2014-06-07 07:19:28 -05:00
Mikolaj Izdebski
5c3ea0e466 Update to upstream version 1.9.21 2014-06-05 13:27:07 +02:00
Jeff Johnston
e06d3dd71c Uncomment application of patch2. 2014-05-12 18:35:33 -04:00
Jeff Johnston
10c7e7f390 Add Export-Package statement to MANIFEST.MF. 2014-05-12 18:06:07 -04:00
Jeff Johnston
060ec1dfe1 Change Bundle-Name to be Bundle-SymbolicName. 2014-05-12 16:49:57 -04:00
Jeff Johnston
55d05a332d Add OSGI Bundle-Name and Bundle-Version to generated manifest 2014-05-12 13:46:34 -04:00
Michael Simacek
0897fd3163 Update to upstream version 1.9.20 2014-03-19 17:19:39 +01:00
Dennis Gilmore
8c2418688d - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild 2013-08-03 07:56:23 -05:00
Dennis Gilmore
92ab7c544a - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild 2013-02-14 02:04:32 -06:00
Mikolaj Izdebski
f29789fefd Add addiotional depmap 2012-11-01 15:39:14 +01:00
Dennis Gilmore
ea8ce92365 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild 2012-07-19 23:16:30 -05:00
Bill Nottingham
cd7750d196 xerces-j2-javadocs got merged. 2012-06-12 11:08:26 -04:00
Dennis Gilmore
e4b1b3a61d - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild 2012-01-13 04:57:32 -06:00
Alexander Kurtakov
e619dc7234 Add pom.xml and adapt to current guidelines. 2011-11-01 21:40:34 +02:00
Dennis Gilmore
9a92f72b7c - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild 2011-02-08 17:36:17 -06:00
Alexander Kurtakov
b1e3d01e43 - Drop gcj support and rpeolib. 2010-10-06 16:38:38 +03:00
6 changed files with 321 additions and 179 deletions

9
.gitignore vendored
View file

@ -1 +1,8 @@
nekohtml-1.9.14.tar.gz
/nekohtml-*.tar.gz
/nekohtml-*/
/nekohtml-*.pom
/.build-*.log
/noarch
/*.src.rpm
/.project
/nekohtml-1.9.22.tar.bz2

View file

@ -1,18 +1,31 @@
--- 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 @@
From 085262f5d43cc9541480392910f29091ef678217 Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com>
Date: Tue, 14 Jul 2015 11:20:41 +0200
Subject: [PATCH 1/3] Crosslink javadoc
---
build.xml | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/build.xml b/build.xml
index 8cbab8e..d36f42b 100644
--- a/build.xml
+++ b/build.xml
@@ -41,7 +41,12 @@
<property name='version.java.dir' value='${build.src.dir}/org/cyberneko/html'/>
<property name='version.java' value='${version.java.dir}/Version.java'/>
-
+
+ <property name='bcel.javadoc' value='http://jakarta.apache.org/bcel/apidocs/'/>
+ <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/'/>
+
<!-- DEPENDENCIES -->
<available property='bcel.available' file='${lib.dir}/bcel-5.2.jar' />
@@ -171,8 +176,12 @@
<!-- defined maven snapshots and staging repository id and url -->
<property name="maven-snapshots-repository-id" value="sonatype-nexus-snapshots" />
<property name="maven-snapshots-repository-url" value="https://oss.sonatype.org/content/repositories/snapshots/" />
@@ -178,8 +183,12 @@
author='true' version='true' use='true'
windowtitle="${Name} Implementation"
doctitle="${Name}" encoding="ISO-8859-1"
@ -27,3 +40,6 @@
</target>
<target name='doc-init'>
--
2.1.0

View file

@ -1,7 +1,18 @@
--- nekohtml-1.9.14/build.xml.orig 2010-07-19 13:56:56.190200850 -0400
+++ nekohtml-1.9.14/build.xml 2010-07-19 14:06:07.908202000 -0400
@@ -48,7 +48,7 @@
<property name='xerces.javadoc' value='http://xml.apache.org/xerces2-j/javadocs/xerces2/'/>
From 03b255b50250861a630cd72cb3fae30c7f0f5987 Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com>
Date: Tue, 14 Jul 2015 11:20:59 +0200
Subject: [PATCH 2/3] Jar paths
---
build.xml | 20 +++++++++++---------
1 file changed, 11 insertions(+), 9 deletions(-)
diff --git a/build.xml b/build.xml
index d36f42b..1f00059 100644
--- a/build.xml
+++ b/build.xml
@@ -54,7 +54,7 @@
<property name="maven-staging-repository-url" value="https://oss.sonatype.org/service/local/staging/deploy/maven2/" />
<!-- DEPENDENCIES -->
- <available property='bcel.available' file='${lib.dir}/bcel-5.2.jar' />
@ -9,7 +20,7 @@
<property name="xerces.version" value="2.9.1"/>
@@ -77,7 +77,7 @@
@@ -83,7 +83,7 @@
source='${compile.source}' target='${compile.target}'
includeAntRuntime='false'>
<classpath>
@ -18,7 +29,7 @@
</classpath>
<src path='${src.dir}' />
<src path='${build.src.dir}' />
@@ -88,7 +88,7 @@
@@ -94,7 +94,7 @@
source='${compile.source}' target='${compile.target}'
includeAntRuntime='false'>
<classpath>
@ -27,21 +38,22 @@
</classpath>
<src path='${src.dir}' />
<src path='${build.src.dir}' />
@@ -102,11 +102,13 @@
@@ -108,12 +108,14 @@
unless="compile.skip">
<mkdir dir="${build.classes.dir}"/>
+ <!--
+ <!--
<compileWith xercesVersion="2.0.2" bridge="2_0"/>
<compileWith xercesVersion="2.1.0" bridge="2_1"/>
<compileWith xercesVersion="2.2.1" bridge="2_2"/>
<compileWith xercesVersion="2.3.0" bridge="2_3"/>
<compileWith xercesVersion="2.8.1" bridge="2_3"/>
+ -->
<compileWith xercesVersion="2.9.1" bridge="2_3"/>
+ -->
<compileWith xercesVersion="2.10.0" bridge="2_3"/>
<copy todir="${build.classes.dir}">
@@ -229,7 +231,7 @@
@@ -236,7 +238,7 @@ public class Version {
<java classname='org.apache.tools.ant.Main'>
<classpath>
<pathelement path='${java.class.path}' />
@ -50,16 +62,16 @@
</classpath>
<arg value='x-minimal' />
</java>
@@ -270,7 +272,7 @@
@@ -277,7 +279,7 @@ public class Version {
source='${compile.source}' target='${compile.target}'
includeAntRuntime='true'>
<classpath>
- <fileset dir='${lib.dir}' includes='xml-apis.jar,xerces*.jar, junit*.jar' />
+ <fileset dir='${lib.dir}' includes='xml-commons-apis.jar,xerces-j2.jar,junit.jar' />
+ <fileset dir='${lib.dir}' includes='xml-commons-apis.jar,xerces-j2.jar, junit.jar' />
<pathelement location='${build.classes.dir}' />
</classpath>
<src path='${src.test.dir}' />
@@ -291,8 +293,8 @@
@@ -298,8 +300,8 @@ public class Version {
<classpath>
<pathelement path='${build.test-classes.dir}'/>
<pathelement location='${build.classes.dir}' />
@ -70,25 +82,30 @@
</classpath>
<formatter type="xml"/>
@@ -311,10 +313,12 @@
@@ -318,13 +320,13 @@ public class Version {
<mkdir dir="${build.dir}/junit"/>
<testWith xercesVersion="2.11.0"/>
+ <!--
<testWith xercesVersion="2.10.0"/>
<testWith xercesVersion="2.9.1"/>
+ <!--
<testWith xercesVersion="2.8.1"/>
<testWith xercesVersion="2.3.0"/>
<testWith xercesVersion="2.2.1"/>
<testWith xercesVersion="minimal"/>
+ -->
<!--
- <!--
<testWith xercesVersion="2.1.0"/>
<testWith xercesVersion="2.0.2"/>
@@ -351,7 +355,7 @@
<fileset dir='${build.src.dir}' />
</jar>
-->
@@ -397,7 +399,7 @@ public class Version {
</target>
- <path id="maven-ant-tasks.classpath" path="lib/maven-ant-tasks-2.0.8.jar" />
+ <path id="maven-ant-tasks.classpath" path="${lib.dir}/maven-ant-tasks.jar" />
<target name="-defineMavenAntTasks">
- <path id="maven-ant-tasks.classpath" path="lib/maven-ant-tasks-2.1.3.jar" />
+ <path id="maven-ant-tasks.classpath" path="lib/maven-ant-tasks.jar" />
<typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant"
classpathref="maven-ant-tasks.classpath" />
<artifact:pom id="maven.project" file="pom.xml" />
--
2.1.0

View file

@ -0,0 +1,27 @@
From 1cbc54dc98b762c4ba3b1daffc2cf5a1116732ef Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com>
Date: Tue, 14 Jul 2015 11:21:21 +0200
Subject: [PATCH 3/3] Add OSGi attributes
---
build.xml | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/build.xml b/build.xml
index 1f00059..194b0bf 100644
--- a/build.xml
+++ b/build.xml
@@ -129,6 +129,10 @@
<jar jarfile='${jar.file}'>
<manifest>
<attribute name="Built-By" value="${author}"/>
+ <attribute name="Bundle-SymbolicName" value="${package}" />
+ <attribute name="Bundle-Version" value="${version}" />
+ <attribute name="Export-Package" value="org.cyberneko.html,org.cyberneko.html.filters,org.cyberneko.html.parsers,org.cyberneko.html.xercesbridge" />
+ <attribute name="Import-Package" value="org.apache.xerces.util,org.apache.xerces.xni,org.apache.xerces.xni.parser,org.apache.xerces.impl" />
<section name="org/cyberneko/html/">
<attribute name="Specification-Title" value="Hyper-Text Markup Language (HTML)" />
<attribute name="Specification-Version" value="4.01" />
--
2.1.0

View file

@ -28,56 +28,39 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
%define with() %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}}
%define without() %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}}
%define bcond_with() %{expand:%%{?_with_%{1}:%%global with_%{1} 1}}
%define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}
%bcond_without repolib
%bcond_with gcj_support
%define repodir %{_javadir}/repository.jboss.com/nekohtml/%{version}-brew
%define repodirlib %{repodir}/lib
%define repodirsrc %{repodir}/src
%define section free
Name: nekohtml
Version: 1.9.14
Release: 2%{?dist}
Version: 1.9.22
Release: 34%{?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/
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.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
# 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
# find nekohtml-1.9.22 -name '*.jar' -delete
# tar cjf nekohtml-1.9.22.tar.bz2 nekohtml-1.9.22/
Source0: %{name}-%{version}.tar.bz2
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
BuildRequires: ant
Source3: http://central.maven.org/maven2/net/sourceforge/%{name}/%{name}/%{version}/%{name}-%{version}.pom
Patch0: 0001-Crosslink-javadoc.patch
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: 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: ant-junit
BuildRequires: ant-trax
BuildRequires: java-javadoc
BuildRequires: bcel
BuildRequires: bcel-javadoc
BuildRequires: xerces-j2 >= 0:2.7.1
BuildRequires: xerces-j2-javadoc-xni
BuildRequires: xerces-j2-javadoc-impl
BuildRequires: xml-commons-jaxp-1.3-apis
%if %with gcj_support
BuildRequires: java-gcj-compat-devel
%else
BuildRequires: xerces-j2
BuildRequires: xml-commons-apis
BuildArch: noarch
BuildRequires: java-devel >= 1.6.0
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
ExclusiveArch: %{java_arches} noarch
%description
NekoHTML is a simple HTML scanner and tag balancer that enables
@ -94,142 +77,233 @@ rewriting code.
%package javadoc
Summary: Javadoc for %{name}
Group: Development/Documentation
%description javadoc
Javadoc for %{name}.
%package demo
Summary: Demo for %{name}
Group: Development/Libraries/Java
Requires: %{name} = %{epoch}:%{version}-%{release}
%description demo
Demonstrations and samples for %{name}.
%if %with repolib
%package repolib
Summary: Artifacts to be uploaded to a repository library
Group: Development/Libraries/Java
%description repolib
Artifacts to be uploaded to a repository library.
This package is not meant to be installed but so its contents
can be extracted through rpm2cpio.
%endif
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%{_bindir}/find . -name "*.jar" | %{_bindir}/xargs -t %{__rm}
%{__perl} -pi -e 's/\r$//g' *.txt doc/*.html
%{__rm} -r doc/javadoc
%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
%mvn_alias net.sourceforge.%{name}:%{name} %{name}:%{name}
%mvn_package net.sourceforge.%{name}:%{name}-samples demo
%mvn_file ':{*}' @1
%build
export CLASSPATH=$(build-classpath bcel xerces-j2)
export OPT_JAR_LIST="`%{__cat} %{_sysconfdir}/ant.d/junit` ant/ant-trax xalan-j2"
%{ant} \
export CLASSPATH=$(build-classpath bcel xerces-j2 xml-commons-apis)
ant -Dcompile.source=1.8 -Dcompile.target=1.8 \
-Dbuild.sysclasspath=first \
-Dlib.dir=%{_javadir} \
-Djar.file=%{name}-%{version}.jar \
-Djar.xni.file=%{name}-xni-%{version}.jar \
-Djar.samples.file=%{name}-samples-%{version}.jar \
-Djar.file=%{name}.jar \
-Djar.xni.file=%{name}-xni.jar \
-Djar.samples.file=%{name}-samples.jar \
-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
clean jar jar-xni test doc
# test - disabled because it makes the build failing
%mvn_artifact %{SOURCE3} %{name}.jar
%mvn_artifact net.sourceforge.%{name}:%{name}-xni:%{version} %{name}-xni.jar
%mvn_artifact net.sourceforge.%{name}:%{name}-samples:%{version} %{name}-samples.jar
%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
%mvn_install -J build/doc/javadoc
# Scripts
install -Dpm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/%{name}-filter
%jpackage_script org.cyberneko.html.filters.Writer "" "" "nekohtml:xerces-j2" nekohtml-filter true
# 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
%if %with gcj_support
%{_bindir}/aot-compile-rpm
%endif
%clean
rm -rf $RPM_BUILD_ROOT
%if %with gcj_support
%post
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%postun
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif
%files
%defattr(0644,root,root,0755)
%files -f .mfiles
%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 %with gcj_support
%dir %{_libdir}/gcj/%{name}
%attr(-,root,root) %{_libdir}/gcj/%{name}/*
%endif
%{_bindir}/%{name}-filter
%files javadoc
%defattr(0644,root,root,0755)
%{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}
%files javadoc -f .mfiles-javadoc
%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
%files demo -f .mfiles-demo
%changelog
* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.9.22-34
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
* 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
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.9.22-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.9.22-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Fri Aug 31 2018 Severin Gehwolf <sgehwolf@redhat.com> - 0:1.9.22-8
- Add explicit requirement on javapackages-tools since nekohtml-filter
script uses java-functions. See RHBZ#1600426.
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.9.22-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.9.22-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.9.22-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Thu Mar 30 2017 Michael Simacek <msimacek@redhat.com> - 0:1.9.22-4
- Add xml-commons-apis to classpath for tests
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.9.22-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.9.22-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Tue Jul 14 2015 Michael Simacek <msimacek@redhat.com> - 0:1.9.22-1
- Update to upstream version 1.9.22
- Enable tests
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.9.21-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Tue Aug 19 2014 Mat Booth <mat.booth@redhat.com> - 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 <rel-eng@lists.fedoraproject.org> - 0:1.9.21-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Thu Jun 5 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.9.21-1
- Update to upstream version 1.9.21
* Mon May 12 2014 Jeff Johnston <jjohnstn@redhat.com> - 0:1.9.20-4
- Add Export-Package statement to MANIFEST.MF.
* Mon May 12 2014 Jeff Johnston <jjohnstn@redhat.com> - 0:1.9.20-3
- Change Bundle-Name to be Bundle-SymbolicName.
* Mon May 12 2014 Jeff Johnston <jjohnstn@redhat.com> - 0:1.9.20-2
- Add OSGI Bundle-Name and Bundle-Version to generated manifest
* Tue Mar 18 2014 Michael Simacek <msimacek@redhat.com> - 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 <rel-eng@lists.fedoraproject.org> - 0:1.9.14-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.9.14-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
* Thu Nov 1 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.9.14-10
- Add addiotional depmap
* Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.9.14-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
* Tue Jun 12 2012 Bill Nottingham <notting@redhat.com> 0:1.9.14-7
- Update buildreqs to packages that currently exist
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.9.14-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
* Tue Nov 1 2011 Alexander Kurtakov <akurtako@redhat.com> 0:1.9.14-6
- Adapt to current guidelines.
* Mon Oct 10 2011 Andy Grimm <agrimm@gmail.com> - 0:1.9.14-5
- Add POM file (BZ #735521)
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.9.14-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
* Wed Oct 6 2010 Alexander Kurtakov <akurtako@redhat.com> 0:1.9.14-3
- Drop gcj support and rpeolib.
* Mon Jul 19 2010 James Laska <jlaska@redhat.com> 0:1.9.14-2
- Disable gcj_support
- Updated nekohtml-jars.patch
* Mon Jul 15 2010 James Laska <jlaska@redhat.com> 0:1.9.14-1
* Thu Jul 15 2010 James Laska <jlaska@redhat.com> 0:1.9.14-1
- Update to 1.9.14
* Wed May 13 2009 Martha Benitez <mbenitez@redhat.com> 0:1.9.11-2.2

View file

@ -1 +1,2 @@
d6576e9d2040bce54c3266ddc37cf0aa nekohtml-1.9.14.tar.gz
2745bff457e7b74fe397aa5624696dc1 nekohtml-1.9.22.tar.bz2
d326e5102974288b4e13185e72cc9cb9 nekohtml-1.9.22.pom