pool/junit
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/Java:packages/junit?expand=0&rev=49

Browse Source
This commit is contained in:
Fridrich Strba 2023-03-23 17:21:24 +00:00 committed by Git OBS Bridge
parent e35ad093c7
commit d02353b840
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
junit.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Mar 23 17:18:10 UTC 2023 - Fridrich Strba <fstrba@suse.com>
- Conditionalize the spec file so that junit can be built with
both hamcrest 1.3 and 2.2 from the same sources
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jun 9 18:02:17 UTC 2022 - Fridrich Strba <fstrba@suse.com> Thu Jun 9 18:02:17 UTC 2022 - Fridrich Strba <fstrba@suse.com>

14
junit.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package junit # spec file for package junit
# #
# Copyright (c) 2022 SUSE LLC # Copyright (c) 2023 SUSE LLC
# #
# 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
@ -28,10 +28,10 @@ Source1: build.xml
Patch0: 0001-Port-to-hamcrest-2.2.patch Patch0: 0001-Port-to-hamcrest-2.2.patch
BuildRequires: ant BuildRequires: ant
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: hamcrest >= 2.2 BuildRequires: hamcrest >= 1.3
BuildRequires: java-devel >= 1.8 BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-local BuildRequires: javapackages-local
Requires: mvn(org.hamcrest:hamcrest-core) %requires_ge hamcrest
Provides: %{name}-demo = %{version}-%{release} Provides: %{name}-demo = %{version}-%{release}
Obsoletes: %{name}-demo < %{version}-%{release} Obsoletes: %{name}-demo < %{version}-%{release}
Provides: %{name}4-demo = %{version}-%{release} Provides: %{name}4-demo = %{version}-%{release}
@ -64,15 +64,21 @@ Documentation for %{name}.
%prep %prep
%setup -q -n %{name}4-r%{version} %setup -q -n %{name}4-r%{version}
%if %{?pkg_vcmp:%pkg_vcmp hamcrest >= 2.0}%{!?pkg_vcmp:0}
%patch0 -p1 %patch0 -p1
%endif
cp %{SOURCE1} . cp %{SOURCE1} .
find . -type f -name "*.jar" -or -name "*.class" | xargs -t rm -rf find . -type f -name "*.jar" -or -name "*.class" | xargs -t rm -rf
%if %{?pkg_vcmp:%pkg_vcmp hamcrest >= 2.0}%{!?pkg_vcmp:0}
ln -s $(build-classpath hamcrest/hamcrest) lib/hamcrest-core-1.3.jar ln -s $(build-classpath hamcrest/hamcrest) lib/hamcrest-core-1.3.jar
%else
ln -s $(build-classpath hamcrest/all) lib/hamcrest-core-1.3.jar
%endif
%build %build
export CLASSPATH=$(build-classpath hamcrest/hamcrest) export CLASSPATH=$(build-classpath hamcrest)
ant jars javadoc -Dversion-status= ant jars javadoc -Dversion-status=
%install %install