Attachment 586213 Details for Bug 810899 – update to 1.2.1

[patch] update to 1.2.1

0001-update-to-1.2.1.patch (text/plain), 7.12 KB, created by gil cattaneo on 2012-05-22 23:56:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: gil cattaneo

Created: 2012-05-22 23:56:29 UTC

Size: 7.12 KB

patch

obsolete

>From 4a68fb430734d0103ce0a105da68d25b37e32144 Mon Sep 17 00:00:00 2001
>From: gil <puntogil@libero.it>
>Date: Tue, 22 May 2012 23:56:48 +0200
>Subject: [PATCH] update to 1.2.1
>
>---
> .gitignore              |    1 +
> sources                 |    2 +-
> tagsoup-1.2.1-man.patch |   16 +++++++++
> tagsoup-1.2.1.pom       |   25 ++++++++++++++
> tagsoup.spec            |   80 ++++++++++++++++++++++++++++++----------------
> 5 files changed, 95 insertions(+), 29 deletions(-)
> create mode 100644 tagsoup-1.2.1-man.patch
> create mode 100644 tagsoup-1.2.1.pom
>
>diff --git a/.gitignore b/.gitignore
>index 7a1912d..1b752f6 100644
>--- a/.gitignore
>+++ b/.gitignore
>@@ -1 +1,2 @@
> tagsoup-1.0.1-src.zip
>+/tagsoup-1.2.1-src.zip
>diff --git a/sources b/sources
>index ee7aaba..e4cab3e 100644
>--- a/sources
>+++ b/sources
>@@ -1 +1 @@
>-35088ab782cb31bbf63e745302379fa5  tagsoup-1.0.1-src.zip
>+abfd28df69bf5e68f816db8073550903  tagsoup-1.2.1-src.zip
>diff --git a/tagsoup-1.2.1-man.patch b/tagsoup-1.2.1-man.patch
>new file mode 100644
>index 0000000..ebba22d
>--- /dev/null
>+++ b/tagsoup-1.2.1-man.patch
>@@ -0,0 +1,16 @@
>+--- tagsoup.1	2011-07-08 02:17:59.000000000 +0200
>++++ tagsoup.1-gil	2012-04-09 14:56:31.111938251 +0200
>+@@ -11,11 +11,11 @@
>+ \' OF ANY KIND, either express or implied; not even the implied warranty
>+ \' of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
>+ \'
>+-.TH TAGSOUP "1" "January 2008" "TagSoup 1.2" "User Commands"
>++.TH TAGSOUP "1" "January 2008" "TagSoup 1.2.1" "User Commands"
>+ .SH NAME
>+ tagsoup \- convert nasty, ugly HTML to clean XHTML
>+ .SH SYNOPSIS
>+-.B java -jar tagsoup-1.2
>++.B java -jar tagsoup
>+ [
>+ .I options
>+ ] [
>diff --git a/tagsoup-1.2.1.pom b/tagsoup-1.2.1.pom
>new file mode 100644
>index 0000000..014c64a
>--- /dev/null
>+++ b/tagsoup-1.2.1.pom
>@@ -0,0 +1,25 @@
>+<project>
>+	<modelVersion>4.0.0</modelVersion>
>+	<groupId>org.ccil.cowan.tagsoup</groupId>
>+	<artifactId>tagsoup</artifactId>
>+	<name>TagSoup</name>
>+	<version>1.2.1</version>
>+	<packaging>jar</packaging>
>+	<description>TagSoup is a SAX-compliant parser written in Java that, instead of parsing well-formed or valid XML, parses HTML as it is found in the wild: poor, nasty and brutish, though quite often far from short. TagSoup is designed for people who have to process this stuff using some semblance of a rational application design. By providing a SAX interface, it allows standard XML tools to be applied to even the worst HTML. TagSoup also includes a command-line processor that reads HTML files and can generate either clean HTML or well-formed XML that is a close approximation to XHTML.</description>
>+	<url>http://home.ccil.org/~cowan/XML/tagsoup/</url>
>+	<licenses>
>+		<license>
>+			<name>Apache License 2.0</name>
>+			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
>+			<distribution>repo</distribution>
>+		</license>
>+	</licenses>
>+	<scm>
>+		<url>http://home.ccil.org/~cowan/tagsoup/tagsoup-1.2.1-src.zip</url>
>+	</scm>
>+	<developers>
>+		<developer>
>+			<name>John Cowan</name>
>+		</developer>
>+	</developers>
>+</project>
>diff --git a/tagsoup.spec b/tagsoup.spec
>index 48241b8..ec3d9c2 100644
>--- a/tagsoup.spec
>+++ b/tagsoup.spec
>@@ -29,26 +29,29 @@
> #
> 
> Name:           tagsoup
>-Version:        1.0.1
>-Release:        9%{?dist}
>+Version:        1.2.1
>+Release:        1%{?dist}
> Epoch:          0
> Summary:        A SAX-compliant HTML parser written in Java 
> License:        GPLv2+ or AFL
>-Source0:        http://home.ccil.org/~cowan/XML/tagsoup/tagsoup-1.0.1-src.zip
>+Source0:        http://home.ccil.org/~cowan/XML/tagsoup/tagsoup-1.2.1-src.zip
> URL:            http://home.ccil.org/~cowan/XML/tagsoup/
> Group:          Text Processing/Markup/XML
>-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
>-# see https://bugzilla.redhat.com/show_bug.cgi?id=502328
>-ExcludeArch:  ppc64
>-BuildArch:      noarch
>-# Used to ensure that jpackage-utils is available till uninstallation of package
>-Requires:          jpackage-utils >= 0:1.6
>-Requires(postun):       jpackage-utils >= 0:1.6
>-BuildRequires:  ant, ant-nodeps, xalan-j2, bash
>+Source1:        http://repo1.maven.org/maven2/org/ccil/cowan/tagsoup/tagsoup/%{version}/tagsoup-%{version}.pom
>+# fix version
>+Patch0:         tagsoup-1.2.1-man.patch
> BuildRequires:  java-devel >= 1:1.6.0
>+BuildRequires:  jpackage-utils >= 0:1.6
>+BuildRequires:  ant
> BuildRequires:  ant-apache-xalan2
>+BuildRequires:  bash
>+BuildRequires:  xalan-j2
>+Requires:       jpackage-utils >= 0:1.6
>+# see https://bugzilla.redhat.com/show_bug.cgi?id=502328
>+ExcludeArch:    ppc64
>+BuildArch:      noarch
> 
>-%description 
>+%description
> TagSoup is a SAX-compliant parser written in Java that, instead of
> parsing well-formed or valid XML, parses HTML as it is found in the wild: nasty
> and brutish, though quite often far from short. TagSoup is designed for people
>@@ -57,11 +60,9 @@ design. By providing a SAX interface, it allows standard XML tools to be
> applied to even the worst HTML.
> 
> %package javadoc
>-Summary:        Javadoc for %{name}
>-Group:          Development/Documentation
>-# Used to ensure that jpackage-utils is available till uninstallation of package
>-Requires:               jpackage-utils >= 0:1.6
>-Requires(postun):       jpackage-utils >= 0:1.6
>+Summary:       Javadoc for %{name}
>+Group:         Documentation
>+Requires:      jpackage-utils >= 0:1.6
> 
> %description javadoc
> Javadoc for %{name}.
>@@ -69,31 +70,54 @@ Javadoc for %{name}.
> %prep
> %setup -q
> 
>+find . -name '*.class' -delete
>+find . -name "*.jar" -delete
>+%patch0 -p0
>+
> %build
>+
> export CLASSPATH=$(build-classpath xalan-j2-serializer xalan-j2)
> ant \
>-  -Dversion=%{version} \
>+  -Dtagsoup.version=%{version} \
>   -Dj2se.apiurl=%{_javadocdir}/java \
>   dist docs-api
> 
> %install
>-rm -fr $RPM_BUILD_ROOT
>-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
>+
>+mkdir -p %{buildroot}%{_javadir}
> install -m 644 dist/lib/%{name}-%{version}.jar \
>-               $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
>-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
>-cp -pr docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
>+  %{buildroot}%{_javadir}/%{name}.jar
>+
>+mkdir -p %{buildroot}%{_mavenpomdir}
>+install -pm 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
>+%add_maven_depmap JPP-%{name}.pom %{name}.jar
>+
>+mkdir -p %{buildroot}%{_javadocdir}/%{name}
>+cp -pr docs/api/* %{buildroot}%{_javadocdir}/%{name}
>+
>+mkdir -p %{buildroot}%{_mandir}/man1
>+install -m 644 %{name}.1 %{buildroot}%{_mandir}/man1/
> 
> %files
>-%defattr(-,root,root,-)
>-%{_javadir}/*.jar
>-%doc CHANGES README LICENSE
>+%{_javadir}/%{name}.jar
>+%{_mandir}/man1/%{name}.1.gz
>+%{_mavenpomdir}/JPP-%{name}.pom
>+%{_mavendepmapfragdir}/%{name}
>+%doc CHANGES LICENSE README TODO %{name}.txt
> 
> %files javadoc
>-%defattr(-,root,root,-)
>-%doc %{_javadocdir}/%{name}
>+%{_javadocdir}/%{name}
>+%doc LICENSE
> 
> %changelog
>+* Mon Apr 09 2012 gil cattaneo <puntogil@libero.it> 0:1.2.1-1
>+- Upgraded to 1.2.1
>+- remove ant-nodeps reference
>+- changed group in javadoc sub package (from Development/Documentation in Documentation)
>+- add maven metadata
>+- add manual
>+- Adapt to current guidelines.
>+
> * Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.0.1-9
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
> 
>-- 
>1.7.7.6
>

Actions: View | Diff

Attachments on bug 810899: 576237 | 576238 | 576239 | 586213