diff options
| -rw-r--r-- | php.spec | 33 |
1 files changed, 10 insertions, 23 deletions
@@ -97,9 +97,9 @@ %global with_zip 0 -%global gh_commit 0de3ca4f98cd79f747f92cd9fab2a72e85b3cd1f +%global gh_commit 17649648ed9e0a9e5074242e1b021c57174a0b8c %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_date 20200526 +%global gh_date 20200527 %global gh_owner php %global gh_project php-src %global upver 8.0.0 @@ -109,7 +109,7 @@ Summary: PHP scripting language for creating dynamic web sites Name: %{?scl_prefix}php Version: %{upver}%{?lower:~%{lower}}%{?gh_date:.%{gh_date}} -Release: 14%{?dist} +Release: 15%{?dist} # All files licensed under PHP version 3.01, except # Zend is licensed under Zend # TSRM is licensed under BSD @@ -232,7 +232,6 @@ Recommends: %{?scl_prefix}php-cli%{?_isa} = %{version}-%{release} # httpd have threaded MPM by default Recommends: %{?scl_prefix}php-fpm%{?_isa} = %{version}-%{release} # as "php" is now mostly a meta-package, commonly used extensions -Recommends: %{?scl_prefix}php-json%{?_isa} = %{version}-%{release} Recommends: %{?scl_prefix}php-mbstring%{?_isa} = %{version}-%{release} Recommends: %{?scl_prefix}php-opcache%{?_isa} = %{version}-%{release} Recommends: %{?scl_prefix}php-pdo%{?_isa} = %{version}-%{release} @@ -367,6 +366,8 @@ Provides: %{?scl_prefix}php-gettext, %{?scl_prefix}php-gettext%{?_isa} Provides: %{?scl_prefix}php-hash, %{?scl_prefix}php-hash%{?_isa} Provides: %{?scl_prefix}php-mhash = %{version}, %{?scl_prefix}php-mhash%{?_isa} = %{version} Provides: %{?scl_prefix}php-iconv, %{?scl_prefix}php-iconv%{?_isa} +Obsoletes: %{?scl_prefix}php-json < 8.0.0 +Provides: %{?scl_prefix}php-json = %{upver}, %{?scl_prefix}php-json%{?_isa} = %{upver} Provides: %{?scl_prefix}php-libxml, %{?scl_prefix}php-libxml%{?_isa} Provides: %{?scl_prefix}php-openssl, %{?scl_prefix}php-openssl%{?_isa} Provides: %{?scl_prefix}php-phar, %{?scl_prefix}php-phar%{?_isa} @@ -379,9 +380,6 @@ Provides: %{?scl_prefix}php-standard = %{version}, %{?scl_prefix}php-standard%{? Provides: %{?scl_prefix}php-tokenizer, %{?scl_prefix}php-tokenizer%{?_isa} Provides: %{?scl_prefix}php-zlib, %{?scl_prefix}php-zlib%{?_isa} %{?scl:Requires: %{scl}-runtime} -# For user experience, those extensions were part of php-common -Requires: %{?scl_prefix}php-json%{?_isa} = %{version}-%{release} -#Requires: %%{?scl_prefix}php-zip%%{?_isa} %description common The %{?scl_prefix}php-common package contains files used by both @@ -860,18 +858,6 @@ support for ZIP archive management to PHP. %endif -%package json -Summary: JavaScript Object Notation extension for PHP -# All files licensed under PHP version 3.0.1 -License: PHP -Group: System Environment/Libraries -Requires: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release} - -%description json -The %{?scl_prefix}php-json package provides an extension that will add -support for JavaScript Object Notation (JSON) to PHP. - - %package sodium Summary: Wrapper for the Sodium cryptographic library # All files licensed under PHP version 3.0.1 @@ -1231,7 +1217,6 @@ build --libdir=%{_libdir}/php \ %else --without-sqlite3 \ %endif - --enable-json=shared \ %if %{with_zip} --with-zip=shared \ %endif @@ -1262,7 +1247,6 @@ without_shared="--disable-gd \ --disable-dom --disable-dba --without-unixODBC \ --disable-opcache \ --disable-phpdbg \ - --disable-json \ --without-ffi \ --disable-xmlreader --disable-xmlwriter \ --without-sodium \ @@ -1484,7 +1468,6 @@ TESTCMD="$TESTCMD --define extension_dir=$RPM_BUILD_ROOT%{_libdir}/php/modules" # Generate files lists and stub .ini files for each subpackage for mod in pgsql odbc ldap snmp \ mysqlnd mysqli \ - json \ %if %{with_imap} imap \ %endif @@ -1810,15 +1793,19 @@ fi %if %{with_zip} %files zip -f files.zip %endif -%files json -f files.json %files sodium -f files.sodium %files ffi -f files.ffi %dir %{_datadir}/php/preload %changelog +* Wed May 27 2020 Remi Collet <remi@remirepo.net> - 8.0.0~DEV.20200527-15 +- new snapshot +- json is now build statically + * Wed May 27 2020 Remi Collet <remi@remirepo.net> - 8.0.0~DEV.20200526-14 - new snapshot +- build phpdbg only once * Tue May 26 2020 Remi Collet <remi@remirepo.net> - 8.0.0~DEV.20200526-13 - new snapshot |