[junitperf/f16] Update for latest Java guidelines.

[mbooth]

commit 783cd8b9176f61a86eedd13004710081bb64ca4a
Author: mbooth <mbooth at fedoraproject.org>
Date:   Sun Jul 31 21:34:57 2011 +0100

    Update for latest Java guidelines.

 junitperf.spec |   75 ++++++++++++++++++++++++-------------------------------
 1 files changed, 33 insertions(+), 42 deletions(-)
---
diff --git a/junitperf.spec b/junitperf.spec
index 13f2c46..a63aa74 100644
--- a/junitperf.spec
+++ b/junitperf.spec
@@ -30,19 +30,21 @@
 
 Name:           junitperf
 Version:        1.9.1
-Release:        5.2%{?dist}
-Epoch:          0
+Release:        6%{?dist}
 Summary:        JUnit extension for performance and scalability testing
 License:        BSD
 Group:          Development/Testing
 Source0:        http://www.clarkware.com/software/junitperf-1.9.1.zip
 URL:            http://www.clarkware.com/software/JUnitPerf.html
-BuildRequires:  ant, ant-junit, junit >= 0:3.2, jpackage-utils >= 0:1.6
+BuildRequires:  ant
+BuildRequires:  ant-junit
+BuildRequires:  java-devel
+BuildRequires:  jpackage-utils
+BuildRequires:  junit >= 3.2
 BuildArch:      noarch
 Requires:       java
 Requires:       jpackage-utils
-Requires:       junit >= 0:3.2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires:       junit >= 3.2
 
 %description
 JUnitPerf is a collection of JUnit test decorators used to measure the
@@ -51,74 +53,63 @@ JUnit tests.
 
 %package javadoc
 Group:          Documentation
-Summary:        Javadoc for %{name}
+Summary:        API documentation for %{name}
+Requires:       jpackage-utils
 
 %description javadoc
-Javadoc for %{name}.
+%{summary}.
 
 %package demo
-Group:          Development/Testing
-Summary:        Demos for %{name}
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Group:          Documentation
+Summary:        Demos and samples for %{name}
+Requires:       %{name} = %{version}-%{release}
 
 %description demo
-Demonstrations and samples for %{name}.
-
-# -----------------------------------------------------------------------------
+%{summary}.
 
 %prep
 %setup -q -n %{name}-%{version}
+
 # remove all binary libs
 find . -name "*.jar" -exec rm -f {} \;
 
-# -----------------------------------------------------------------------------
-
 %build
 CLASSPATH=$(build-classpath junit) ant -Dbuild.sysclasspath=first jar test javadoc
 
-# -----------------------------------------------------------------------------
-
 %install
-rm -rf $RPM_BUILD_ROOT
-
-# jars
-install -d -m 0755 $RPM_BUILD_ROOT%{_javadir}
-install -m 0644 dist/%{name}-%{version}.jar \
-    $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+# jar
+install -pD -T dist/%{name}-%{version}.jar \
+  %{buildroot}%{_javadir}/%{name}.jar
 
 # javadoc
-install -d -m 0755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr build/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr build/docs/api/* %{buildroot}%{_javadocdir}/%{name}
 
 # demo
-install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/%{name}
-cp -pr samples $RPM_BUILD_ROOT%{_datadir}/%{name}
-
-# -----------------------------------------------------------------------------
+install -d -m 0755 %{buildroot}%{_datadir}/%{name}
+cp -pr samples %{buildroot}%{_datadir}/%{name}
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-# -----------------------------------------------------------------------------
+%pre javadoc
+# workaround for rpm bug, can be removed in F-18
+[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
+rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 
 %files
-%defattr(0644,root,root,0755)
 %doc LICENSE README docs/JUnitPerf.html
-%{_javadir}/*
+%{_javadir}/%{name}.jar
 
 %files javadoc
-%defattr(0644,root,root,0755)
-%doc %{_javadocdir}/*
+%doc LICENSE
+%{_javadocdir}/%{name}
 
 %files demo
-%defattr(0644,root,root,0755)
+%doc LICENSE
 %{_datadir}/%{name}
 
-# -----------------------------------------------------------------------------
-
 %changelog
+* Sun Jul 31 2011 Mat Booth <fedora at matbooth.co.uk> 1.9.1-6
+- Update for latest Java guidelines.
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.9.1-5.2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild