From 11392469627ceff7ce2f5c286df272526c5bcf59 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 23 Aug 2018 13:18:49 +0200 Subject: scl-utils 2.0.2 drop modules support --- php73.spec | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/php73.spec b/php73.spec index e5963a5..0625aa8 100644 --- a/php73.spec +++ b/php73.spec @@ -3,15 +3,21 @@ %global scl %{scl_name_base}%{scl_name_version} %global macrosdir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_root_sysconfdir}/rpm; echo $d) %global install_scl 1 + %if 0%{?fedora} >= 20 -# Requires scl-utils v2 for SCL integration -%global with_modules 1 %global rh_layout 1 %else +%global nfsmountable 1 +%endif + +%if 0%{?fedora} >= 20 && 0%{?fedora} < 27 +# Requires scl-utils v2 for SCL integration, dropeed in F29 +%global with_modules 1 +%else # Works with file installed in /usr/share/Modules/modulefiles/ %global with_modules 0 -%global nfsmountable 1 %endif + %scl_package %scl # do not produce empty debuginfo package @@ -20,7 +26,7 @@ Summary: Package that installs PHP 7.3 Name: %scl_name Version: 1.0 -Release: 0.1%{?dist} +Release: 1%{?dist} License: GPLv2+ Source0: macros-build @@ -196,6 +202,9 @@ restorecon -R %{_localstatedir} &>/dev/null || : %{macrosdir}/macros.%{scl_name_base}-scldevel %changelog +* Thu Aug 23 2018 Remi Collet 1.0-1 +- scl-utils 2.0.2 drop modules support + * Thu Jun 7 2018 Remi Collet 1.0-0.1 - initial packaging -- cgit