new jpackage-tools

OBS-URL: https://build.opensuse.org/package/show/Java:packages/junit?expand=0&rev=8
This commit is contained in:
Tomáš Chvátal 2015-03-18 10:07:47 +00:00 committed by Git OBS Bridge
parent b3e75b6615
commit d0c174ccce
2 changed files with 14 additions and 13 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Mar 18 09:46:15 UTC 2015 - tchvatal@suse.com
- Fix build with new javapackages-tools
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Oct 25 07:39:22 UTC 2013 - mvyskocil@suse.com Fri Oct 25 07:39:22 UTC 2013 - mvyskocil@suse.com

View File

@ -1,7 +1,7 @@
# #
# spec file for package junit # spec file for package junit
# #
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -26,25 +26,21 @@ Url: http://www.junit.org/
Source0: https://github.com/junit-team/junit/archive/r%{version}.tar.gz Source0: https://github.com/junit-team/junit/archive/r%{version}.tar.gz
#Source1: http://search.maven.org/remotecontent?filepath=junit/junit/4.11/junit-4.11.pom #Source1: http://search.maven.org/remotecontent?filepath=junit/junit/4.11/junit-4.11.pom
Source1: junit-4.11.pom Source1: junit-4.11.pom
#PATCH-FIX-OPENSUSE: do not use bundled hamcrest sources, which btw fixes hamcrest build with junit4 #PATCH-FIX-OPENSUSE: do not use bundled hamcrest sources, which btw fixes hamcrest build with junit4
Patch0: junit-no-hamcrest-src.patch Patch0: junit-no-hamcrest-src.patch
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: ant BuildRequires: ant
BuildRequires: hamcrest >= 1.3 BuildRequires: hamcrest >= 1.3
BuildRequires: java-devel >= 1.6.0 BuildRequires: java-devel >= 1.6.0
BuildRequires: javapackages-tools BuildRequires: javapackages-tools
BuildRequires: perl(Digest::MD5) BuildRequires: perl(Digest::MD5)
Requires(post): javapackages-tools
Requires(postun): javapackages-tools
Requires: hamcrest Requires: hamcrest
Requires: java >= 1.6.0 Requires: java >= 1.6.0
Requires(post): javapackages-tools
Requires(postun): javapackages-tools
Provides: junit4 = %{version} Provides: junit4 = %{version}
Obsoletes: junit4 <= 4.10 Obsoletes: junit4 <= 4.10
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
%description %description
JUnit is a regression testing framework written by Erich Gamma and Kent Beck. JUnit is a regression testing framework written by Erich Gamma and Kent Beck.
@ -136,7 +132,7 @@ java -cp %{buildroot}/%{_javadir}/%{name}.jar: test && exit 42
%{_javadir}/%{name}.jar %{_javadir}/%{name}.jar
%{_javadir}/junit4.jar %{_javadir}/junit4.jar
%{_mavenpomdir}/* %{_mavenpomdir}/*
%{_mavendepmapfragdir}/* %{_datadir}/maven-metadata/%{name}.xml*
%files demo %files demo
%defattr(0644,root,root,0755) %defattr(0644,root,root,0755)