From 14d4be29bf2c482230166f730044759e0c3bcf44 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 17 Sep 2020 16:16:08 +0200 Subject: cleanup --- php80.spec | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/php80.spec b/php80.spec index 2dbee97..b589d24 100644 --- a/php80.spec +++ b/php80.spec @@ -41,7 +41,7 @@ # arch detection heuristic used by bindir/mysql_config. %global mysql_config %{_libdir}/mysql/mysql_config -# Optional components; pass "--with mssql" etc to rpmbuild. +# Optional Oracle extensions; pass "--with oci8" etc to rpmbuild. %bcond_with oci8 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 @@ -85,13 +85,13 @@ %global with_nginx 0 %endif -%bcond_without dtrace -%bcond_without libgd -%bcond_with zip +%bcond_without dtrace +%bcond_without libgd +%bcond_with zip -%global upver 8.0.0 -%global rcver beta4 -%global lower beta4 +%global upver 8.0.0 +%global rcver beta4 +%global lower beta4 Summary: PHP scripting language for creating dynamic web sites Name: php @@ -1100,7 +1100,7 @@ in pure PHP. : With Oracle extensions %endif %if %{with firebird} -: With Firebird extension +: With pdo_firebird extension %endif %if %{with zip} : With Zip extension @@ -1108,6 +1108,11 @@ in pure PHP. %if %{with tests} : Run Test suite %endif +%if %{with libgd} +: Use System libgd +%else +: Use Bundled libgd +%endif %if %{with libpcre} : Use System libpcre %else @@ -2135,10 +2140,10 @@ fi %changelog * Thu Sep 17 2020 Remi Collet - 8.0.0~beta4-4 - drop mod_php for ZTS (have never be suported) -- use %%bcond_without for dtrace, libgd, firebird, lsws, libpcre, zts - so can be disable during rebuild -- use %%bcond_with for libpcre, oci8, zip and debug - so can be enable during rebuild +- use %%bcond_without for dtrace, libgd, firebird, lsws, libpcre and zts + so can be disabled during rebuild +- use %%bcond_with for libgd, libpcre, oci8, zip and debug + so can be enabled during rebuild * Thu Sep 17 2020 Remi Collet - 8.0.0~beta4-3 - properly use --enable-zts for ZTS builds -- cgit