From eb0a3af97a9499445edd1b0b40226de5ed41e353 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 2 Oct 2019 09:54:23 +0200
Subject: cleanup

---
 php74.spec | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'php74.spec')

diff --git a/php74.spec b/php74.spec
index 633c579..939cabb 100644
--- a/php74.spec
+++ b/php74.spec
@@ -684,7 +684,7 @@ Obsoletes: php74-pdo-firebird, php74w-pdo-firebird
 %endif
 
 %description pdo-firebird
-The %{?scl_prefix}php-interbase package contains the PDO driver for
+The php-pdo-firebird package contains the PDO driver for
 Interbase/Firebird databases.
 %endif
 
@@ -1389,11 +1389,10 @@ build --libdir=%{_libdir}/php \
       --with-imap=shared --with-imap-ssl \
       --enable-mbstring=shared \
       --enable-mbregex \
-%if %{with_libgd}
       --enable-gd=shared \
+%if %{with_libgd}
       --with-external-gd \
 %else
-      --enable-gd=shared \
       --with-webp \
       --with-jpeg \
       --with-xpm \
@@ -1530,11 +1529,10 @@ build --includedir=%{_includedir}/php-zts \
       --with-imap=shared --with-imap-ssl \
       --enable-mbstring=shared \
       --enable-mbregex \
-%if %{with_libgd}
       --enable-gd=shared \
+%if %{with_libgd}
       --with-external-gd \
 %else
-      --enable-gd=shared \
       --with-webp \
       --with-jpeg \
       --with-xpm \
@@ -2055,8 +2053,8 @@ fi
 %endif
 %{_unitdir}/php-fpm.service
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-%{_unitdir}/httpd.service.d/%{?scl_prefix}php-fpm.conf
-%{_unitdir}/nginx.service.d/%{?scl_prefix}php-fpm.conf
+%{_unitdir}/httpd.service.d/php-fpm.conf
+%{_unitdir}/nginx.service.d/php-fpm.conf
 %endif
 %dir %{_sysconfdir}/systemd/system/php-fpm.service.d
 %dir %ghost /run/php-fpm
-- 
cgit