[jtidy] Updated to latest upstream svn revision Installed pom.xml Added 'net.sf.jtidy:jtidy' to maven depmap

[spike]

commit a49bb705dc35e1d86ef57444b27cbdbe5ddfbb1b
Author: spike <spike at fedoraproject.org>
Date:   Thu Sep 30 15:09:12 2010 +0200

    Updated to latest upstream svn revision
    Installed pom.xml
    Added 'net.sf.jtidy:jtidy' to maven depmap
    Added 'jtidy:jtidy' to maven depmap

 .gitignore |    1 +
 jtidy.spec |   75 ++++++++++++++++++++++++++++++++++++++++--------------------
 sources    |    2 +-
 3 files changed, 52 insertions(+), 26 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8ba0c14..2727449 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 jtidy-04aug2000r7-dev.zip
 /jtidy-r938-sources.zip
+/jtidy.tar.xz
diff --git a/jtidy.spec b/jtidy.spec
index 0b52e76..4761ad4 100644
--- a/jtidy.spec
+++ b/jtidy.spec
@@ -1,26 +1,30 @@
 %global jtidyversion r938
 
-Name:          jtidy
-Version:       1.0
-Release:       0.7.%{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
-
-Requires:      java >= 1:1.6.0
-Requires:      jpackage-utils
-
-Obsoletes:     %{name}-scripts <= 2:1.0-0.4.r7dev.1.5
+Name:             jtidy
+Version:          1.0
+Release:          0.8.20100930svn1125%{?dist}
+Epoch:            2
+Summary:          HTML syntax checker and pretty printer
+Group:            Applications/Internet
+License:          zlib
+URL:              http://jtidy.sourceforge.net/
+# svn export -r1125 https://jtidy.svn.sourceforge.net/svnroot/jtidy/trunk/jtidy/ jtidy
+# tar caf jtidy.tar.xz jtidy
+Source0:          %{name}.tar.xz
+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
+
+Requires:         java >= 1:1.6.0
+Requires:         jpackage-utils
+Requires(post):   jpackage-utils
+Requires(postun): jpackage-utils
+
+Obsoletes:        %{name}-scripts <= 2:1.0-0.4.r7dev.1.5
 
 %description
 JTidy is a Java port of HTML Tidy, a HTML syntax checker and pretty printer. 
@@ -30,15 +34,15 @@ that is being processed, which effectively makes you able to use JTidy as a DOM
 parser for real-world HTML.
 
 %package javadoc
-Summary:       Javadoc for %{name}
-Group:         Documentation
-Requires:      jpackage-utils
+Summary:          Javadoc for %{name}
+Group:            Documentation
+Requires:         jpackage-utils
 
 %description javadoc
 This package contains the API documentation for %{name}.
 
 %prep
-%setup -q -c
+%setup -q -n %{name}
 
 %build
 ant \
@@ -52,6 +56,12 @@ 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
 
+# pom
+install -d -m 0755 %{buildroot}%{_mavenpomdir}
+install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+%add_to_maven_depmap net.sf.jtidy %{name} %{version} JPP %{name}
+%add_to_maven_depmap jtidy %{name} %{version} JPP %{name}
+
 # javadoc
 install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
 cp -pr target/javadoc/* %{buildroot}%{_javadocdir}/%{name}-%{version}/
@@ -67,6 +77,13 @@ cat > %{buildroot}%{_sysconfdir}/ant.d/%{name} << EOF
 jtidy
 EOF
 
+
+%post
+%update_maven_depmap
+
+%postun
+%update_maven_depmap
+
 %clean
 rm -rf %{buildroot}
 
@@ -74,6 +91,8 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc LICENSE.txt
 %{_javadir}/*
+%{_mavenpomdir}/*
+%{_mavendepmapfragdir}/*
 %attr(755, root, root) %{_bindir}/*
 %config(noreplace) %{_sysconfdir}/ant.d/%{name}
 
@@ -85,6 +104,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Sep 30 2010 Chris Spike <chris.spike at arcor.de> 2:1.0-0.8.20100930svn1125
+- Updated to latest upstream svn revision
+- Installed pom.xml
+- Added 'net.sf.jtidy:jtidy' to maven depmap
+- Added 'jtidy:jtidy' to maven depmap
+
 * Tue Sep 28 2010 Chris Spike <chris.spike at arcor.de> 2:1.0-0.7.r938
 - Added ant javac source attribute
 - Removed version from ant build requires
diff --git a/sources b/sources
index 6ca0788..be68543 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-90d03d672f732511a97c4a0eeae309a4  jtidy-r938-sources.zip
+636316de7e3344735aee1c3d041cf6c1  jtidy.tar.xz