From 5f80c70bea9e4c911eb83d2c970e04466adbf353 Mon Sep 17 00:00:00 2001
From: Gerard Ryan <gerard@ryan.lt>
Date: Jul 27 2013 23:46:22 +0000
Subject: Some more spec cleaning


---

diff --git a/dtdparser.spec b/dtdparser.spec
index 707e3b8..21eb7f9 100644
--- a/dtdparser.spec
+++ b/dtdparser.spec
@@ -32,21 +32,27 @@ Name:           dtdparser
 Version:        1.21
 Release:        9%{?dist}
 Summary:        A Java DTD Parser
+
 # The code has no license attribution.
 # There is a LICENSE.INFO file, but it does not specify versions.
 # The only versioning is in the ASL_LICENSE file, which has been edited by the upstream.
 License:        LGPLv2+ or ASL 1.1
+URL:            http://wutka.com/%{name}.html
+BuildArch:      noarch
+
+
 Source0:        http://wutka.com/download/%{name}-%{version}.tgz
 Source1:        http://repo1.maven.org/maven2/com/wutka/%{name}/%{version}/%{name}-%{version}.pom
 
+# Without removing these comments, build fails
 Patch0:         %{name}-unmappable-chars-in-comments.patch
-URL:            http://wutka.com/dtdparser.html
+
 BuildRequires:  ant
+BuildRequires:  java-devel
+BuildRequires:  jpackage-utils
+
 Requires:       java
-Requires:       jpackage-utils >= 0:1.6
-Requires(postun): jpackage-utils >= 0:1.6 
-Group:          Development/Libraries/Java
-BuildArch:      noarch
+Requires:       jpackage-utils
 
 %description
 DTD parsers for Java seem to be pretty scarce. That's probably because
@@ -57,15 +63,14 @@ use this library to parse a DTD.
 %package javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
-Requires:       jpackage-utils >= 0:1.6
+Requires:       jpackage-utils
 
 %description javadoc
 Javadoc for %{name}.
 
 %prep
 %setup -q
-# remove all binary libs
-find . -name "*.jar" -exec rm -f {} \;
+find -name \*.jar -o -name \*.class -delete
 
 %patch0
 
@@ -73,13 +78,9 @@ find . -name "*.jar" -exec rm -f {} \;
 ant build createdoc
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 # jars
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -m 644 dist/%{name}120.jar \
-  $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+install -m 644 dist/%{name}120.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 
 # javadoc
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
@@ -99,6 +100,7 @@ install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
 
 %files javadoc
 %doc %{_javadocdir}/*
+%doc LICENSE
 
 %changelog
 * Sat Jul 27 2013 Gerard Ryan <galileo@fedoraproject.org> - 1.21-9