From: Jan Palus Date: Fri, 29 Dec 2023 10:28:46 +0000 (+0100) Subject: switch to %use_default_jdk X-Git-Tag: auto/th/subversion-1.14.3-1~1 X-Git-Url: https://git.pld-linux.org/?a=commitdiff_plain;h=2d5591a1107ea04e2ab5db2828b409b56ee56c36;p=packages%2Fsubversion.git switch to %use_default_jdk --- diff --git a/subversion.spec b/subversion.spec index 43d0df3..147a9ed 100644 --- a/subversion.spec +++ b/subversion.spec @@ -49,7 +49,7 @@ %define pdir SVN %define pnam _Core -%define use_jdk openjdk8 +%{?with_java:%{?use_default_jdk}} Summary: A Concurrent Versioning system similar to but better than CVS Summary(pl.UTF-8): System kontroli wersji podobny, ale lepszy, niż CVS @@ -112,7 +112,7 @@ BuildRequires: python3 >= 1:3.2 %endif BuildRequires: rpm-build >= 4.6 BuildRequires: rpm-pythonprov -BuildRequires: rpmbuild(macros) >= 1.752 +BuildRequires: rpmbuild(macros) >= 2.021 BuildRequires: sed >= 4.0 BuildRequires: serf-devel >= 1.3.4 BuildRequires: sqlite3-devel >= 3.8.11.1 @@ -120,7 +120,7 @@ BuildRequires: texinfo BuildRequires: which BuildRequires: zlib-devel >= 1.2 %if %{with java} -BuildRequires: openjdk8-jdk-base +%buildrequires_jdk BuildRequires: libstdc++-devel >= 6:4.7 %endif %if %{with perl}