From b7e61e5ed61307d601784b693625763cd2002ffc Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Wed, 14 Nov 2012 07:59:11 +0100
Subject: [PATCH] - update to 5.4.9RC1 - improves php.conf (use FilesMatch +
 SetHandler) - improves filter (httpd module) - apply ldap_r patch on fedora
 >= 18 only

---
 .gitignore |  1 +
 php.conf   | 11 +++++++----
 php.spec   | 19 +++++++++++++------
 sources    |  2 +-
 4 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index e0f8f3a..9dc315c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ php-5.3*.bz2
 /php-5.4.6.tar.bz2
 /php-5.4.7.tar.bz2
 /php-5.4.8.tar.bz2
+/php-5.4.9RC1.tar.bz2
diff --git a/php.conf b/php.conf
index 82b206b..075ccaa 100644
--- a/php.conf
+++ b/php.conf
@@ -1,8 +1,9 @@
 #
 # Cause the PHP interpreter to handle files with a .php extension.
 #
-AddHandler php5-script .php
-AddType text/html .php
+<FilesMatch \.php$>
+    SetHandler application/x-httpd-php
+</FilesMatch>
 
 #
 # Add index.php to the list of files that will be served as directory
@@ -11,10 +12,12 @@ AddType text/html .php
 DirectoryIndex index.php
 
 #
-# Uncomment the following line to allow PHP to pretty-print .phps
+# Uncomment the following lines to allow PHP to pretty-print .phps
 # files as PHP source code:
 #
-#AddType application/x-httpd-php-source .phps
+#<FilesMatch \.phps$>
+#    SetHandler application/x-httpd-php-source
+#</FilesMatch>
 
 #
 # Apache specific PHP configuration options
diff --git a/php.spec b/php.spec
index 8f31863..cfdedf0 100644
--- a/php.spec
+++ b/php.spec
@@ -52,10 +52,12 @@
 %global db_devel  libdb-devel
 %endif
 
+%global rcver RC1
+
 Summary: PHP scripting language for creating dynamic web sites
 Name: php
-Version: 5.4.8
-Release: 6%{?dist}
+Version: 5.4.9
+Release: 0.1.%{rcver}%{?dist}
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
 # TSRM is licensed under BSD
@@ -133,13 +135,10 @@ Requires(pre): httpd
 
 
 # Don't provides extensions, which are not shared library, as .so
-# RPM 4.8
 %{?filter_provides_in: %filter_provides_in %{_libdir}/php/modules/.*\.so$}
 %{?filter_provides_in: %filter_provides_in %{_libdir}/php-zts/modules/.*\.so$}
+%{?filter_provides_in: %filter_provides_in %{_libdir}/httpd/modules/.*\.so$}
 %{?filter_setup}
-# RPM 4.9
-%global __provides_exclude_from %{?__provides_exclude_from:%__provides_exclude_from|}%{_libdir}/php/modules/.*\\.so$
-%global __provides_exclude_from %{__provides_exclude_from}|%{_libdir}/php-zts/modules/.*\\.so$
 
 
 %description
@@ -675,7 +674,9 @@ support for using the enchant library to PHP.
 %if %{with_libzip}
 %patch44 -p1 -b .systzip
 %endif
+%if 0%{?fedora} >= 18
 %patch45 -p1 -b .ldap_r
+%endif
 
 # Prevent %%doc confusion over LICENSE files
 cp Zend/LICENSE Zend/ZEND_LICENSE
@@ -1407,6 +1408,12 @@ fi
 
 
 %changelog
+* Wed Nov 14 2012 Remi Collet <remi@fedoraproject.org> 5.4.9-0.1.RC1
+- update to 5.4.9RC1
+- improves php.conf (use FilesMatch + SetHandler)
+- improves filter (httpd module)
+- apply ldap_r patch on fedora >= 18 only
+
 * Fri Nov  9 2012 Remi Collet <rcollet@redhat.com> 5.4.8-6
 - clarify Licenses
 - missing provides xmlreader and xmlwriter
diff --git a/sources b/sources
index 54445d2..eba67c1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bb8c816a9299be8995255ef70c63b800  php-5.4.8.tar.bz2
+b2b132df621a5dbd26a5adce24c495eb  php-5.4.9RC1.tar.bz2