rpms/php
7
0
Fork 0
Code Issues Pull Requests Releases Activity

* Tue Jan 30 2007 Joe Orton <jorton@redhat.com> 5.2.0-9

Browse Source 
- add php(api), php(zend-abi) provides (#221302)
- package /usr/share/php and append to default include_path (#225434)
This commit is contained in:
jorton 2007-01-30 17:27:36 +00:00
parent 06264e76c9
commit 500277fdf2
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
php-5.2.0-includedir.patch Normal file
View File

@ -0,0 +1,11 @@
--- php-5.2.0/configure.in.includedir
+++ php-5.2.0/configure.in
@@ -1101,7 +1101,7 @@
EXPANDED_DATADIR=$datadir
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
exec_prefix=$old_exec_prefix
libdir=$old_libdir

15
php.spec
View File

@ -6,7 +6,7 @@
Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor) Summary: The PHP HTML-embedded scripting language. (PHP: Hypertext Preprocessor)
Name: php Name: php
Version: 5.2.0 Version: 5.2.0
Release: 8 Release: 9
License: The PHP License v3.01 License: The PHP License v3.01
Group: Development/Languages Group: Development/Languages
URL: http://www.php.net/ URL: http://www.php.net/
@ -23,6 +23,7 @@ Patch4: php-4.3.2-libtool15.patch
Patch5: php-5.0.2-phpize64.patch Patch5: php-5.0.2-phpize64.patch
Patch6: php-5.1.6-curl716.patch Patch6: php-5.1.6-curl716.patch
Patch7: php-5.2.0-filterm4.patch Patch7: php-5.2.0-filterm4.patch
Patch8: php-5.2.0-includedir.patch
# Fixes for extension modules # Fixes for extension modules
Patch21: php-4.3.1-odbc.patch Patch21: php-4.3.1-odbc.patch
@ -79,6 +80,7 @@ executing PHP scripts, /usr/bin/php, and the CGI interface.
Group: Development/Languages Group: Development/Languages
Summary: Common files for PHP Summary: Common files for PHP
Provides: php-api = %{apiver}, php-zend-abi = %{zendver} Provides: php-api = %{apiver}, php-zend-abi = %{zendver}
Provides: php(api) = %{apiver}, php(zend-abi) = %{zendver}
# Provides for all builtin modules: # Provides for all builtin modules:
Provides: php-bz2, php-calendar, php-ctype, php-curl, php-date, php-exif Provides: php-bz2, php-calendar, php-ctype, php-curl, php-date, php-exif
Provides: php-ftp, php-gettext, php-gmp, php-hash, php-iconv, php-libxml Provides: php-ftp, php-gettext, php-gmp, php-hash, php-iconv, php-libxml
@ -297,6 +299,7 @@ support for using the DBA database abstraction layer to PHP.
%patch5 -p1 -b .phpize64 %patch5 -p1 -b .phpize64
%patch6 -p1 -b .curl716 %patch6 -p1 -b .curl716
%patch7 -p1 -b .filterm4 %patch7 -p1 -b .filterm4
%patch8 -p1 -b .includedir
%patch21 -p1 -b .odbc %patch21 -p1 -b .odbc
%patch22 -p1 -b .shutdown %patch22 -p1 -b .shutdown
@ -511,8 +514,9 @@ install -m 644 $RPM_SOURCE_DIR/php.ini $RPM_BUILD_ROOT%{_sysconfdir}/php.ini
install -m 755 -d $RPM_BUILD_ROOT%{contentdir}/icons install -m 755 -d $RPM_BUILD_ROOT%{contentdir}/icons
install -m 644 *.gif $RPM_BUILD_ROOT%{contentdir}/icons/ install -m 644 *.gif $RPM_BUILD_ROOT%{contentdir}/icons/
# For PEAR packaging: # For third-party packaging:
install -m 755 -d $RPM_BUILD_ROOT%{_libdir}/php/pear install -m 755 -d $RPM_BUILD_ROOT%{_libdir}/php/pear \
$RPM_BUILD_ROOT%{_datadir}/php
# Use correct libdir # Use correct libdir
sed -i -e 's|%{_prefix}/lib|%{_libdir}|' $RPM_BUILD_ROOT%{_sysconfdir}/php.ini sed -i -e 's|%{_prefix}/lib|%{_libdir}|' $RPM_BUILD_ROOT%{_sysconfdir}/php.ini
@ -597,6 +601,7 @@ rm files.* macros.php
%dir %{_libdir}/php/modules %dir %{_libdir}/php/modules
%dir %{_localstatedir}/lib/php %dir %{_localstatedir}/lib/php
%dir %{_libdir}/php/pear %dir %{_libdir}/php/pear
%dir %{_datadir}/php
%files cli %files cli
%defattr(-,root,root) %defattr(-,root,root)
@ -631,6 +636,10 @@ rm files.* macros.php
%files pdo -f files.pdo %files pdo -f files.pdo
%changelog %changelog
* Tue Jan 30 2007 Joe Orton <jorton@redhat.com> 5.2.0-9
- add php(api), php(zend-abi) provides (#221302)
- package /usr/share/php and append to default include_path (#225434)
* Tue Dec 5 2006 Joe Orton <jorton@redhat.com> 5.2.0-8 * Tue Dec 5 2006 Joe Orton <jorton@redhat.com> 5.2.0-8
- fix filter.h installation path - fix filter.h installation path
- fix php-zend-abi version (Remi Collet, #212804) - fix php-zend-abi version (Remi Collet, #212804)