* Mon Nov 22 2004 Joe Orton <jorton@redhat.com> 5.0.2-8

- update for db4-4.3 (Robert Scheck, #140167)
- build against mysql-devel
- run tests in %check
This commit is contained in:
jorton 2004-11-22 12:06:16 +00:00
parent 6f3228bdc2
commit 20abac9104

View File

@ -10,7 +10,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.0.2 Version: 5.0.2
Release: 7 Release: 8
License: The PHP License License: The PHP License
Group: Development/Languages Group: Development/Languages
URL: http://www.php.net/ URL: http://www.php.net/
@ -35,7 +35,6 @@ Patch13: php-5.0.2-phpize64.patch
# Fixes for extension modules # Fixes for extension modules
Patch21: php-4.3.1-odbc.patch Patch21: php-4.3.1-odbc.patch
Patch22: php-4.3.2-db4.patch Patch22: php-4.3.2-db4.patch
Patch23: php-5.0.2-mysql3.patch
# Functional changes # Functional changes
Patch30: php-4.3.1-dlopen.patch Patch30: php-4.3.1-dlopen.patch
@ -296,7 +295,6 @@ support for using the gd graphics library to PHP.
%patch21 -p1 -b .odbc %patch21 -p1 -b .odbc
%patch22 -p1 -b .db4 %patch22 -p1 -b .db4
%patch23 -p1 -b .mysql3
%patch30 -p1 -b .dlopen %patch30 -p1 -b .dlopen
%patch31 -p1 -b .easter %patch31 -p1 -b .easter
@ -398,7 +396,7 @@ ln -sf ../configure
--without-sqlite \ --without-sqlite \
$* $*
if test $? != 0; then if test $? != 0; then
tail -300 config.log tail -500 config.log
: configure failed : configure failed
exit 1 exit 1
fi fi
@ -426,7 +424,17 @@ build --enable-force-cgi-redirect \
--with-dom-xslt=%{_prefix} --with-dom-exslt=%{_prefix} \ --with-dom-xslt=%{_prefix} --with-dom-exslt=%{_prefix} \
--with-pgsql=shared \ --with-pgsql=shared \
--with-snmp=shared,%{_prefix} --with-snmp=shared,%{_prefix}
popd
# Build Apache module
pushd build-apache
build --with-apxs2=%{_sbindir}/apxs \
--without-mysql --without-gd \
--without-odbc --disable-dom
popd
%check
cd build-cgi
# Run tests # Run tests
export NO_INTERACTION=1 REPORT_EXIT_STATUS=1 MALLOC_CHECK_=2 export NO_INTERACTION=1 REPORT_EXIT_STATUS=1 MALLOC_CHECK_=2
unset TZ LANG LC_ALL unset TZ LANG LC_ALL
@ -438,16 +446,9 @@ if ! make test; then
echo "-- $f result ends." echo "-- $f result ends."
done done
set -x set -x
#exit 1
fi fi
unset NO_INTERACTION REPORT_EXIT_STATUS MALLOC_CHECK_ unset NO_INTERACTION REPORT_EXIT_STATUS MALLOC_CHECK_
popd
# Build Apache module
pushd build-apache
build --with-apxs2=%{_sbindir}/apxs \
--without-mysql --without-gd \
--without-odbc --disable-dom
popd
%install %install
[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
@ -564,6 +565,11 @@ rm files.*
%endif %endif
%changelog %changelog
* Mon Nov 22 2004 Joe Orton <jorton@redhat.com> 5.0.2-8
- update for db4-4.3 (Robert Scheck, #140167)
- build against mysql-devel
- run tests in %%check
* Wed Nov 10 2004 Joe Orton <jorton@redhat.com> 5.0.2-7 * Wed Nov 10 2004 Joe Orton <jorton@redhat.com> 5.0.2-7
- truncate changelog at 4.3.1-1 - truncate changelog at 4.3.1-1
- merge from 4.3.x package: - merge from 4.3.x package: