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

1 files changed, 12 insertions, 15 deletions

diff --git a/php83.spec b/php83.spec
index 6679f39..2ff352b 100644
--- a/php83.spec
+++ b/php83.spec
@@ -1,8 +1,8 @@
 # remirepo spec file for php83 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
 #
@@ -12,12 +12,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
 
@@ -27,7 +22,7 @@
 Summary:       Package that installs PHP %{scl_name_verdot}
 Name:          %{scl_name}
 Version:       %{scl_name_verdot}
-Release:       1%{?dist}
+Release:       2%{?dist}
 License:       GPL-2.0-or-later
 
 Source0:       macros-build
@@ -43,7 +38,6 @@ BuildRequires: environment-modules
 Requires:      %{?scl_prefix}php-common%{?_isa}
 Requires:      %{?scl_prefix}php-cli%{?_isa}
 Requires:      %{?scl_name}-runtime%{?_isa}      = %{version}-%{release}
-%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
 # this a meta-package, so commonly used SAPI / extensions:
 Recommends:    %{?scl_prefix}php-fpm%{?_isa}
 Recommends:    %{?scl_prefix}php-mbstring%{?_isa}
@@ -51,7 +45,6 @@ Recommends:    %{?scl_prefix}php-opcache%{?_isa}
 Recommends:    %{?scl_prefix}php-pdo%{?_isa}
 Recommends:    %{?scl_prefix}php-sodium%{?_isa}
 Recommends:    %{?scl_prefix}php-xml%{?_isa}
-%endif
 
 %description
 This is the main package for %scl Software Collection,
@@ -63,7 +56,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}
 
@@ -226,11 +223,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
@@ -260,6 +253,10 @@ restorecon -R %{_localstatedir} &>/dev/null || :
 
 
 %changelog
+* Fri Feb 14 2025 Remi Collet <remi@remirepo.net> 8.3-2
+- F42: fix dependencies
+- re-license spec file to CECILL-2.1
+
 * Mon Jun  5 2023 Remi Collet <remi@remirepo.net> 8.3-1
 - initial package for 8.3