From b1e3d01e4303631c50d811ba5fd235b5bd9e84c3 Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Wed, 6 Oct 2010 16:38:38 +0300 Subject: [PATCH 01/54] - Drop gcj support and rpeolib. --- nekohtml.spec | 90 +++++++-------------------------------------------- 1 file changed, 11 insertions(+), 79 deletions(-) diff --git a/nekohtml.spec b/nekohtml.spec index fa9512f..62762d9 100644 --- a/nekohtml.spec +++ b/nekohtml.spec @@ -28,23 +28,9 @@ # 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} +Release: 3%{?dist} Epoch: 0 Summary: HTML scanner and tag balancer License: ASL 2.0 @@ -63,7 +49,7 @@ Requires: xml-commons-jaxp-1.3-apis BuildRequires: jpackage-utils BuildRequires: ant BuildRequires: ant-junit -BuildRequires: ant-trax +BuildRequires: ant-nodeps BuildRequires: java-javadoc BuildRequires: bcel BuildRequires: bcel-javadoc @@ -71,12 +57,8 @@ 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 BuildArch: noarch BuildRequires: java-devel >= 1.6.0 -%endif BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root %description @@ -107,17 +89,6 @@ 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 @@ -128,7 +99,7 @@ can be extracted through rpm2cpio. %build export CLASSPATH=$(build-classpath bcel xerces-j2) -export OPT_JAR_LIST="`%{__cat} %{_sysconfdir}/ant.d/junit` ant/ant-trax xalan-j2" +export OPT_JAR_LIST="`%{__cat} %{_sysconfdir}/ant.d/junit` ant/ant-nodeps xalan-j2 xalan-j2-serializer" %{ant} \ -Dbuild.sysclasspath=first \ -Dlib.dir=%{_javadir} \ @@ -139,7 +110,8 @@ export OPT_JAR_LIST="`%{__cat} %{_sysconfdir}/ant.d/junit` ant/ant-trax xalan-j2 -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 doc +# test - disabled because it makes the build failing %install rm -rf $RPM_BUILD_ROOT @@ -159,72 +131,32 @@ 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) +%defattr(-,root,root,-) %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 %files javadoc -%defattr(0644,root,root,0755) +%defattr(-,root,root,-) %{_javadocdir}/%{name}-%{version} %{_javadocdir}/%{name} %files demo -%defattr(0644,root,root,0755) +%defattr(-,root,root,-) %{_javadir}/%{name}-samples-%{version}.jar %{_javadir}/%{name}-samples.jar -%if %with repolib -%files repolib -%defattr(0644,root,root,0755) -%{_javadir}/repository.jboss.com -%endif - %changelog +* 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 From 9a92f72b7c1c4be8b8475f9675d69f3b95119dbc Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 8 Feb 2011 17:36:17 -0600 Subject: [PATCH 02/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- nekohtml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nekohtml.spec b/nekohtml.spec index 62762d9..f8cfa90 100644 --- a/nekohtml.spec +++ b/nekohtml.spec @@ -30,7 +30,7 @@ Name: nekohtml Version: 1.9.14 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 0 Summary: HTML scanner and tag balancer License: ASL 2.0 @@ -154,6 +154,9 @@ rm -rf $RPM_BUILD_ROOT %{_javadir}/%{name}-samples.jar %changelog +* 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. From e619dc72344a944248fc4e18dc91f1031d02d343 Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Tue, 1 Nov 2011 21:40:34 +0200 Subject: [PATCH 03/54] Add pom.xml and adapt to current guidelines. --- nekohtml-1.9.14.pom | 41 ++++++++++++++++++++++++++++++++ nekohtml.spec | 57 +++++++++++++++++++++------------------------ 2 files changed, 67 insertions(+), 31 deletions(-) create mode 100644 nekohtml-1.9.14.pom diff --git a/nekohtml-1.9.14.pom b/nekohtml-1.9.14.pom new file mode 100644 index 0000000..afd2149 --- /dev/null +++ b/nekohtml-1.9.14.pom @@ -0,0 +1,41 @@ + + 4.0.0 + net.sourceforge.nekohtml + nekohtml + Neko HTML + 1.9.14 + 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.9.1 + + + + + nekohtml-m2-repo + + sftp://web.sourceforge.net/home/groups/n/ne/nekohtml/htdocs/m2-repo + + NekoHTML Maven 2 Repository + + + nekohtml-m2-repo-snapshots + + sftp://web.sourceforge.net/home/groups/n/ne/nekohtml/htdocs/m2-repo-snapshots + + NekoHTML Maven 2 Snapshots Repository + + + diff --git a/nekohtml.spec b/nekohtml.spec index f8cfa90..df36245 100644 --- a/nekohtml.spec +++ b/nekohtml.spec @@ -30,7 +30,7 @@ Name: nekohtml Version: 1.9.14 -Release: 4%{?dist} +Release: 6%{?dist} Epoch: 0 Summary: HTML scanner and tag balancer License: ASL 2.0 @@ -39,27 +39,26 @@ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar. # 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 Source2: nekohtml-component-info.xml +Source3: http://repo1.maven.org/maven2/net/sourceforge/nekohtml/nekohtml/1.9.14/nekohtml-1.9.14.pom Patch0: %{name}-crosslink.patch Patch1: %{name}-jars.patch -Group: Development/Libraries/Java +Group: Development/Libraries Requires: bcel Requires: jpackage-utils >= 0:1.6 Requires: xerces-j2 >= 0:2.7.1 -Requires: xml-commons-jaxp-1.3-apis +Requires: xml-commons-apis BuildRequires: jpackage-utils BuildRequires: ant BuildRequires: ant-junit -BuildRequires: ant-nodeps 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 +BuildRequires: xml-commons-apis BuildArch: noarch BuildRequires: java-devel >= 1.6.0 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root %description NekoHTML is a simple HTML scanner and tag balancer that enables @@ -76,14 +75,14 @@ rewriting code. %package javadoc Summary: Javadoc for %{name} -Group: Development/Documentation +Group: Documentation %description javadoc Javadoc for %{name}. %package demo Summary: Demo for %{name} -Group: Development/Libraries/Java +Group: Development/Libraries Requires: %{name} = %{epoch}:%{version}-%{release} %description demo @@ -99,13 +98,12 @@ Demonstrations and samples for %{name}. %build export CLASSPATH=$(build-classpath bcel xerces-j2) -export OPT_JAR_LIST="`%{__cat} %{_sysconfdir}/ant.d/junit` ant/ant-nodeps xalan-j2 xalan-j2-serializer" %{ant} \ -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 \ @@ -114,46 +112,43 @@ export OPT_JAR_LIST="`%{__cat} %{_sysconfdir}/ant.d/junit` ant/ant-nodeps xalan- # test - disabled because it makes the build failing %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 +install -p -m 644 %{name}{,-samples,-xni}.jar $RPM_BUILD_ROOT%{_javadir}/ # Scripts install -Dpm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/%{name}-filter -# 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} +# POM +install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir} +install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom +%add_maven_depmap JPP-%{name}.pom %{name}.jar -%clean -rm -rf $RPM_BUILD_ROOT +# Javadocs +install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name} +cp -a build/doc/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} %files -%defattr(-,root,root,-) %doc LICENSE.txt README.txt doc/*.html %attr(755,root,root) %{_bindir}/%{name}-filter -%{_javadir}/%{name}-%{version}.jar +%{_mavenpomdir}/* +%{_mavendepmapfragdir}/* %{_javadir}/%{name}.jar -%{_javadir}/%{name}-xni-%{version}.jar %{_javadir}/%{name}-xni.jar %files javadoc -%defattr(-,root,root,-) -%{_javadocdir}/%{name}-%{version} %{_javadocdir}/%{name} %files demo -%defattr(-,root,root,-) -%{_javadir}/%{name}-samples-%{version}.jar %{_javadir}/%{name}-samples.jar %changelog +* 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 From e4b1b3a61d6ac4ec58e95c15642e5dd1e3766b06 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 13 Jan 2012 04:57:32 -0600 Subject: [PATCH 04/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- nekohtml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nekohtml.spec b/nekohtml.spec index df36245..ae5e4e0 100644 --- a/nekohtml.spec +++ b/nekohtml.spec @@ -30,7 +30,7 @@ Name: nekohtml Version: 1.9.14 -Release: 6%{?dist} +Release: 7%{?dist} Epoch: 0 Summary: HTML scanner and tag balancer License: ASL 2.0 @@ -143,6 +143,9 @@ cp -a build/doc/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} %{_javadir}/%{name}-samples.jar %changelog +* 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. From cd7750d196ed1045df3ca1babbb2108e31551a9f Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 12 Jun 2012 11:08:26 -0400 Subject: [PATCH 05/54] xerces-j2-javadocs got merged. --- nekohtml.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/nekohtml.spec b/nekohtml.spec index ae5e4e0..a2206ce 100644 --- a/nekohtml.spec +++ b/nekohtml.spec @@ -30,7 +30,7 @@ Name: nekohtml Version: 1.9.14 -Release: 7%{?dist} +Release: 8%{?dist} Epoch: 0 Summary: HTML scanner and tag balancer License: ASL 2.0 @@ -54,8 +54,7 @@ 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: xerces-j2-javadoc BuildRequires: xml-commons-apis BuildArch: noarch BuildRequires: java-devel >= 1.6.0 @@ -143,6 +142,9 @@ cp -a build/doc/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} %{_javadir}/%{name}-samples.jar %changelog +* 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 From ea8ce92365682602d8ce65432b9e16e897bb34c2 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 19 Jul 2012 23:16:30 -0500 Subject: [PATCH 06/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- nekohtml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nekohtml.spec b/nekohtml.spec index a2206ce..1d8d614 100644 --- a/nekohtml.spec +++ b/nekohtml.spec @@ -30,7 +30,7 @@ Name: nekohtml Version: 1.9.14 -Release: 8%{?dist} +Release: 9%{?dist} Epoch: 0 Summary: HTML scanner and tag balancer License: ASL 2.0 @@ -142,6 +142,9 @@ cp -a build/doc/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} %{_javadir}/%{name}-samples.jar %changelog +* 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 From f29789fefd9a7d060ca240bc52270bcb2b49ad77 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 1 Nov 2012 15:39:14 +0100 Subject: [PATCH 07/54] Add addiotional depmap --- nekohtml.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/nekohtml.spec b/nekohtml.spec index 1d8d614..002b97b 100644 --- a/nekohtml.spec +++ b/nekohtml.spec @@ -30,7 +30,7 @@ Name: nekohtml Version: 1.9.14 -Release: 9%{?dist} +Release: 10%{?dist} Epoch: 0 Summary: HTML scanner and tag balancer License: ASL 2.0 @@ -121,7 +121,7 @@ install -Dpm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/%{name}-filter # POM install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir} install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom -%add_maven_depmap JPP-%{name}.pom %{name}.jar +%add_maven_depmap -a nekohtml:nekohtml # Javadocs install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name} @@ -142,6 +142,9 @@ cp -a build/doc/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} %{_javadir}/%{name}-samples.jar %changelog +* 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 From 92ab7c544a169b48f4b1bb1309e56fe0afb574e9 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 02:04:32 -0600 Subject: [PATCH 08/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- nekohtml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nekohtml.spec b/nekohtml.spec index 002b97b..2b1cd41 100644 --- a/nekohtml.spec +++ b/nekohtml.spec @@ -30,7 +30,7 @@ Name: nekohtml Version: 1.9.14 -Release: 10%{?dist} +Release: 11%{?dist} Epoch: 0 Summary: HTML scanner and tag balancer License: ASL 2.0 @@ -142,6 +142,9 @@ cp -a build/doc/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} %{_javadir}/%{name}-samples.jar %changelog +* 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 From 8c2418688d554db9dd604afc66ad043f072d2af9 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 3 Aug 2013 07:56:23 -0500 Subject: [PATCH 09/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- nekohtml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nekohtml.spec b/nekohtml.spec index 2b1cd41..6f9c60a 100644 --- a/nekohtml.spec +++ b/nekohtml.spec @@ -30,7 +30,7 @@ Name: nekohtml Version: 1.9.14 -Release: 11%{?dist} +Release: 12%{?dist} Epoch: 0 Summary: HTML scanner and tag balancer License: ASL 2.0 @@ -142,6 +142,9 @@ cp -a build/doc/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} %{_javadir}/%{name}-samples.jar %changelog +* 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 From 0897fd3163f8b635b8a619297f3bcf76d8405b77 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Tue, 4 Feb 2014 16:57:22 +0100 Subject: [PATCH 10/54] Update to upstream version 1.9.20 --- .gitignore | 1 + nekohtml-1.9.14.pom => nekohtml-1.9.20.pom | 34 ++++++----- nekohtml-crosslink.patch | 33 ++++++++--- nekohtml-jars.patch | 65 ++++++++++++++-------- nekohtml.spec | 63 ++++++++++----------- sources | 2 +- 6 files changed, 116 insertions(+), 82 deletions(-) rename nekohtml-1.9.14.pom => nekohtml-1.9.20.pom (51%) diff --git a/.gitignore b/.gitignore index 98a6a8d..9164ea5 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ nekohtml-1.9.14.tar.gz +/nekohtml-1.9.20.tar.gz diff --git a/nekohtml-1.9.14.pom b/nekohtml-1.9.20.pom similarity index 51% rename from nekohtml-1.9.14.pom rename to nekohtml-1.9.20.pom index afd2149..d568241 100644 --- a/nekohtml-1.9.14.pom +++ b/nekohtml-1.9.20.pom @@ -3,7 +3,8 @@ net.sourceforge.nekohtml nekohtml Neko HTML - 1.9.14 + An HTML parser and tag balancer. + 1.9.20 http://nekohtml.sourceforge.net/ @@ -19,23 +20,26 @@ xerces xercesImpl - 2.9.1 + 2.10.0 + + + Andy Clark + + + Marc Guillemot + mguillem + mguillem@users.sourceforge.net + http://mguillem.wordpress.com/ + +1 + + - nekohtml-m2-repo - - sftp://web.sourceforge.net/home/groups/n/ne/nekohtml/htdocs/m2-repo - - NekoHTML Maven 2 Repository + nexus-releases + Nexus Release Repository + http://oss.sonatype.org/service/local/staging/deploy/maven2/ - - nekohtml-m2-repo-snapshots - - sftp://web.sourceforge.net/home/groups/n/ne/nekohtml/htdocs/m2-repo-snapshots - - NekoHTML Maven 2 Snapshots Repository - - + diff --git a/nekohtml-crosslink.patch b/nekohtml-crosslink.patch index dcf8000..5ae9bf4 100644 --- a/nekohtml-crosslink.patch +++ b/nekohtml-crosslink.patch @@ -1,18 +1,32 @@ ---- 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 e71cb71827c1f83abcb1cbc152bb106ac00e9e63 Mon Sep 17 00:00:00 2001 +From: Michael Simacek +Date: Tue, 4 Feb 2014 14:53:11 +0100 +Subject: [PATCH] nekohtml crosslink + +Signed-off-by: Michael Simacek +--- + build.xml | 15 ++++++++++++--- + 1 file changed, 12 insertions(+), 3 deletions(-) + +diff --git a/build.xml b/build.xml +index 2f24269..f027529 100644 +--- a/build.xml ++++ b/build.xml +@@ -41,7 +41,12 @@ + - +- ++ + + + + + - - - -@@ -171,8 +176,12 @@ + + + +@@ -178,8 +183,12 @@ author='true' version='true' use='true' windowtitle="${Name} Implementation" doctitle="${Name}" encoding="ISO-8859-1" @@ -27,3 +41,6 @@ +-- +1.8.5.3 + diff --git a/nekohtml-jars.patch b/nekohtml-jars.patch index b8fdb52..ae528a1 100644 --- a/nekohtml-jars.patch +++ b/nekohtml-jars.patch @@ -1,7 +1,19 @@ ---- 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 @@ - +From 915d4b8410494f56c3dcf0e687c3a6e6f3a12d04 Mon Sep 17 00:00:00 2001 +From: Michael Simacek +Date: Tue, 4 Feb 2014 15:09:11 +0100 +Subject: [PATCH] nekohtml jars + +Signed-off-by: Michael Simacek +--- + build.xml | 22 +++++++++++++--------- + 1 file changed, 13 insertions(+), 9 deletions(-) + +diff --git a/build.xml b/build.xml +index f027529..64d0b1f 100644 +--- a/build.xml ++++ b/build.xml +@@ -54,7 +54,7 @@ + - @@ -9,7 +21,7 @@ -@@ -77,7 +77,7 @@ +@@ -83,7 +83,7 @@ source='${compile.source}' target='${compile.target}' includeAntRuntime='false'> @@ -18,7 +30,7 @@ -@@ -88,7 +88,7 @@ +@@ -94,7 +94,7 @@ source='${compile.source}' target='${compile.target}' includeAntRuntime='false'> @@ -27,21 +39,24 @@ -@@ -102,11 +102,13 @@ +@@ -107,13 +107,15 @@ + description="compiles many times to ensure compatibility with the different Xerces versions" unless="compile.skip"> - -+ ++ --> + -@@ -229,7 +231,7 @@ +@@ -236,7 +238,7 @@ public class Version { @@ -50,45 +65,49 @@ -@@ -270,7 +272,7 @@ +@@ -277,7 +279,7 @@ public class Version { source='${compile.source}' target='${compile.target}' includeAntRuntime='true'> - -+ ++ -@@ -291,8 +293,8 @@ +@@ -298,8 +300,8 @@ public class Version { - - + -+ ++ -@@ -311,10 +313,12 @@ +@@ -318,11 +320,13 @@ public class Version { + ++ ++ --> ++ --> @@ -81,25 +78,26 @@ index f027529..64d0b1f 100644 - - + -+ ++ -@@ -318,11 +320,13 @@ public class Version { +@@ -318,13 +320,13 @@ public class Version { + ++ - +@@ -397,7 +399,7 @@ public class Version { @@ -109,5 +107,5 @@ index f027529..64d0b1f 100644 classpathref="maven-ant-tasks.classpath" /> -- -1.8.5.3 +2.1.0 diff --git a/nekohtml-osgi.patch b/0003-Add-OSGi-attributes.patch similarity index 67% rename from nekohtml-osgi.patch rename to 0003-Add-OSGi-attributes.patch index 2b4903a..fad0aae 100644 --- a/nekohtml-osgi.patch +++ b/0003-Add-OSGi-attributes.patch @@ -1,6 +1,16 @@ -diff -up ./build.xml.fix ./build.xml ---- ./build.xml.fix 2014-05-12 18:02:07.855415796 -0400 -+++ ./build.xml 2014-05-12 18:03:02.519353974 -0400 +From 1cbc54dc98b762c4ba3b1daffc2cf5a1116732ef Mon Sep 17 00:00:00 2001 +From: Michael Simacek +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 @@ @@ -12,3 +22,6 @@ diff -up ./build.xml.fix ./build.xml
+-- +2.1.0 + diff --git a/nekohtml.spec b/nekohtml.spec index 708a9a3..60c1ffa 100644 --- a/nekohtml.spec +++ b/nekohtml.spec @@ -29,35 +29,36 @@ # Name: nekohtml -Version: 1.9.21 -Release: 4%{?dist} +Version: 1.9.22 +Release: 1%{?dist} Epoch: 0 Summary: HTML scanner and tag balancer License: ASL 2.0 URL: http://nekohtml.sourceforge.net/ -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +# 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 Source3: http://central.maven.org/maven2/net/sourceforge/%{name}/%{name}/%{version}/%{name}-%{version}.pom -Patch0: %{name}-crosslink.patch -Patch1: %{name}-jars.patch +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: %{name}-osgi.patch +Patch2: 0003-Add-OSGi-attributes.patch Requires: bcel Requires: xerces-j2 >= 0:2.7.1 Requires: xml-commons-apis -BuildRequires: maven-local +BuildRequires: javapackages-local BuildRequires: ant BuildRequires: 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 -Requires: java-headless - BuildArch: noarch %description @@ -90,10 +91,13 @@ Demonstrations and samples for %{name}. %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -find . -name "*.jar" | xargs -t %{__rm} -%{__perl} -pi -e 's/\r$//g' *.txt doc/*.html -%{__rm} -r doc/javadoc +%patch2 -p1 + +find -name "*.jar" -delete +sed -i 's/\r$//g' *.txt doc/*.html + +# 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 @@ -111,7 +115,7 @@ export CLASSPATH=$(build-classpath bcel xerces-j2) -Dj2se.javadoc=%{_javadocdir}/java \ -Dxni.javadoc=%{_javadocdir}/xerces-j2-xni \ -Dxerces.javadoc=%{_javadocdir}/xerces-j2-impl \ - clean jar jar-xni doc + clean jar jar-xni test doc # test - disabled because it makes the build failing %mvn_artifact %{SOURCE3} %{name}.jar @@ -133,6 +137,10 @@ export CLASSPATH=$(build-classpath bcel xerces-j2) %files demo -f .mfiles-demo %changelog +* Tue Jul 14 2015 Michael Simacek - 0:1.9.22-1 +- Update to upstream version 1.9.22 +- Enable tests + * Wed Jun 17 2015 Fedora Release Engineering - 0:1.9.21-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index e5b921d..0dd1f71 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -68ab893feae43024f12abedb5d67dfad nekohtml-1.9.21.tar.gz -3de26e7ced80c48e9aa2f30843c50909 nekohtml-1.9.21.pom +2745bff457e7b74fe397aa5624696dc1 nekohtml-1.9.22.tar.bz2 +d326e5102974288b4e13185e72cc9cb9 nekohtml-1.9.22.pom From a0e5d2ecae4b2039f56c18826f647d41accbea45 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 4 Feb 2016 09:11:05 +0000 Subject: [PATCH 21/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- nekohtml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nekohtml.spec b/nekohtml.spec index 60c1ffa..ed1f616 100644 --- a/nekohtml.spec +++ b/nekohtml.spec @@ -30,7 +30,7 @@ Name: nekohtml Version: 1.9.22 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 0 Summary: HTML scanner and tag balancer License: ASL 2.0 @@ -137,6 +137,9 @@ export CLASSPATH=$(build-classpath bcel xerces-j2) %files demo -f .mfiles-demo %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 0:1.9.22-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Tue Jul 14 2015 Michael Simacek - 0:1.9.22-1 - Update to upstream version 1.9.22 - Enable tests From 2832bd411a60122768c275fa25db3790bb4fa5df Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 22:09:33 +0000 Subject: [PATCH 22/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- nekohtml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nekohtml.spec b/nekohtml.spec index ed1f616..8a76930 100644 --- a/nekohtml.spec +++ b/nekohtml.spec @@ -30,7 +30,7 @@ Name: nekohtml Version: 1.9.22 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 0 Summary: HTML scanner and tag balancer License: ASL 2.0 @@ -137,6 +137,9 @@ export CLASSPATH=$(build-classpath bcel xerces-j2) %files demo -f .mfiles-demo %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 0:1.9.22-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Thu Feb 04 2016 Fedora Release Engineering - 0:1.9.22-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 4394c733450afeaa7b9c82eefc3583036abe9672 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Thu, 30 Mar 2017 12:45:36 +0200 Subject: [PATCH 23/54] Add xml-commons-apis to classpath for tests --- nekohtml.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/nekohtml.spec b/nekohtml.spec index 8a76930..90acb61 100644 --- a/nekohtml.spec +++ b/nekohtml.spec @@ -30,7 +30,7 @@ Name: nekohtml Version: 1.9.22 -Release: 3%{?dist} +Release: 4%{?dist} Epoch: 0 Summary: HTML scanner and tag balancer License: ASL 2.0 @@ -104,7 +104,7 @@ rm data/meta/test-meta-encoding3.html %mvn_file ':{*}' @1 %build -export CLASSPATH=$(build-classpath bcel xerces-j2) +export CLASSPATH=$(build-classpath bcel xerces-j2 xml-commons-apis) %{ant} \ -Dbuild.sysclasspath=first \ -Dlib.dir=%{_javadir} \ @@ -137,6 +137,9 @@ export CLASSPATH=$(build-classpath bcel xerces-j2) %files demo -f .mfiles-demo %changelog +* Thu Mar 30 2017 Michael Simacek - 0:1.9.22-4 +- Add xml-commons-apis to classpath for tests + * Fri Feb 10 2017 Fedora Release Engineering - 0:1.9.22-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 7dcbcd517b4ab53210fedd269a3c75dc5d10d463 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 22:46:12 +0000 Subject: [PATCH 24/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- nekohtml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nekohtml.spec b/nekohtml.spec index 90acb61..7a1d61d 100644 --- a/nekohtml.spec +++ b/nekohtml.spec @@ -30,7 +30,7 @@ Name: nekohtml Version: 1.9.22 -Release: 4%{?dist} +Release: 5%{?dist} Epoch: 0 Summary: HTML scanner and tag balancer License: ASL 2.0 @@ -137,6 +137,9 @@ export CLASSPATH=$(build-classpath bcel xerces-j2 xml-commons-apis) %files demo -f .mfiles-demo %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 0:1.9.22-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Thu Mar 30 2017 Michael Simacek - 0:1.9.22-4 - Add xml-commons-apis to classpath for tests From 30815375e23830912c05c0dc05ed83ffa8577707 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 8 Feb 2018 03:58:10 +0000 Subject: [PATCH 25/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- nekohtml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nekohtml.spec b/nekohtml.spec index 7a1d61d..78e0cc8 100644 --- a/nekohtml.spec +++ b/nekohtml.spec @@ -30,7 +30,7 @@ Name: nekohtml Version: 1.9.22 -Release: 5%{?dist} +Release: 6%{?dist} Epoch: 0 Summary: HTML scanner and tag balancer License: ASL 2.0 @@ -137,6 +137,9 @@ export CLASSPATH=$(build-classpath bcel xerces-j2 xml-commons-apis) %files demo -f .mfiles-demo %changelog +* Thu Feb 08 2018 Fedora Release Engineering - 0:1.9.22-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 0:1.9.22-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 3f40a9448a2a490bf883e0c2d28f4bfd70670794 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 11:28:05 +0000 Subject: [PATCH 26/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- nekohtml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nekohtml.spec b/nekohtml.spec index 78e0cc8..e133eb0 100644 --- a/nekohtml.spec +++ b/nekohtml.spec @@ -30,7 +30,7 @@ Name: nekohtml Version: 1.9.22 -Release: 6%{?dist} +Release: 7%{?dist} Epoch: 0 Summary: HTML scanner and tag balancer License: ASL 2.0 @@ -137,6 +137,9 @@ export CLASSPATH=$(build-classpath bcel xerces-j2 xml-commons-apis) %files demo -f .mfiles-demo %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 0:1.9.22-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Thu Feb 08 2018 Fedora Release Engineering - 0:1.9.22-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 00c454993e51478e02a43d75880f1a193ab6e88a Mon Sep 17 00:00:00 2001 From: Severin Gehwolf Date: Fri, 31 Aug 2018 12:16:58 +0200 Subject: [PATCH 27/54] Add explicit requirement on javapackages-tools --- nekohtml.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/nekohtml.spec b/nekohtml.spec index e133eb0..840e4bb 100644 --- a/nekohtml.spec +++ b/nekohtml.spec @@ -30,7 +30,7 @@ Name: nekohtml Version: 1.9.22 -Release: 7%{?dist} +Release: 8%{?dist} Epoch: 0 Summary: HTML scanner and tag balancer License: ASL 2.0 @@ -50,6 +50,9 @@ Patch2: 0003-Add-OSGi-attributes.patch 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 BuildRequires: ant BuildRequires: ant-junit @@ -137,6 +140,10 @@ export CLASSPATH=$(build-classpath bcel xerces-j2 xml-commons-apis) %files demo -f .mfiles-demo %changelog +* Fri Aug 31 2018 Severin Gehwolf - 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 - 0:1.9.22-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 46f607b1a27de80427abbdc053b3109bea414171 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 12:08:31 +0000 Subject: [PATCH 28/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- nekohtml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nekohtml.spec b/nekohtml.spec index 840e4bb..6165ed8 100644 --- a/nekohtml.spec +++ b/nekohtml.spec @@ -30,7 +30,7 @@ Name: nekohtml Version: 1.9.22 -Release: 8%{?dist} +Release: 9%{?dist} Epoch: 0 Summary: HTML scanner and tag balancer License: ASL 2.0 @@ -140,6 +140,9 @@ export CLASSPATH=$(build-classpath bcel xerces-j2 xml-commons-apis) %files demo -f .mfiles-demo %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 0:1.9.22-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Aug 31 2018 Severin Gehwolf - 0:1.9.22-8 - Add explicit requirement on javapackages-tools since nekohtml-filter script uses java-functions. See RHBZ#1600426. From 84ea708a9c1142f16757119f7a1ac1f82d155711 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 18:26:18 +0000 Subject: [PATCH 29/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- nekohtml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nekohtml.spec b/nekohtml.spec index 6165ed8..f0f8604 100644 --- a/nekohtml.spec +++ b/nekohtml.spec @@ -30,7 +30,7 @@ Name: nekohtml Version: 1.9.22 -Release: 9%{?dist} +Release: 10%{?dist} Epoch: 0 Summary: HTML scanner and tag balancer License: ASL 2.0 @@ -140,6 +140,9 @@ export CLASSPATH=$(build-classpath bcel xerces-j2 xml-commons-apis) %files demo -f .mfiles-demo %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 0:1.9.22-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri Feb 01 2019 Fedora Release Engineering - 0:1.9.22-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From c3081529b61ddceb80fa6272599931198268f3c0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 14:45:11 +0000 Subject: [PATCH 30/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- nekohtml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nekohtml.spec b/nekohtml.spec index f0f8604..bdaf723 100644 --- a/nekohtml.spec +++ b/nekohtml.spec @@ -30,7 +30,7 @@ Name: nekohtml Version: 1.9.22 -Release: 10%{?dist} +Release: 11%{?dist} Epoch: 0 Summary: HTML scanner and tag balancer License: ASL 2.0 @@ -140,6 +140,9 @@ export CLASSPATH=$(build-classpath bcel xerces-j2 xml-commons-apis) %files demo -f .mfiles-demo %changelog +* 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 From 7ed7dd9b1588a1d61ec5437100fc7b46d1ab79ae Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Sun, 17 May 2020 17:27:50 +0100 Subject: [PATCH 31/54] Remove unneeded dep on bcel --- nekohtml.spec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nekohtml.spec b/nekohtml.spec index bdaf723..11c3992 100644 --- a/nekohtml.spec +++ b/nekohtml.spec @@ -30,7 +30,7 @@ Name: nekohtml Version: 1.9.22 -Release: 11%{?dist} +Release: 12%{?dist} Epoch: 0 Summary: HTML scanner and tag balancer License: ASL 2.0 @@ -47,8 +47,7 @@ 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 @@ -56,9 +55,7 @@ Requires: javapackages-tools BuildRequires: javapackages-local BuildRequires: ant BuildRequires: ant-junit -BuildRequires: bcel -BuildRequires: bcel-javadoc -BuildRequires: xerces-j2 >= 0:2.7.1 +BuildRequires: xerces-j2 BuildRequires: xerces-j2-javadoc BuildRequires: xml-commons-apis @@ -140,6 +137,9 @@ export CLASSPATH=$(build-classpath bcel xerces-j2 xml-commons-apis) %files demo -f .mfiles-demo %changelog +* 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 From 0fc410d0b2e5934445d9e7e4eab986737df98b17 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Fri, 19 Jun 2020 21:15:06 +0100 Subject: [PATCH 32/54] Allow building against Java 11 --- nekohtml-1.9.20.pom | 45 --------------------------------------------- nekohtml.spec | 10 ++++++++-- 2 files changed, 8 insertions(+), 47 deletions(-) delete mode 100644 nekohtml-1.9.20.pom diff --git a/nekohtml-1.9.20.pom b/nekohtml-1.9.20.pom deleted file mode 100644 index d568241..0000000 --- a/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/nekohtml.spec b/nekohtml.spec index 11c3992..4643588 100644 --- a/nekohtml.spec +++ b/nekohtml.spec @@ -30,7 +30,7 @@ Name: nekohtml Version: 1.9.22 -Release: 12%{?dist} +Release: 13%{?dist} Epoch: 0 Summary: HTML scanner and tag balancer License: ASL 2.0 @@ -96,6 +96,9 @@ Demonstrations and samples for %{name}. 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 @@ -105,7 +108,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 \ @@ -137,6 +140,9 @@ export CLASSPATH=$(build-classpath bcel xerces-j2 xml-commons-apis) %files demo -f .mfiles-demo %changelog +* 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 From 5671b968be45d9d1414d7d2cb3a2b1054fe6e066 Mon Sep 17 00:00:00 2001 From: Jiri Date: Sat, 11 Jul 2020 03:16:00 +0200 Subject: [PATCH 33/54] Rebuilt for JDK-11 --- nekohtml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nekohtml.spec b/nekohtml.spec index 4643588..99cbf07 100644 --- a/nekohtml.spec +++ b/nekohtml.spec @@ -30,7 +30,7 @@ Name: nekohtml Version: 1.9.22 -Release: 13%{?dist} +Release: 14%{?dist} Epoch: 0 Summary: HTML scanner and tag balancer License: ASL 2.0 @@ -140,6 +140,9 @@ ant -Dcompile.source=1.8 -Dcompile.target=1.8 \ %files demo -f .mfiles-demo %changelog +* 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 From 376d48707761c111d35506e7fd27ba51645c0868 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 08:58:35 +0000 Subject: [PATCH 34/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- nekohtml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nekohtml.spec b/nekohtml.spec index 99cbf07..11fb978 100644 --- a/nekohtml.spec +++ b/nekohtml.spec @@ -30,7 +30,7 @@ Name: nekohtml Version: 1.9.22 -Release: 14%{?dist} +Release: 15%{?dist} Epoch: 0 Summary: HTML scanner and tag balancer License: ASL 2.0 @@ -140,6 +140,9 @@ ant -Dcompile.source=1.8 -Dcompile.target=1.8 \ %files demo -f .mfiles-demo %changelog +* 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 From 48e4b8b2df428c90fc6030053fec79ddf8f7c909 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 21:20:26 +0000 Subject: [PATCH 35/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- nekohtml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nekohtml.spec b/nekohtml.spec index 11fb978..c1cd4a8 100644 --- a/nekohtml.spec +++ b/nekohtml.spec @@ -30,7 +30,7 @@ Name: nekohtml Version: 1.9.22 -Release: 15%{?dist} +Release: 16%{?dist} Epoch: 0 Summary: HTML scanner and tag balancer License: ASL 2.0 @@ -140,6 +140,9 @@ ant -Dcompile.source=1.8 -Dcompile.target=1.8 \ %files demo -f .mfiles-demo %changelog +* 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 From a754d3e04382ce103f10beff2a7282aa3cacc166 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 15:56:30 +0000 Subject: [PATCH 36/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- nekohtml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nekohtml.spec b/nekohtml.spec index c1cd4a8..8975cc2 100644 --- a/nekohtml.spec +++ b/nekohtml.spec @@ -30,7 +30,7 @@ Name: nekohtml Version: 1.9.22 -Release: 16%{?dist} +Release: 17%{?dist} Epoch: 0 Summary: HTML scanner and tag balancer License: ASL 2.0 @@ -140,6 +140,9 @@ ant -Dcompile.source=1.8 -Dcompile.target=1.8 \ %files demo -f .mfiles-demo %changelog +* 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 From 64d758c5e6f19ae9fc1e7ccc3eec63db8582613d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 20:59:58 +0000 Subject: [PATCH 37/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- nekohtml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nekohtml.spec b/nekohtml.spec index 8975cc2..9eb102f 100644 --- a/nekohtml.spec +++ b/nekohtml.spec @@ -30,7 +30,7 @@ Name: nekohtml Version: 1.9.22 -Release: 17%{?dist} +Release: 18%{?dist} Epoch: 0 Summary: HTML scanner and tag balancer License: ASL 2.0 @@ -140,6 +140,9 @@ ant -Dcompile.source=1.8 -Dcompile.target=1.8 \ %files demo -f .mfiles-demo %changelog +* 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 From 44770b6c2ac3ee9efe8911cd391c7539e7c70dc6 Mon Sep 17 00:00:00 2001 From: Jiri Date: Sat, 5 Feb 2022 23:08:12 +0100 Subject: [PATCH 38/54] Rebuilt for java-17-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java17 --- nekohtml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nekohtml.spec b/nekohtml.spec index 9eb102f..9c93924 100644 --- a/nekohtml.spec +++ b/nekohtml.spec @@ -30,7 +30,7 @@ Name: nekohtml Version: 1.9.22 -Release: 18%{?dist} +Release: 19%{?dist} Epoch: 0 Summary: HTML scanner and tag balancer License: ASL 2.0 @@ -140,6 +140,9 @@ ant -Dcompile.source=1.8 -Dcompile.target=1.8 \ %files demo -f .mfiles-demo %changelog +* 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 From 515d1ae2804a4e473925df64819b35f67ceb486b Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 8 Jul 2022 16:20:00 +0200 Subject: [PATCH 39/54] Rebuilt for Drop i686 JDKs https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs --- nekohtml.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nekohtml.spec b/nekohtml.spec index 9c93924..7fe606b 100644 --- a/nekohtml.spec +++ b/nekohtml.spec @@ -30,7 +30,7 @@ Name: nekohtml Version: 1.9.22 -Release: 19%{?dist} +Release: 20%{?dist} Epoch: 0 Summary: HTML scanner and tag balancer License: ASL 2.0 @@ -60,6 +60,7 @@ 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 @@ -140,6 +141,9 @@ ant -Dcompile.source=1.8 -Dcompile.target=1.8 \ %files demo -f .mfiles-demo %changelog +* 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 From 10b8231ca300340744613e794cca660a2a22c91a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 22 Jul 2022 00:21:06 +0000 Subject: [PATCH 40/54] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- nekohtml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nekohtml.spec b/nekohtml.spec index 7fe606b..189d9c0 100644 --- a/nekohtml.spec +++ b/nekohtml.spec @@ -30,7 +30,7 @@ Name: nekohtml Version: 1.9.22 -Release: 20%{?dist} +Release: 21%{?dist} Epoch: 0 Summary: HTML scanner and tag balancer License: ASL 2.0 @@ -141,6 +141,9 @@ ant -Dcompile.source=1.8 -Dcompile.target=1.8 \ %files demo -f .mfiles-demo %changelog +* 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 From 9b5116d47fa1e455ccd0ae7ff72b0c1dc01b9d92 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 21:21:51 +0000 Subject: [PATCH 41/54] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- nekohtml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nekohtml.spec b/nekohtml.spec index 189d9c0..64bc703 100644 --- a/nekohtml.spec +++ b/nekohtml.spec @@ -30,7 +30,7 @@ Name: nekohtml Version: 1.9.22 -Release: 21%{?dist} +Release: 22%{?dist} Epoch: 0 Summary: HTML scanner and tag balancer License: ASL 2.0 @@ -141,6 +141,9 @@ ant -Dcompile.source=1.8 -Dcompile.target=1.8 \ %files demo -f .mfiles-demo %changelog +* 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 From 97a6780777c30b932659e54868b7d0f81bd1eb60 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 16:26:05 +0000 Subject: [PATCH 42/54] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- nekohtml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nekohtml.spec b/nekohtml.spec index 64bc703..2aea33f 100644 --- a/nekohtml.spec +++ b/nekohtml.spec @@ -30,7 +30,7 @@ Name: nekohtml Version: 1.9.22 -Release: 22%{?dist} +Release: 23%{?dist} Epoch: 0 Summary: HTML scanner and tag balancer License: ASL 2.0 @@ -141,6 +141,9 @@ ant -Dcompile.source=1.8 -Dcompile.target=1.8 \ %files demo -f .mfiles-demo %changelog +* 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 From fd65eb1ad3a1d1f3f91ce71532359ead2a8401eb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 09:24:55 +0000 Subject: [PATCH 43/54] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- nekohtml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nekohtml.spec b/nekohtml.spec index 2aea33f..9e2a48c 100644 --- a/nekohtml.spec +++ b/nekohtml.spec @@ -30,7 +30,7 @@ Name: nekohtml Version: 1.9.22 -Release: 23%{?dist} +Release: 24%{?dist} Epoch: 0 Summary: HTML scanner and tag balancer License: ASL 2.0 @@ -141,6 +141,9 @@ ant -Dcompile.source=1.8 -Dcompile.target=1.8 \ %files demo -f .mfiles-demo %changelog +* 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 From db9dac6064be17ed4dc77a0621efdef8bab4b91c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 08:44:51 +0000 Subject: [PATCH 44/54] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- nekohtml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nekohtml.spec b/nekohtml.spec index 9e2a48c..9ea9dc4 100644 --- a/nekohtml.spec +++ b/nekohtml.spec @@ -30,7 +30,7 @@ Name: nekohtml Version: 1.9.22 -Release: 24%{?dist} +Release: 25%{?dist} Epoch: 0 Summary: HTML scanner and tag balancer License: ASL 2.0 @@ -141,6 +141,9 @@ ant -Dcompile.source=1.8 -Dcompile.target=1.8 \ %files demo -f .mfiles-demo %changelog +* 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 From a19872b683feb822e0da3f3144ea25cf5a97da25 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 27 Feb 2024 17:28:53 +0100 Subject: [PATCH 45/54] Rebuilt for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 --- nekohtml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nekohtml.spec b/nekohtml.spec index 9ea9dc4..e779c18 100644 --- a/nekohtml.spec +++ b/nekohtml.spec @@ -30,7 +30,7 @@ Name: nekohtml Version: 1.9.22 -Release: 25%{?dist} +Release: 26%{?dist} Epoch: 0 Summary: HTML scanner and tag balancer License: ASL 2.0 @@ -141,6 +141,9 @@ ant -Dcompile.source=1.8 -Dcompile.target=1.8 \ %files demo -f .mfiles-demo %changelog +* 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 From d3df5381671d089a103af86796195777c0568f35 Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:48 +0200 Subject: [PATCH 46/54] Eliminate use of obsolete %patchN syntax (#2283636) --- nekohtml.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nekohtml.spec b/nekohtml.spec index e779c18..c1eaba3 100644 --- a/nekohtml.spec +++ b/nekohtml.spec @@ -90,9 +90,9 @@ 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 From 24c18e72f06e675098ded95b69b9c1c54fd67d17 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 19:17:17 +0000 Subject: [PATCH 47/54] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- nekohtml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nekohtml.spec b/nekohtml.spec index c1eaba3..277df3d 100644 --- a/nekohtml.spec +++ b/nekohtml.spec @@ -30,7 +30,7 @@ Name: nekohtml Version: 1.9.22 -Release: 26%{?dist} +Release: 27%{?dist} Epoch: 0 Summary: HTML scanner and tag balancer License: ASL 2.0 @@ -141,6 +141,9 @@ ant -Dcompile.source=1.8 -Dcompile.target=1.8 \ %files demo -f .mfiles-demo %changelog +* 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 From 36cf1b548f6d68f2e953d7a0b3728a46e4a26106 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Wed, 24 Jul 2024 16:43:48 +0200 Subject: [PATCH 48/54] convert ASL 2.0 license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- nekohtml.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/nekohtml.spec b/nekohtml.spec index 277df3d..e226432 100644 --- a/nekohtml.spec +++ b/nekohtml.spec @@ -30,10 +30,11 @@ Name: nekohtml Version: 1.9.22 -Release: 27%{?dist} +Release: 28%{?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 @@ -141,6 +142,9 @@ ant -Dcompile.source=1.8 -Dcompile.target=1.8 \ %files demo -f .mfiles-demo %changelog +* 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 From dea32f8e2f345f85cad14136cc67c5b2902e77a8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 19:51:08 +0000 Subject: [PATCH 49/54] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- nekohtml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nekohtml.spec b/nekohtml.spec index e226432..8ef73e2 100644 --- a/nekohtml.spec +++ b/nekohtml.spec @@ -30,7 +30,7 @@ Name: nekohtml Version: 1.9.22 -Release: 28%{?dist} +Release: 29%{?dist} Epoch: 0 Summary: HTML scanner and tag balancer # Automatically converted from old format: ASL 2.0 - review is highly recommended. @@ -142,6 +142,9 @@ ant -Dcompile.source=1.8 -Dcompile.target=1.8 \ %files demo -f .mfiles-demo %changelog +* 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 From 500b3fb805ca68ceb56e43f9aa3e56d36633c680 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 22:42:13 +0000 Subject: [PATCH 50/54] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- nekohtml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nekohtml.spec b/nekohtml.spec index 8ef73e2..2ac7fde 100644 --- a/nekohtml.spec +++ b/nekohtml.spec @@ -30,7 +30,7 @@ Name: nekohtml Version: 1.9.22 -Release: 29%{?dist} +Release: 30%{?dist} Epoch: 0 Summary: HTML scanner and tag balancer # Automatically converted from old format: ASL 2.0 - review is highly recommended. @@ -142,6 +142,9 @@ ant -Dcompile.source=1.8 -Dcompile.target=1.8 \ %files demo -f .mfiles-demo %changelog +* 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 From f0486d02a855c516fd5152950e7b583756e9f463 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Wed, 30 Jul 2025 00:48:55 +0200 Subject: [PATCH 51/54] 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. --- nekohtml.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/nekohtml.spec b/nekohtml.spec index 2ac7fde..0711899 100644 --- a/nekohtml.spec +++ b/nekohtml.spec @@ -30,7 +30,7 @@ Name: nekohtml Version: 1.9.22 -Release: 30%{?dist} +Release: 31%{?dist} Epoch: 0 Summary: HTML scanner and tag balancer # Automatically converted from old format: ASL 2.0 - review is highly recommended. @@ -53,8 +53,8 @@ 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: xerces-j2 BuildRequires: xerces-j2-javadoc @@ -142,6 +142,9 @@ ant -Dcompile.source=1.8 -Dcompile.target=1.8 \ %files demo -f .mfiles-demo %changelog +* 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 From c2d94ac1ec5e018ff822a51e9f93a9a5b77690a0 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Wed, 30 Jul 2025 14:09:16 +0200 Subject: [PATCH 52/54] Rrevert to jdk21 during rebuild for https://fedoraproject.org/wiki/Changes/Java25AndNoMoreSystemJdk your package failed to build. Is preemptively reverted back to versioned jdk21 --- nekohtml.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/nekohtml.spec b/nekohtml.spec index 0711899..ec721e4 100644 --- a/nekohtml.spec +++ b/nekohtml.spec @@ -30,7 +30,7 @@ Name: nekohtml Version: 1.9.22 -Release: 31%{?dist} +Release: 32%{?dist} Epoch: 0 Summary: HTML scanner and tag balancer # Automatically converted from old format: ASL 2.0 - review is highly recommended. @@ -53,8 +53,8 @@ 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-openjdk21 +BuildRequires: ant-openjdk21 BuildRequires: ant-junit BuildRequires: xerces-j2 BuildRequires: xerces-j2-javadoc @@ -142,6 +142,9 @@ 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 From 09714b668bc90609ad961b42b907d059af4ac124 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 6 Jan 2026 14:53:26 +0100 Subject: [PATCH 53/54] Bumped to jdk25 --- nekohtml.spec | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/nekohtml.spec b/nekohtml.spec index ec721e4..534b50a 100644 --- a/nekohtml.spec +++ b/nekohtml.spec @@ -30,7 +30,7 @@ Name: nekohtml Version: 1.9.22 -Release: 32%{?dist} +Release: 33%{?dist} Epoch: 0 Summary: HTML scanner and tag balancer # Automatically converted from old format: ASL 2.0 - review is highly recommended. @@ -53,11 +53,10 @@ 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-openjdk21 -BuildRequires: ant-openjdk21 +BuildRequires: javapackages-local-openjdk25 +BuildRequires: ant-openjdk25 BuildRequires: ant-junit BuildRequires: xerces-j2 -BuildRequires: xerces-j2-javadoc BuildRequires: xml-commons-apis BuildArch: noarch From 04d33f6e5f8431c21866c62f9e45705280f0f7a6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 21:59:34 +0000 Subject: [PATCH 54/54] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- nekohtml.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nekohtml.spec b/nekohtml.spec index 534b50a..8cde023 100644 --- a/nekohtml.spec +++ b/nekohtml.spec @@ -30,7 +30,7 @@ Name: nekohtml Version: 1.9.22 -Release: 33%{?dist} +Release: 34%{?dist} Epoch: 0 Summary: HTML scanner and tag balancer # Automatically converted from old format: ASL 2.0 - review is highly recommended. @@ -141,6 +141,9 @@ ant -Dcompile.source=1.8 -Dcompile.target=1.8 \ %files demo -f .mfiles-demo %changelog +* Fri Jan 16 2026 Fedora Release Engineering - 0:1.9.22-34 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Wed Jul 30 2025 jiri vanek - 0:1.9.22-32 - Rrevert to jdk21