[jtidy] Update to current packaging guidelines

[Mikolaj Izdebski]

commit e0859869ec1e515f016bc1251fbf397ca7161555
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Fri Jul 12 14:09:37 2013 +0200

    Update to current packaging guidelines

 jtidy.spec |   66 ++++++++++++++++++++++-------------------------------------
 1 files changed, 25 insertions(+), 41 deletions(-)
---
diff --git a/jtidy.spec b/jtidy.spec
index 334eed4..ac71076 100644
--- a/jtidy.spec
+++ b/jtidy.spec
@@ -2,17 +2,15 @@
 
 Name:             jtidy
 Version:          1.0
-Release:          0.14.20100930svn1125%{?dist}
+Release:          0.15.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
@@ -23,51 +21,40 @@ BuildRequires:    xml-commons-apis
 Requires:         java >= 1:1.6.0
 Requires:         jpackage-utils
 Requires:         xml-commons-apis
-Requires(post):   jpackage-utils
-Requires(postun): jpackage-utils
-
-Obsoletes:        %{name}-scripts < 2:1.0-0.5
 
 %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 interface to the document 
-that is being processed, which effectively makes you able to use JTidy as a DOM 
-parser for real-world HTML.
+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
-Summary:          Javadoc for %{name}
-Group:            Documentation
-Requires:         jpackage-utils
+Summary:          API documentation for %{name}
 
 %description javadoc
-This package contains the API documentation for %{name}.
+This package contains %{summary}.
 
 %prep
 %setup -q -n %{name}
 
 %build
-ant \
-    -Dant.build.javac.source=1.4
+ant -Dant.build.javac.source=1.4
 
 %install
-rm -rf %{buildroot}
-
 # jar
-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
+install -d -m 755 %{buildroot}%{_javadir}
+install -p -m 644 target/%{name}-%{jtidyversion}.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}
+install -d -m 755 %{buildroot}%{_mavenpomdir}
+install -p -m 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+%add_maven_depmap -a net.sf.jtidy:%{name}
 
 # javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
-cp -pr target/javadoc/* %{buildroot}%{_javadocdir}/%{name}-%{version}/
-ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
+install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}/
+cp -pr target/javadoc/* %{buildroot}%{_javadocdir}/%{name}/
 
 # shell script
 mkdir -p %{buildroot}%{_bindir}
@@ -79,18 +66,14 @@ cat > %{buildroot}%{_sysconfdir}/ant.d/%{name} << EOF
 jtidy
 EOF
 
+# Workaround for RPM bug #646523 - can't change symlink to directory
+# TODO: Remove this in F-22
+%pretrans javadoc -p <lua>
+dir = "%{_javadocdir}/%{name}"
+dummy = posix.readlink(dir) and os.remove(dir)
 
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
-%clean
-rm -rf %{buildroot}
 
 %files
-%defattr(-,root,root,-)
 %doc LICENSE.txt
 %{_javadir}/*
 %{_mavenpomdir}/*
@@ -99,13 +82,14 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/ant.d/%{name}
 
 %files javadoc
-%defattr(-,root,root,-)
 %doc LICENSE.txt
-%{_javadocdir}/%{name}-%{version}
 %{_javadocdir}/%{name}
 
 
 %changelog
+* Fri Jul 12 2013 Mikolaj Izdebski <mizdebsk at redhat.com> - 2:1.0-0.15.20100930svn1125
+- Update to current packaging guidelines
+
 * Fri Jun 28 2013 Mikolaj Izdebski <mizdebsk at redhat.com> - 2:1.0-0.14.20100930svn1125
 - Rebuild to regenerate API documentation
 - Resolves: CVE-2013-1571