[nailgun/f20] Drop dep on ant-trax, rhbz #992319

[mbooth]

commit e46b0a94c31b31766679dd3e388532b451a3cf7c
Author: Mat Booth <fedora at matbooth.co.uk>
Date:   Mon Sep 2 17:24:36 2013 +0100

    Drop dep on ant-trax, rhbz #992319
    
    - Adapt to newer guidelines
    - Fix bogus changelog date

 nailgun.spec |   21 +++++++++------------
 1 files changed, 9 insertions(+), 12 deletions(-)
---
diff --git a/nailgun.spec b/nailgun.spec
index 60b4ad6..e1f55d1 100644
--- a/nailgun.spec
+++ b/nailgun.spec
@@ -2,7 +2,7 @@
 
 Name:     nailgun
 Version:  0.7.1
-Release:  8%{?dist}
+Release:  9%{?dist}
 Summary:  Framework for running Java from the cli without the JVM startup overhead
 Group:    Applications/Productivity   
 License:  ASL 2.0
@@ -10,13 +10,10 @@ URL:      http://martiansoftware.com/nailgun/
 Source0:  http://downloads.sourceforge.net/project/nailgun/nailgun/0.7.1/nailgun-src-0.7.1.zip
 Patch0:   remove-tools-jar-dependencies.patch
 
-BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildRequires: java-devel
 BuildRequires:  jpackage-utils
 BuildRequires: ant
-BuildRequires: ant-trax
 BuildRequires: ant-junit
-BuildRequires:  java-devel >= 1:1.6.0
 Requires: java
 Requires:  jpackage-utils
 
@@ -29,8 +26,6 @@ server (which is implemented in Java), and are triggered by the client
 %package javadoc
 Summary:        Javadocs for %{name}
 Group:          Documentation
-Requires:       %{name} = %{version}-%{release}
-Requires:       jpackage-utils
 BuildArch:      noarch
 
 %description javadoc
@@ -51,8 +46,7 @@ rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_javadir}
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 
-cp dist/nailgun-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/nailgun-%{version}.jar
-ln -s %{_javadir}/nailgun-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/nailgun.jar
+cp dist/nailgun-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 
 cp ng $RPM_BUILD_ROOT%{_bindir}/ng
 
@@ -63,17 +57,20 @@ cp -rp docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root,-)
-%{_javadir}/nailgun-%{version}.jar
 %{_javadir}/nailgun.jar
 %{_bindir}/ng
 %doc LICENSE.txt README.txt
 
 %files javadoc
-%defattr(-,root,root,-)
 %{_javadocdir}/%{name}
+%doc LICENSE.txt
 
 %changelog
+* Mon Sep 02 2013 Mat Booth <fedora at matbooth.co.uk> - 0.7.1-9
+- Drop dep on ant-trax, rhbz #992319
+- Adapt to newer guidelines
+- Fix bogus changelog date
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.7.1-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
@@ -97,5 +94,5 @@ rm -rf $RPM_BUILD_ROOT
 - removed empty debuginfo package
 - marked javadoc package as noarch
 
-* Wed Jan  20 2009  <mmorsi at redhat.com> - 0.7.1-1
+* Tue Jan  20 2009  <mmorsi at redhat.com> - 0.7.1-1
 - Initial build.