Login
Log in using an SSO provider:
Fedora Account System
Red Hat Associate
Red Hat Customer
Login using a Red Hat Bugzilla account
Forgot Password
Create an Account
Red Hat Bugzilla – Attachment 859275 Details for
Bug 895429
nekohtml-1.9.20 is available
Home
New
Search
Simple Search
Advanced Search
My Links
Browse
Requests
Reports
Current State
Search
Tabular reports
Graphical reports
Duplicates
Other Reports
User Changes
Plotly Reports
Bug Status
Bug Severity
Non-Defaults
Product Dashboard
Help
Page Help!
Bug Writing Guidelines
What's new
Browser Support Policy
5.0.4.rh92 Release notes
FAQ
Guides index
User guide
Web Services
Contact
Legal
[?]
This site requires JavaScript to be enabled to function correctly, please enable it.
[patch]
Update to upstream version 1.9.19
0001-Update-to-upstream-version-1.9.19.patch (text/plain), 9.72 KB, created by
Michael Simacek
on 2014-02-04 18:17:08 UTC
(
hide
)
Description:
Update to upstream version 1.9.19
Filename:
MIME Type:
Creator:
Michael Simacek
Created:
2014-02-04 18:17:08 UTC
Size:
9.72 KB
patch
obsolete
>From d216e6c5f141cd1052f5b758fefad254f1fd46f1 Mon Sep 17 00:00:00 2001 >From: Michael Simacek <msimacek@redhat.com> >Date: Tue, 4 Feb 2014 16:57:22 +0100 >Subject: [PATCH] Update to upstream version 1.9.19 > >Signed-off-by: Michael Simacek <msimacek@redhat.com> >--- > nekohtml-crosslink.patch | 33 ++++++++++++++++++------ > nekohtml-jars.patch | 65 +++++++++++++++++++++++++++++++----------------- > nekohtml.spec | 18 ++++++-------- > 3 files changed, 75 insertions(+), 41 deletions(-) > >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 <msimacek@redhat.com> >+Date: Tue, 4 Feb 2014 14:53:11 +0100 >+Subject: [PATCH] nekohtml crosslink >+ >+Signed-off-by: Michael Simacek <msimacek@redhat.com> >+--- >+ 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 @@ >+ > <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 +41,6 @@ > </target> > > <target name='doc-init'> >+-- >+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 @@ >- <property name='xerces.javadoc' value='http://xml.apache.org/xerces2-j/javadocs/xerces2/'/> >+From 915d4b8410494f56c3dcf0e687c3a6e6f3a12d04 Mon Sep 17 00:00:00 2001 >+From: Michael Simacek <msimacek@redhat.com> >+Date: Tue, 4 Feb 2014 15:09:11 +0100 >+Subject: [PATCH] nekohtml jars >+ >+Signed-off-by: Michael Simacek <msimacek@redhat.com> >+--- >+ 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 @@ >+ <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 +21,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 +30,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 +39,24 @@ > </classpath> > <src path='${src.dir}' /> > <src path='${build.src.dir}' /> >-@@ -102,11 +102,13 @@ >+@@ -107,13 +107,15 @@ >+ description="compiles many times to ensure compatibility with the different Xerces versions" > 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,45 +65,49 @@ > </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}' /> > - <fileset dir='${lib.dir}' includes='junit*.jar' /> > - <fileset dir='${lib.dir}/xerces-@{xercesVersion}' includes='*.jar' /> > + <fileset dir='${lib.dir}' includes='junit.jar' /> >-+ <fileset dir='${lib.dir}' includes='xerces-j2.jar' /> >++ <fileset dir='${lib.dir}' includes='xeces-j2.jar' /> > </classpath> > > <formatter type="xml"/> >-@@ -311,10 +313,12 @@ >+@@ -318,11 +320,13 @@ public class Version { > <mkdir dir="${build.dir}/junit"/> > >+ <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> >+@@ -396,7 +400,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" /> >+-- >+1.8.5.3 >+ >diff --git a/nekohtml.spec b/nekohtml.spec >index 6f9c60a..b3d57f5 100644 >--- a/nekohtml.spec >+++ b/nekohtml.spec >@@ -29,20 +29,17 @@ > # > > Name: nekohtml >-Version: 1.9.14 >-Release: 12%{?dist} >+Version: 1.9.19 >+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 >-# 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 >+Source3: http://repo1.maven.org/maven2/net/sourceforge/nekohtml/nekohtml/1.9.19/nekohtml-1.9.19.pom > Patch0: %{name}-crosslink.patch > Patch1: %{name}-jars.patch >-Group: Development/Libraries > Requires: bcel > Requires: jpackage-utils >= 0:1.6 > Requires: xerces-j2 >= 0:2.7.1 >@@ -74,14 +71,12 @@ rewriting code. > > %package javadoc > Summary: Javadoc for %{name} >-Group: Documentation > > %description javadoc > Javadoc for %{name}. > > %package demo > Summary: Demo for %{name} >-Group: Development/Libraries > Requires: %{name} = %{epoch}:%{version}-%{release} > > %description demo >@@ -116,7 +111,7 @@ install -d -m 755 $RPM_BUILD_ROOT%{_javadir} > install -p -m 644 %{name}{,-samples,-xni}.jar $RPM_BUILD_ROOT%{_javadir}/ > > # Scripts >-install -Dpm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/%{name}-filter >+%jpackage_script org.cyberneko.html.filters.Writer "" "" "nekohtml:xerces-j2" nekohtml-filter true > > # POM > install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir} >@@ -129,7 +124,7 @@ cp -a build/doc/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} > > %files > %doc LICENSE.txt README.txt doc/*.html >-%attr(755,root,root) %{_bindir}/%{name}-filter >+%{_bindir}/%{name}-filter > %{_mavenpomdir}/* > %{_mavendepmapfragdir}/* > %{_javadir}/%{name}.jar >@@ -142,6 +137,9 @@ cp -a build/doc/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} > %{_javadir}/%{name}-samples.jar > > %changelog >+* Tue Feb 04 2014 Michael Simacek <msimacek@redhat.com> - 0:1.9.19-1 >+- Update to upstream version 1.9.19 >+ > * 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 > >-- >1.8.5.3 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 895429
: 859275