summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2020-04-09 16:24:17 +0200
committerRemi Collet <remi@remirepo.net>2020-04-09 16:24:17 +0200
commit23b24ee5e68356dc1772f0656c16e745fcfdaa77 (patch)
tree8aeb7c518ae765b92b36dd64697076c0b8d341ee
parent73935f0c613bdb3ff13461ea73215aeef6fd00cc (diff)
cleanupHEADmaster
-rw-r--r--php74.spec17
1 files changed, 0 insertions, 17 deletions
diff --git a/php74.spec b/php74.spec
index 48d4671..23764b4 100644
--- a/php74.spec
+++ b/php74.spec
@@ -18,14 +18,6 @@
%global nfsmountable 1
%endif
-%if 0%{?fedora} >= 20 && 0%{?fedora} < 27
-# Requires scl-utils v2 for SCL integration, dropped in F29
-%global with_modules 1
-%else
-# Works with file installed in /usr/share/Modules/modulefiles/
-%global with_modules 0
-%endif
-
%scl_package %scl
# do not produce empty debuginfo package
@@ -168,11 +160,7 @@ help2man -N --section 7 ./h2m_helper -o %{scl_name}.7
%install
install -D -m 644 enable %{buildroot}%{_scl_scripts}/enable
-%if %{with_modules}
-install -D -m 644 envmod %{buildroot}%{_scl_scripts}/%{scl_name}
-%else
install -D -m 644 envmod %{buildroot}%{_root_datadir}/Modules/modulefiles/%{scl_name}
-%endif
install -D -m 644 scldev %{buildroot}%{macrosdir}/macros.%{scl_name_base}-scldevel
install -D -m 644 %{scl_name}.7 %{buildroot}%{_mandir}/man7/%{scl_name}.7
@@ -183,9 +171,6 @@ install -d -m 755 %{buildroot}%{_localstatedir}/lib/pear/pkgxml
%scl_install
-%if %{?fedora} >= 31
-sed -e '/undefine/d' -i %{buildroot}%{_root_sysconfdir}/rpm/macros.%{scl}-config
-%endif
cat %{buildroot}%{_root_sysconfdir}/rpm/macros.%{scl}-config
# Add the scl_package_override macro
@@ -239,9 +224,7 @@ restorecon -R %{_localstatedir} &>/dev/null || :
%{_mandir}/man7/%{scl_name}.*
%{?_licensedir:%{_datadir}/licenses}
%{_datadir}/tests
-%if ! %{with_modules}
%{_root_datadir}/Modules/modulefiles/%{scl_name}
-%endif
%files build