cleanup SCL stuff for Fedora review

1 files changed, 17 insertions, 43 deletions

diff --git a/php-pecl-rnp.spec b/php-pecl-rnp.spec
index ba0c169..023bdf7 100644
--- a/php-pecl-rnp.spec
+++ b/php-pecl-rnp.spec
@@ -1,3 +1,6 @@
+# Fedora spec file for php-pecl-bitset
+# without SCL compatibility, from:
+#
 # remirepo spec file for php-pecl-rnp
 #
 # Copyright (c) 2022-2023 Remi Collet
@@ -10,10 +13,6 @@
 # we don't want -z defs linker flag
 %undefine _strict_symbol_defs_build
 
-%if 0%{?scl:1}
-%scl_package        php-pecl-rnp
-%endif
-
 %bcond_without      tests
 %global with_zts    0%{!?_without_zts:%{?__ztsphp:1}}
 %global pecl_name   rnp
@@ -25,40 +24,38 @@
 %global _configure       ../%{sources}/configure
 
 Summary:        wrapper around the RNP library
-Name:           %{?scl_prefix}php-pecl-%{pecl_name}
+Name:           php-pecl-%{pecl_name}
 Version:        %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
-Release:        2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release:        2%{?dist}
 
 License:        BSD-2-Clause
 URL:            https://pecl.php.net/package/%{pecl_name}
 Source0:        https://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz
 
 BuildRequires:  make
-BuildRequires:  %{?dtsprefix}gcc
-BuildRequires:  %{?scl_prefix}php-devel >= 8.0
-BuildRequires:  %{?scl_prefix}php-pear
+BuildRequires:  gcc
+BuildRequires:  php-devel >= 8.0
+BuildRequires:  php-pear
 BuildRequires:  librnp-devel
 
-Requires:       %{?scl_prefix}php(zend-abi) = %{php_zend_api}
-Requires:       %{?scl_prefix}php(api) = %{php_core_api}
+Requires:       php(zend-abi) = %{php_zend_api}
+Requires:       php(api) = %{php_core_api}
 
-Provides:       %{?scl_prefix}php-%{pecl_name}               = %{version}
-Provides:       %{?scl_prefix}php-%{pecl_name}%{?_isa}       = %{version}
-Provides:       %{?scl_prefix}php-pecl(%{pecl_name})         = %{version}
-Provides:       %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version}
+Provides:       php-%{pecl_name}               = %{version}
+Provides:       php-%{pecl_name}%{?_isa}       = %{version}
+Provides:       php-pecl(%{pecl_name})         = %{version}
+Provides:       php-pecl(%{pecl_name})%{?_isa} = %{version}
 
 
 %description
 PHP extension for RNP - high performance OpenPGP implementation.
 
-Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')%{?scl: as Software Collection (%{scl} by %{?scl_vendor}%{!?scl_vendor:rh})}.
-
 
 %prep
 %setup -qc
 # Don't install/register tests
 sed -e 's/role="test"/role="src"/' \
-    %{?_licensedir:-e '/LICENSE/s/role="doc"/role="src"/' } \
+    -e '/LICENSE/s/role="doc"/role="src"/' \
     -i package.xml
 
 pushd %{sources}
@@ -83,8 +80,6 @@ EOF
 
 
 %build
-%{?dtsenable}
-
 peclconf() {
 %configure \
     -with-rnp \
@@ -106,8 +101,6 @@ make %{?_smp_mflags}
 
 
 %install
-%{?dtsenable}
-
 # Install the NTS stuff
 make -C NTS install INSTALL_ROOT=%{buildroot}
 install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name}
@@ -149,28 +142,8 @@ TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so" \
 %endif
 
 
-%if 0%{?fedora} < 24 && 0%{?rhel} < 8
-# when pear installed alone, after us
-%triggerin -- %{?scl_prefix}php-pear
-if [ -x %{__pecl} ] ; then
-    %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :
-fi
-
-# posttrans as pear can be installed after us
-%posttrans
-if [ -x %{__pecl} ] ; then
-    %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :
-fi
-
-%postun
-if [ $1 -eq 0 -a -x %{__pecl} ] ; then
-    %{pecl_uninstall} %{pecl_name} >/dev/null || :
-fi
-%endif
-
-
 %files
-%{?_licensedir:%license %{sources}/LICENSE}
+%license %{sources}/LICENSE
 %doc %{pecl_docdir}/%{pecl_name}
 %{pecl_xmldir}/%{name}.xml
 
@@ -186,6 +159,7 @@ fi
 %changelog
 * Thu Jun 22 2023 Remi Collet <remi@remirepo.net> - 0.2.0-2
 - build out of sources tree
+- cleanup SCL stuff for Fedora review
 
 * Wed Apr  5 2023 Remi Collet <remi@remirepo.net> - 0.2.0-1
 - update to 0.2.0