summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2014-09-05 13:55:14 +0200
committerRemi Collet <fedora@famillecollet.com>2014-09-05 13:55:14 +0200
commitcc9a08444a31fd508abba5a311d9109b22997c9a (patch)
treec15c378260bd8180d09b61394981895f164b2f13
parent2c144276f7e922878949a7316df122dcb0d82597 (diff)
pĥp54-php: test build of 5.4.33RC1
-rw-r--r--php-5.2.0-includedir.patch2
-rw-r--r--php.spec10
2 files changed, 9 insertions, 3 deletions
diff --git a/php-5.2.0-includedir.patch b/php-5.2.0-includedir.patch
index a1c3afe..ac4ae4a 100644
--- a/php-5.2.0-includedir.patch
+++ b/php-5.2.0-includedir.patch
@@ -5,7 +5,7 @@
EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"`
EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CONFIG_FILE_SCAN_DIR"`
-INCLUDE_PATH=.:$EXPANDED_PEAR_INSTALLDIR
-+INCLUDE_PATH=.:$EXPANDED_PEAR_INSTALLDIR:${EXPANDED_DATADIR}/php
++INCLUDE_PATH=.:$EXPANDED_PEAR_INSTALLDIR:${EXPANDED_DATADIR}/php:/usr/share/pear:/usr/share/php
exec_prefix=$old_exec_prefix
libdir=$old_libdir
diff --git a/php.spec b/php.spec
index b4160bc..718f5d0 100644
--- a/php.spec
+++ b/php.spec
@@ -101,10 +101,12 @@
%global db_devel libdb-devel
%endif
+%global rcver RC1
+
Summary: PHP scripting language for creating dynamic web sites
Name: %{?scl_prefix}php
-Version: 5.4.32
-Release: 1%{?dist}
+Version: 5.4.33
+Release: 0.1.RC1%{?dist}
# All files licensed under PHP version 3.01, except
# Zend is licensed under Zend
# TSRM is licensed under BSD
@@ -1532,6 +1534,10 @@ fi
%changelog
+* Fri Sep 5 2014 Remi Collet <rcollet@redhat.com> - 5.4.33-0.1.RC1
+- update to 5.4.33RC1
+- add system libraries to default include_path
+
* Sun Aug 31 2014 Remi Collet <rcollet@redhat.com> - 5.4.32-1
- update to 5.4.32
- cleanup, merge with spec from remi repository