From c9b62c4b0148a0e9bfd2d1375f1c5d57ee10fd4d Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 21 May 2014 18:27:56 +0200 Subject: [PATCH] Update to current packaging guidelines --- junit.spec | 70 ++++++++++-------------------------------------------- 1 file changed, 13 insertions(+), 57 deletions(-) diff --git a/junit.spec b/junit.spec index 3738007..0c8a39f 100644 --- a/junit.spec +++ b/junit.spec @@ -1,41 +1,9 @@ -# Copyright (c) 2000-2008, JPackage Project -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the -# distribution. -# 3. Neither the name of the JPackage Project nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - Name: junit Version: 4.11 -Release: 8%{?dist} -Epoch: 0 +Release: 9%{?dist} Summary: Java regression test package License: CPL URL: http://www.junit.org/ -Group: Development/Tools BuildArch: noarch # ./clean-tarball.sh %{version} @@ -48,16 +16,12 @@ Patch0: %{name}-no-hamcrest-src.patch BuildRequires: ant BuildRequires: ant-contrib -BuildRequires: jpackage-utils >= 0:1.7.4 -BuildRequires: java-devel >= 1:1.6.0 +BuildRequires: java-devel BuildRequires: hamcrest BuildRequires: perl(Digest::MD5) Requires: hamcrest -Requires: java-headless >= 1:1.6.0 - -Provides: junit4 = %{epoch}:%{version}-%{release} -Obsoletes: junit4 < %{epoch}:%{version}-%{release} +Requires: java-headless %description JUnit is a regression testing framework written by Erich Gamma and Kent Beck. @@ -66,30 +30,20 @@ Source Software, released under the Common Public License Version 1.0 and hosted on GitHub. %package manual -Group: Documentation Summary: Manual for %{name} -Provides: junit4-manual = %{epoch}:%{version}-%{release} -Obsoletes: junit4-manual < %{epoch}:%{version}-%{release} %description manual Documentation for %{name}. %package javadoc -Group: Documentation Summary: Javadoc for %{name} -Requires: jpackage-utils -Provides: junit4-javadoc = %{epoch}:%{version}-%{release} -Obsoletes: junit4-javadoc < %{epoch}:%{version}-%{release} %description javadoc Javadoc for %{name}. %package demo -Group: Development/Libraries Summary: Demos for %{name} -Requires: %{name} = %{epoch}:%{version}-%{release} -Provides: junit4-demo = %{epoch}:%{version}-%{release} -Obsoletes: junit4-demo < %{epoch}:%{version}-%{release} +Requires: %{name} = %{version}-%{release} %description demo Demonstrations and samples for %{name}. @@ -104,6 +58,9 @@ cp build/maven/junit-pom-template.xml pom.xml ln -s $(build-classpath hamcrest/core) lib/hamcrest-core-1.3.jar +# InaccessibleBaseClassTest fails with Java 8 +sed -i /InaccessibleBaseClassTest/d src/test/java/org/junit/tests/AllTests.java + %build ant dist -Dversion-status= @@ -117,8 +74,6 @@ zip -u %{name}%{version}/%{name}-%{version}.jar META-INF/MANIFEST.MF # jars install -d -m 755 %{buildroot}%{_javadir} install -m 644 %{name}%{version}/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar -# Many packages still use the junit4.jar directly -ln -s %{_javadir}/%{name}.jar %{buildroot}%{_javadir}/%{name}4.jar # pom install -d -m 755 %{buildroot}%{_mavenpomdir} @@ -135,12 +90,8 @@ install -d -m 755 %{buildroot}%{_datadir}/%{name}/demo/%{name} cp -pr %{name}%{version}/%{name}/* %{buildroot}%{_datadir}/%{name}/demo/%{name} -%files +%files -f .mfiles %doc LICENSE README CODING_STYLE -%{_javadir}/%{name}.jar -%{_javadir}/%{name}4.jar -%{_mavenpomdir}/* -%{_mavendepmapfragdir}/* %files demo %doc LICENSE @@ -155,6 +106,11 @@ cp -pr %{name}%{version}/%{name}/* %{buildroot}%{_datadir}/%{name}/demo/%{name} %doc junit%{version}/doc/* %changelog +* Wed May 21 2014 Mikolaj Izdebski - 4.11-9 +- Update to current packaging guidelines +- Drop old Obsoletes/Provides for junit4 rename +- Disable test which fails with Java 8 + * Tue Mar 04 2014 Stanislav Ochotnicky - 0:4.11-8 - Use Requires: java-headless rebuild (#1067528)