[junit4] Do not BR/R openjdk6 but java >= 1:1.6.0

[Alexander Kurtakov]

commit 60e78c86eebe81037a5d17e795da59eda62619d7
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Thu Aug 25 10:55:16 2011 +0300

    Do not BR/R openjdk6 but java >= 1:1.6.0
    
    - Adapt to current guidelines.

 junit4.spec |   48 ++++++++++++++----------------------------------
 1 files changed, 14 insertions(+), 34 deletions(-)
---
diff --git a/junit4.spec b/junit4.spec
index db1ffaa..65348c5 100644
--- a/junit4.spec
+++ b/junit4.spec
@@ -30,7 +30,7 @@
 
 Name:           junit4
 Version:        4.8.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Epoch:          0
 Summary:        Java regression test package
 License:        CPL
@@ -44,13 +44,12 @@ Source0:        junit-%{version}.tar.bz2
 Requires(post): jpackage-utils >= 0:1.7.4
 Requires(postun): jpackage-utils >= 0:1.7.4
 Requires:       hamcrest
-Requires:       java-1.6.0
+Requires:       java >= 1:1.6.0
 BuildRequires:  ant
 BuildRequires:  jpackage-utils >= 0:1.7.4
-BuildRequires:  java-1.6.0-devel
+BuildRequires:  java-devel >= 1:1.6.0
 BuildRequires:  hamcrest
 BuildArch:      noarch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
 %description
 JUnit is a regression testing framework written by Erich Gamma and Kent Beck. 
@@ -89,66 +88,47 @@ ln -s $(build-classpath hamcrest/core) lib/hamcrest-core-1.1.jar
 perl -pi -e 's/\r$//g' stylesheet.css
 
 %build
-export CLASSPATH=
-export OPT_JAR_LIST=:
 ant -Dant.build.javac.source=1.5 dist
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 # jars
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -m 644 junit%{version}/junit-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-pushd $RPM_BUILD_ROOT%{_javadir} 
-ln -sf %{name}-%{version}.jar %{name}.jar
-popd
+install -m 644 junit%{version}/junit-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 
 # pom
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
-install -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
-%add_to_maven_depmap junit junit %{version} JPP %{name}
+install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
+install -m 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
 
 # javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr junit%{version}/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr junit%{version}/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 # demo
 install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/demo/junit # Not using %%name for last part because it is 
                                                                 # part of package name
 cp -pr junit%{version}/junit/* $RPM_BUILD_ROOT%{_datadir}/%{name}/demo/junit
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
 %files
-%defattr(0644,root,root,0755)
 %doc cpl-v10.html README.html
 %{_javadir}/%{name}.jar
-%{_javadir}/%{name}-%{version}.jar
-%{_datadir}/maven2/*
+%{_mavenpomdir}/*
 %{_mavendepmapfragdir}/*
 
 %files demo
-%defattr(0644,root,root,0755)
 %{_datadir}/%{name}
 
 %files javadoc
-%defattr(0644,root,root,0755)
-%{_javadocdir}/%{name}-%{version}
 %{_javadocdir}/%{name}
 
 %files manual
-%defattr(0644,root,root,0755)
 %doc junit%{version}/doc/*
 
 %changelog
+* Thu Aug 25 2011 Alexander Kurtakov <akurtako at redhat.com> 0:4.8.2-3
+- Do not BR/R openjdk6 but java >= 1:1.6.0
+- Adapt to current guidelines.
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:4.8.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild