diff options
| -rw-r--r-- | failed.txt | 2 | ||||
| -rw-r--r-- | php-7.0.0-libdb.patch | 16 | ||||
| -rw-r--r-- | php.spec | 22 |
3 files changed, 23 insertions, 17 deletions
@@ -1,4 +1,4 @@ -===== 7.0.0-0.10.alpha2 +===== 7.0.0-0.11.beta1 $ grep -r 'Tests failed' /var/lib/mock/scl70*/build.log diff --git a/php-7.0.0-libdb.patch b/php-7.0.0-libdb.patch index 9806389..4578cf9 100644 --- a/php-7.0.0-libdb.patch +++ b/php-7.0.0-libdb.patch @@ -1,6 +1,6 @@ -diff -up php-src-02be73b5fac63a02313b9fe0f204c65d4828edeb/ext/dba/config.m4.libdb php-src-02be73b5fac63a02313b9fe0f204c65d4828edeb/ext/dba/config.m4 ---- php-src-02be73b5fac63a02313b9fe0f204c65d4828edeb/ext/dba/config.m4.libdb 2015-03-25 07:01:04.000000000 +0100 -+++ php-src-02be73b5fac63a02313b9fe0f204c65d4828edeb/ext/dba/config.m4 2015-03-25 08:39:57.404661073 +0100 +diff -up php-7.0.0beta1/ext/dba/config.m4.libdb php-7.0.0beta1/ext/dba/config.m4 +--- php-7.0.0beta1/ext/dba/config.m4.libdb 2015-07-08 02:24:59.252022638 +0200 ++++ php-7.0.0beta1/ext/dba/config.m4 2015-07-08 07:00:16.834403233 +0200 @@ -312,57 +312,13 @@ if test "$PHP_DB4" != "no"; then dbdp4="/usr/local/BerkeleyDB.4." dbdp5="/usr/local/BerkeleyDB.5." @@ -61,9 +61,9 @@ diff -up php-src-02be73b5fac63a02313b9fe0f204c65d4828edeb/ext/dba/config.m4.libd fi PHP_DBA_STD_RESULT(db4,Berkeley DB4) -diff -up php-src-02be73b5fac63a02313b9fe0f204c65d4828edeb/ext/dba/dba.c.libdb php-src-02be73b5fac63a02313b9fe0f204c65d4828edeb/ext/dba/dba.c ---- php-src-02be73b5fac63a02313b9fe0f204c65d4828edeb/ext/dba/dba.c.libdb 2015-03-25 07:01:04.000000000 +0100 -+++ php-src-02be73b5fac63a02313b9fe0f204c65d4828edeb/ext/dba/dba.c 2015-03-25 08:41:34.871061250 +0100 +diff -up php-7.0.0beta1/ext/dba/dba.c.libdb php-7.0.0beta1/ext/dba/dba.c +--- php-7.0.0beta1/ext/dba/dba.c.libdb 2015-07-08 02:24:59.119020904 +0200 ++++ php-7.0.0beta1/ext/dba/dba.c 2015-07-08 07:01:43.158767655 +0200 @@ -52,6 +52,10 @@ #include "php_qdbm.h" #include "php_tcadb.h" @@ -75,7 +75,7 @@ diff -up php-src-02be73b5fac63a02313b9fe0f204c65d4828edeb/ext/dba/dba.c.libdb ph /* {{{ arginfo */ ZEND_BEGIN_ARG_INFO_EX(arginfo_dba_popen, 0, 0, 2) ZEND_ARG_INFO(0, path) -@@ -537,6 +541,10 @@ PHP_MINFO_FUNCTION(dba) +@@ -545,6 +549,10 @@ PHP_MINFO_FUNCTION(dba) php_info_print_table_start(); php_info_print_table_row(2, "DBA support", "enabled"); @@ -85,4 +85,4 @@ diff -up php-src-02be73b5fac63a02313b9fe0f204c65d4828edeb/ext/dba/dba.c.libdb ph +#endif if (handlers.s) { smart_str_0(&handlers); - php_info_print_table_row(2, "Supported handlers", handlers.s->val); + php_info_print_table_row(2, "Supported handlers", ZSTR_VAL(handlers.s)); @@ -124,13 +124,13 @@ %global db_devel libdb-devel %endif -%global gh_commit 9876b2c2cf65fbe6aeb0edccbaa421d3d92c345e -%global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_date 20150623 -%global gh_owner php -%global gh_project php-src -%global rcver alpha2 -%global rpmrel 10 +#global gh_commit 9876b2c2cf65fbe6aeb0edccbaa421d3d92c345e +#global gh_short %(c=%{gh_commit}; echo ${c:0:7}) +#global gh_date 20150623 +#global gh_owner php +#global gh_project php-src +%global rcver beta1 +%global rpmrel 11 Summary: PHP scripting language for creating dynamic web sites @@ -151,7 +151,7 @@ URL: http://www.php.net/ %if 0%{?gh_date} Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}%{?prever}%{?gh_short:-%{gh_short}}.tar.gz %else -Source0: http://www.php.net/distributions/php-%{version}%{?rcver}.tar.bz2 +Source0: http://www.php.net/distributions/php-%{version}%{?rcver}.tar.xz %endif Source1: php.conf Source2: php.ini @@ -1045,8 +1045,10 @@ cat $(aclocal --print-ac-dir)/{libtool,ltoptions,ltsugar,ltversion,lt~obsolete}. cat $(aclocal --print-ac-dir)/libtool.m4 > build/libtool.m4 %endif +%if 0%{?gh_date} # Bison files ./genfiles +%endif # Regenerate configure scripts (patches change config.m4's) touch configure.in @@ -1801,6 +1803,10 @@ fi %changelog +* Wed Jul 8 2015 Remi Collet <remi@fedoraproject.org> 7.0.0-0.11.beta1 +- Update to 7.0.0beta1 +- use upstream tarball instead of git snapshot + * Wed Jun 24 2015 Remi Collet <remi@fedoraproject.org> 7.0.0-0.10.alpha2 - Update to 7.0.0alpha2 - use new layout (/etc/opt, /var/opt) |