summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2025-02-14 09:53:53 +0100
committerRemi Collet <remi@php.net>2025-02-14 09:53:53 +0100
commit8dc9e883ab2ef2f2c1b372ca437f3db9de4100e0 (patch)
treeb673bdeedd10df845aa2db9ce90c469d7ef87ad1
parent31eba22901f05d8e8020d88572fe0c9d59760af5 (diff)
F42: fix dependenciesHEADmaster
re-license spec file to CECILL-2.1 F42: fix dependencies re-license spec file to CECILL-2.1 F42: fix dependencies re-license spec file to CECILL-2.1 F42: fix dependencies re-license spec file to CECILL-2.1 F42: fix dependencies re-license spec file to CECILL-2.1
-rw-r--r--php80.spec25
1 files changed, 12 insertions, 13 deletions
diff --git a/php80.spec b/php80.spec
index 0cd8fa0..98c1408 100644
--- a/php80.spec
+++ b/php80.spec
@@ -1,8 +1,8 @@
# remirepo spec file for php80 SCL metapackage
#
-# Copyright (c) 2018-2023 Remi Collet
-# License: CC-BY-SA-4.0
-# http://creativecommons.org/licenses/by-sa/4.0/
+# SPDX-FileCopyrightText: Copyright 2018-2025 Remi Collet
+# SPDX-License-Identifier: CECILL-2.1
+# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
#
# Please, preserve the changelog entries
#
@@ -11,12 +11,7 @@
%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 || 0%{?rhel} >= 8
%global rh_layout 1
-%else
-%global nfsmountable 1
-%endif
%scl_package %scl
@@ -26,7 +21,7 @@
Summary: Package that installs PHP 8.0
Name: %scl_name
Version: 8.0
-Release: 3%{?dist}
+Release: 4%{?dist}
License: GPL-2.0-or-later
Source0: macros-build
@@ -53,7 +48,11 @@ Summary: Package that handles %scl Software Collection.
Requires: scl-utils
Requires: environment-modules
Requires(post): %{_root_sbindir}/semanage
+%if 0%{?fedora} >= 42 || 0%{?rhel} >= 11
+Requires(post): %{_root_bindir}/selinuxenabled
+%else
Requires(post): %{_root_sbindir}/selinuxenabled
+%endif
Provides: %{?scl_name}-runtime(%{scl_vendor})
Provides: %{?scl_name}-runtime(%{scl_vendor})%{?_isa}
@@ -214,11 +213,7 @@ restorecon -R %{_localstatedir} &>/dev/null || :
%files
-%if 0%{?fedora} < 19 && 0%{?rhel} < 7
-%files runtime
-%else
%files runtime -f filesystem
-%endif
%license LICENSE
%doc README
%scl_files
@@ -248,6 +243,10 @@ restorecon -R %{_localstatedir} &>/dev/null || :
%changelog
+* Fri Feb 14 2025 Remi Collet <remi@remirepo.net> 8.0-4
+- F42: fix dependencies
+- re-license spec file to CECILL-2.1
+
* Wed Apr 26 2023 Remi Collet <remi@remirepo.net> 8.0-3
- redefine %%__phpize and %%__phpconfig