Accepting request 198685 from Java:packages

jpackage-utils collison fix

OBS-URL: https://build.opensuse.org/request/show/198685
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/hamcrest?expand=0&rev=12
This commit is contained in:
Tomáš Chvátal 2013-09-12 15:05:17 +00:00 committed by Git OBS Bridge
commit 2aade33966
2 changed files with 7 additions and 2 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Sep 9 11:05:43 UTC 2013 - tchvatal@suse.com
- Move from jpackage-utils to javapackage-tools
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Sep 3 14:23:47 UTC 2013 - mvyskocil@suse.com Tue Sep 3 14:23:47 UTC 2013 - mvyskocil@suse.com

View File

@ -58,7 +58,7 @@ Requires: qdox
BuildRequires: ant >= 1.6.5 BuildRequires: ant >= 1.6.5
BuildRequires: ant-junit BuildRequires: ant-junit
BuildRequires: java-devel >= 1.5.0 BuildRequires: java-devel >= 1.5.0
BuildRequires: jpackage-utils >= 1.7.4 BuildRequires: javapackages-tools
%if %with integration %if %with integration
BuildRequires: easymock2 BuildRequires: easymock2
%endif %endif
@ -76,7 +76,7 @@ BuildRequires: testng
%endif %endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch BuildArch: noarch
PreReq: jpackage-utils >= 1.7.4 PreReq: javapackages-tools
%description %description
Provides a library of matcher objects (also known as constraints or Provides a library of matcher objects (also known as constraints or