From 05fb878370295b0f382c0d12665198cc9faeaaaa Mon Sep 17 00:00:00 2001
From: Remi Collet <fedora@famillecollet.com>
Date: Sat, 28 Feb 2015 11:30:30 +0100
Subject: php54-php: fix fedora 22 build with recent systemd

---
 php.spec | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'php.spec')

diff --git a/php.spec b/php.spec
index b80084c..c08d03d 100644
--- a/php.spec
+++ b/php.spec
@@ -109,7 +109,7 @@
 Summary: PHP scripting language for creating dynamic web sites
 Name: %{?scl_prefix}php
 Version: 5.4.38
-Release: 1%{?dist}
+Release: 2%{?dist}
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
 # TSRM is licensed under BSD
@@ -161,6 +161,8 @@ Patch91: php-5.3.7-oci8conf.patch
 # Upstream fixes (100+)
 # Backported from 5.5.18 for https://bugs.php.net/65641
 Patch100: php-5.4.33-bug65641.patch
+# Backported from 5.5.16 for https://bugs.php.net/67635
+Patch101: php-5.4.38-systemd.patch
 
 # Security fixes (200+)
 
@@ -789,6 +791,7 @@ support for using the enchant library to PHP.
 
 # upstream patches
 %patch100 -p1 -b .bug65641
+%patch101 -p1 -b .bug65635
 
 # security patches
 
@@ -1587,6 +1590,10 @@ fi
 
 
 %changelog
+* Sat Feb 28 2015 Remi Collet <remi@fedoraproject.org> 5.4.38-2
+- fix fedora 22 build with recent systemd
+  add patch fix from https://bugs.php.net/67635
+
 * Wed Feb 18 2015 Remi Collet <remi@fedoraproject.org> 5.4.38-1
 - Update to 5.4.38
   http://www.php.net/releases/5_4_38.php
-- 
cgit