From 558fe8dbf4b76846b99bbbaf8104e07f84686f5a Mon Sep 17 00:00:00 2001
From: remi <fedora@famillecollet.com>
Date: Wed, 1 Dec 2010 17:21:18 +0100
Subject: [PATCH] ghost /var/run/php-fpm (#656660) + fix for rpmlint

---
 php-fpm.init |  2 ++
 php.spec     | 21 +++++++++++++++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/php-fpm.init b/php-fpm.init
index a6375ba..a23441c 100755
--- a/php-fpm.init
+++ b/php-fpm.init
@@ -27,6 +27,8 @@ lockfile=${LOCKFILE-/var/lock/subsys/php-fpm}
 
 start () {
 	echo -n $"Starting $prog: "
+	dir=$(dirname ${pidfile})
+	[ -d $dir ] || mkdir $dir
 	daemon --pidfile ${pidfile} php-fpm
 	RETVAL=$?
 	echo
diff --git a/php.spec b/php.spec
index 68d991c..8794fb4 100644
--- a/php.spec
+++ b/php.spec
@@ -27,7 +27,7 @@
 Summary: PHP scripting language for creating dynamic web sites
 Name: php
 Version: 5.3.3
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: PHP
 Group: Development/Languages
 URL: http://www.php.net/
@@ -79,6 +79,14 @@ Requires: php-cli = %{version}-%{release}
 # To ensure correct /var/lib/php/session ownership:
 Requires(pre): httpd
 
+
+# Don't provides extensions, which are not shared library, as .so
+%{?filter_setup:
+%filter_provides_in %{_libdir}/php/modules/.*\.so$
+%filter_setup
+}
+
+
 %description
 PHP is an HTML-embedded scripting language. PHP attempts to make it
 easy for developers to write dynamically generated webpages. PHP also
@@ -470,6 +478,10 @@ support for using the enchant library to PHP.
 
 %patch61 -p1 -b .tests-wddx
 
+# Make rpmlint happy
+find . -name \*.c -exec chmod -x {} \;
+find . -name \*.h -exec chmod -x {} \;
+
 # Prevent %%doc confusion over LICENSE files
 cp Zend/LICENSE Zend/ZEND_LICENSE
 cp TSRM/LICENSE TSRM_LICENSE
@@ -911,7 +923,7 @@ fi
 %dir %{_sysconfdir}/php-fpm.d
 # log owned by apache for log
 %attr(770,apache,apache) %dir %{_localstatedir}/log/php-fpm
-%dir %{_localstatedir}/run/php-fpm
+%ghost %dir %{_localstatedir}/run/php-fpm
 %{_mandir}/man1/php-fpm.1*
 %endif
 
@@ -957,6 +969,11 @@ fi
 %files enchant -f files.enchant
 
 %changelog
+* Wed Dec  1 2010 Remi Collet <Fedora@famillecollet.com> 5.3.3-5
+- ghost /var/run/php-fpm (see #656660)
+- add filter_setup to not provides extensions as .so
+- fix perm on .c and .h to make rpmlint happy
+
 * Mon Nov  1 2010 Joe Orton <jorton@redhat.com> - 5.3.3-4
 - use mysql_config in libdir directly to avoid biarch build failures