From ef4877a7043e5f6f00ba0142c18be7e4003c3b02 Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Sun, 2 Nov 2014 09:32:04 +0100
Subject: php 5.4: - new version of systzdata patch, fix case sensitivity -
 gmp: fix memory management conflict with other libraries   using libgmp,
 backport fix for https://bugs.php.net/63595

---
 php54.spec | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

(limited to 'php54.spec')

diff --git a/php54.spec b/php54.spec
index fc80110..3fbd992 100644
--- a/php54.spec
+++ b/php54.spec
@@ -79,17 +79,10 @@
 %global db_devel  libdb-devel
 %endif
 
-#global snapdate      201201041830
-#global rcver         RC1
-
 Summary: PHP scripting language for creating dynamic web sites
 Name: php
 Version: 5.4.34
-%if 0%{?snapdate:1}%{?rcver:1}
-Release: 0.2.%{?snapdate}%{?rcver}%{?dist}
-%else
-Release: 1%{?dist}
-%endif
+Release: 2%{?dist}
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
 # TSRM is licensed under BSD
@@ -126,7 +119,7 @@ Patch21: php-5.4.7-odbctimer.patch
 # Functional changes
 Patch40: php-5.4.0-dlopen.patch
 Patch41: php-5.4.0-easter.patch
-Patch42: php-5.3.1-systzdata-v10.patch
+Patch42: php-5.4.34-systzdata-v11.patch
 # See http://bugs.php.net/53436
 Patch43: php-5.4.0-phpize.patch
 # Use system libzip instead of bundled one
@@ -141,6 +134,8 @@ Patch47: php-5.4.9-phpinfo.patch
 # Upstream fixes
 # Backported from 5.5.18 for https://bugs.php.net/65641
 Patch100: php-5.4.33-bug65641.patch
+# Backported from 5.5.19 for https://bugs.php.net/63595
+Patch101: php-5.4.34-bug63595.patch
 
 # Security fixes
 
@@ -836,6 +831,7 @@ rm -f ext/json/utf8_to_utf16.*
 
 # upstream patches
 %patch100 -p1 -b .bug65641
+%patch101 -p1 -b .bug63595
 
 # security patches
 
@@ -1701,6 +1697,11 @@ fi
 
 
 %changelog
+* Sun Nov  2 2014 Remi Collet <remi@fedoraproject.org> 5.4.34-2
+- new version of systzdata patch, fix case sensitivity
+- gmp: fix memory management conflict with other libraries
+  using libgmp, backport fix for https://bugs.php.net/63595
+
 * Thu Oct 16 2014 Remi Collet <remi@fedoraproject.org> 5.4.34-1
 - Update to 5.4.34
   http://www.php.net/releases/5_4_34.php
-- 
cgit