Accepting request 198696 from Java:packages

jpackage-utils collison fix

OBS-URL: https://build.opensuse.org/request/show/198696
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/junitperf?expand=0&rev=12
This commit is contained in:
Tomáš Chvátal 2013-09-12 15:04:38 +00:00 committed by Git OBS Bridge
parent db4310c83a
commit 05a95b7315
2 changed files with 11 additions and 13 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Sep 9 11:06:07 UTC 2013 - tchvatal@suse.com
- Move from jpackage-utils to javapackage-tools
-------------------------------------------------------------------
Fri Jun 12 11:26:16 CEST 2009 - mvyskocil@suse.cz

View File

@ -1,7 +1,7 @@
#
# spec file for package junitperf (Version 1.9.1)
# spec file for package junitperf
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -20,7 +20,7 @@
Name: junitperf
Version: 1.9.1
Release: 3
Release: 0
Summary: JUnit extension for performance and scalability testing
License: BSD-3-Clause
Group: Development/Libraries/Java
@ -30,7 +30,7 @@ Requires: junit >= 3.2
BuildRequires: ant
BuildRequires: ant-junit
BuildRequires: java-devel
BuildRequires: jpackage-utils >= 1.6
BuildRequires: javapackages-tools
BuildRequires: junit >= 3.2
BuildRequires: unzip
BuildArch: noarch
@ -44,9 +44,8 @@ JUnit tests.
%package javadoc
License: BSD-3-Clause
Group: Development/Libraries/Java
Summary: JUnit extension for performance and scalability testing
Group: Development/Libraries/Java
%description javadoc
JUnitPerf is a collection of JUnit test decorators used to measure the
@ -56,9 +55,8 @@ JUnit tests.
%package demo
License: BSD-3-Clause
Group: Development/Libraries/Java
Summary: JUnit extension for performance and scalability testing
Group: Development/Libraries/Java
Requires: %{name} = %{version}
%description demo
@ -112,8 +110,3 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/%{name}
%changelog
* Fri Jun 12 2009 mvyskocil@suse.cz
- Disabled junit testing, because performance testing fails on build farm with
many virtual machinses
* Tue May 12 2009 mvyskocil@suse.cz
- Initial packaging of junitperf 1.9.1 from jpp 5.0