[jtidy] Dropped gcj_support Updated to latest upstream version Moved shell script to main package and obsole
spike
spike at fedoraproject.org
Tue Sep 28 05:20:41 UTC 2010
commit 0890c6fa9b704f9597e3d81b39d770c425da3cd2
Author: spike <spike at fedoraproject.org>
Date: Tue Sep 28 07:18:24 2010 +0200
Dropped gcj_support
Updated to latest upstream version
Moved shell script to main package and obsoleted script subpackage
Updated description
Removed xml-commons-apis and jaxp_parser_impl from requires and build requires
Removed xml-commons-apis from ant config file
Removed additional jars from classpath in the wrapper script
.gitignore | 1 +
jtidy.jtidy.script | 2 +-
jtidy.spec | 193 ++++++++++++++++-----------------------------------
sources | 2 +-
4 files changed, 64 insertions(+), 134 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index febe09d..8ba0c14 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
jtidy-04aug2000r7-dev.zip
+/jtidy-r938-sources.zip
diff --git a/jtidy.jtidy.script b/jtidy.jtidy.script
index 650a06d..421d5be 100644
--- a/jtidy.jtidy.script
+++ b/jtidy.jtidy.script
@@ -14,7 +14,7 @@ fi
# Configuration
MAIN_CLASS=org.w3c.tidy.Tidy
-BASE_JARS="jaxp_parser_impl jtidy xml-commons-apis"
+BASE_JARS="jtidy"
# Set parameters
set_jvm
diff --git a/jtidy.spec b/jtidy.spec
index c8e1141..048c199 100644
--- a/jtidy.spec
+++ b/jtidy.spec
@@ -1,168 +1,97 @@
-# Copyright (c) 2000-2007, JPackage Project
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the
-# distribution.
-# 3. Neither the name of the JPackage Project nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-%define gcj_support 1
-
-Summary: HTML syntax checker and pretty printer
-Name: jtidy
-Version: 1.0
-Release: 0.4.r7dev.1.5%{?dist}
-Epoch: 2
-License: zlib
-URL: http://jtidy.sourceforge.net/
-Source0: http://download.sf.net/jtidy/jtidy-04aug2000r7-dev.zip
-Source1: %{name}.jtidy.script
-Patch0: %{name}.noapis.patch
-Patch1: %{name}-source14.patch
-Requires: jaxp_parser_impl
-Requires: xml-commons-apis
-Requires: jpackage-utils
-BuildRequires: ant >= 0:1.6
-BuildRequires: jpackage-utils >= 0:1.5
-BuildRequires: xml-commons-apis
-Group: Applications/Internet
-%if ! %{gcj_support}
-BuildArch: noarch
-%endif
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
+%global jtidyversion r938
+
+Name: jtidy
+Version: 1.0
+Release: 0.5.%{jtidyversion}%{?dist}
+Epoch: 2
+Summary: HTML syntax checker and pretty printer
+Group: Applications/Internet
+License: zlib
+URL: http://jtidy.sourceforge.net/
+Source0: http://download.sf.net/jtidy/%{name}-%{jtidyversion}-sources.zip
+Source1: %{name}.jtidy.script
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch: noarch
+
+BuildRequires: java-devel >= 1:1.6.0
+BuildRequires: jpackage-utils
+BuildRequires: ant >= 0:1.6
+
+Requires: java >= 1:1.6.0
+Requires: jpackage-utils
+
+Obsoletes: %{name}-scripts
%description
-JTidy is a Java port of HTML Tidy, a HTML syntax checker and pretty
-printer. Like its non-Java cousin, JTidy can be used as a tool for
-cleaning up malformed and faulty HTML. In addition, JTidy provides a DOM
+JTidy is a Java port of HTML Tidy, a HTML syntax checker and pretty printer.
+Like its non-Java cousin, JTidy can be used as a tool for cleaning up malformed
+and faulty HTML. In addition, JTidy provides a DOM interface to the document
+that is being processed, which effectively makes you able to use JTidy as a DOM
parser for real-world HTML.
%package javadoc
-Group: Documentation
-Summary: Javadoc for %{name}
-# for /bin/rm and /bin/ln
-Requires(post): coreutils
-Requires(postun): coreutils
+Summary: Javadoc for %{name}
+Group: Documentation
+Requires: jpackage-utils
%description javadoc
-Javadoc for %{name}.
-
-%package scripts
-Summary: Utility scripts for %{name}
-Group: Applications/Internet
-Requires: jpackage-utils >= 0:1.5
-Requires: %{name} = %{epoch}:%{version}-%{release}
-
-%description scripts
-Utility scripts for %{name}.
+This package contains the API documentation for %{name}.
%prep
-%setup -q -n %{name}-04aug2000r7-dev
-%patch0 -p0
-%patch1 -p0
-# remove all binary libs and javadocs
-find . -name "*.jar" -exec %__rm -f {} \;
-# correct silly permissions
-%__chmod -R go=u-w *
+%setup -q -c
%build
-export CLASSPATH=$(build-classpath xml-commons-apis)
-%ant jar javadoc
+ant
%install
-%__rm -rf %{buildroot}
+rm -rf %{buildroot}
# jar
-%__mkdir_p %{buildroot}%{_javadir}
-%__cp -ap build/Tidy.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
-# jar versioning
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}.jar; do \
-%__ln_s ${jar} `echo $jar| %__sed "s|-%{version}||g"`; done)
+install -d -m 0755 %{buildroot}%{_javadir}
+install -pm 644 target/%{name}-%{jtidyversion}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
+ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
# javadoc
-%__mkdir_p %{buildroot}%{_javadocdir}/%{name}-%{version}
-%__cp -ap doc/api/* %{buildroot}%{_javadocdir}/%{name}-%{version}
-(cd %{buildroot}%{_javadocdir} && %__ln_s %{name}-%{version} %{name})
+install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
+cp -pr target/javadoc/* %{buildroot}%{_javadocdir}/%{name}-%{version}/
+ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
# shell script
-%__mkdir_p %{buildroot}%{_bindir}
-%__cp -ap %{SOURCE1} %{buildroot}%{_bindir}/%{name}
+mkdir -p %{buildroot}%{_bindir}
+cp -ap %{SOURCE1} %{buildroot}%{_bindir}/%{name}
# ant.d
-%__mkdir_p %{buildroot}%{_sysconfdir}/ant.d
-%__cat > %{buildroot}%{_sysconfdir}/ant.d/%{name} << EOF
-jtidy xml-commons-apis
+mkdir -p %{buildroot}%{_sysconfdir}/ant.d
+cat > %{buildroot}%{_sysconfdir}/ant.d/%{name} << EOF
+jtidy
EOF
-%if %{gcj_support}
-%{_bindir}/aot-compile-rpm
-%endif
-
%clean
-%__rm -rf %{buildroot}
-
-%if %{gcj_support}
-%post
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
-
-%if %{gcj_support}
-%postun
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-%endif
+rm -rf %{buildroot}
%files
-%defattr(0644,root,root,0755)
-%doc LICENSE NOTES doc/devel
+%defattr(-,root,root,-)
+%doc LICENSE.txt
%{_javadir}/*
+%{_bindir}/*
%config(noreplace) %{_sysconfdir}/ant.d/%{name}
-%if %{gcj_support}
-%attr(-,root,root) %{_libdir}/gcj/%{name}
-%endif
%files javadoc
-%defattr(0644,root,root,0755)
-%{_javadocdir}/*
+%defattr(-,root,root,-)
+%doc LICENSE.txt
+%{_javadocdir}/%{name}-%{version}
+%{_javadocdir}/%{name}
-%files scripts
-%defattr(0755,root,root,0755)
-%{_bindir}/*
%changelog
+* Mon Sep 27 2010 Chris Spike <chris.spike at arcor.de> 2:1.0-0.5.r938
+- Dropped gcj_support
+- Updated to latest upstream version
+- Moved shell script to main package and obsoleted script subpackage
+- Updated description
+- Removed xml-commons-apis and jaxp_parser_impl from requires and build requires
+- Removed xml-commons-apis from ant config file
+
* Tue Jan 26 2010 Deepak Bhole <dbhole at redhat.com> - 2:1.0-0.3.r7dev.1.5
- Fixed rhbz#512545 -- updated group
diff --git a/sources b/sources
index 3631e9f..6ca0788 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8fa91a760f7eea722e57f8b8da4a7d5f jtidy-04aug2000r7-dev.zip
+90d03d672f732511a97c4a0eeae309a4 jtidy-r938-sources.zip
More information about the scm-commits
mailing list