Sync from SUSE:SLFO:Main hamcrest revision ca3b46bb9aab4a661255cc6ed4c81630

This commit is contained in:
Adrian Schröter 2024-05-31 14:37:08 +02:00
parent 921455fd28
commit d472f95ea4
2 changed files with 14 additions and 9 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Feb 21 09:10:46 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Use %patch -P N instead of deprecated %patchN.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jun 9 16:00:32 UTC 2022 - Fridrich Strba <fstrba@suse.com> Thu Jun 9 16:00:32 UTC 2022 - Fridrich Strba <fstrba@suse.com>

View File

@ -1,7 +1,7 @@
# #
# spec file for package hamcrest # spec file for package hamcrest
# #
# Copyright (c) 2022 SUSE LLC # Copyright (c) 2024 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
@ -33,14 +33,14 @@ Patch0: 0001-Fix-build-with-OpenJDK-11.patch
BuildRequires: ant BuildRequires: ant
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: java-devel >= 1.8 BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-local BuildRequires: javapackages-local >= 6
%if %{with tests}
BuildRequires: ant-junit
%endif
Provides: %{name}-core = %{version} Provides: %{name}-core = %{version}
Obsoletes: %{name}-core < %{version} Obsoletes: %{name}-core < %{version}
Obsoletes: %{name}-demo < %{version} Obsoletes: %{name}-demo < %{version}
BuildArch: noarch BuildArch: noarch
%if %{with tests}
BuildRequires: ant-junit
%endif
%description %description
Provides a library of matcher objects (also known as constraints or Provides a library of matcher objects (also known as constraints or
@ -56,14 +56,14 @@ Group: Documentation/HTML
Javadoc for %{name}. Javadoc for %{name}.
%prep %prep
%setup -q -n %{name}-%{version} %setup -q
cp %{SOURCE1} build.xml cp %{SOURCE1} build.xml
cp %{SOURCE3} %{SOURCE4} . cp %{SOURCE3} %{SOURCE4} .
%patch0 -p2 %patch -P 0 -p2
%build %build
%ant \ %{ant} \
%if %{without tests} %if %{without tests}
-Dtest.skip=true \ -Dtest.skip=true \
%endif %endif
@ -79,7 +79,7 @@ ln -sf %{name}.jar %{buildroot}%{_javadir}/%{name}/library.jar
# poms # poms
install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name} install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name}
install -pm 0644 %{SOURCE2} %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom %{mvn_install_pom} %{SOURCE2} %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom
%add_maven_depmap %{name}/%{name}.pom %{name}/%{name}.jar -a "org.hamcrest:hamcrest-all,org.hamcrest:hamcrest-core,org.hamcrest:hamcrest-library" %add_maven_depmap %{name}/%{name}.pom %{name}/%{name}.jar -a "org.hamcrest:hamcrest-all,org.hamcrest:hamcrest-core,org.hamcrest:hamcrest-library"
# javadoc # javadoc