Hello community, here is the log from the commit of package php5 checked in at Mon Jan 7 12:37:36 CET 2008. -------- --- php5/php5.changes 2007-12-27 08:12:08.000000000 +0100 +++ /mounts/work_src_done/STABLE/php5/php5.changes 2008-01-07 07:09:52.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Jan 7 07:07:53 CET 2008 - crrodriguez@suse.de + +- Do not hard require php5-timezonedb, instead provide a capability + php(tzdatabase) = builtin_tz_ver so it gets installed via rpm + Supplements only when needed. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ php5.spec ++++++ --- /var/tmp/diff_new_pack.SG8600/_old 2008-01-07 12:36:42.000000000 +0100 +++ /var/tmp/diff_new_pack.SG8600/_new 2008-01-07 12:36:42.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package php5 (Version 5.2.5) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -66,17 +66,18 @@ %define apache2_sysconfdir %(%{apxs2} -q SYSCONFDIR) %define apache2_includedir %(%{apxs2} -q INCLUDEDIR) %define apache2_serverroot %(%{apxs2} -q PREFIX) +#unfortunately at this stage we dont have a working PHP binary.. +%define builtin_tz_ver 2007.9 ### ### Version: 5.2.5 -Release: 13 +Release: 16 License: The PHP License, version 3.01 Group: Development/Languages/Other Provides: php zend php-xml php-spl php-simplexml php-session php-pcre php-date php-reflection php-filter -Provides: php-dbx php-dio php-fam php-filepro php-yp +Provides: php-dbx php-dio php-fam php-filepro php-yp php(tzdatabase) = %{builtin_tz_ver} AutoReqProv: on PreReq: update-alternatives -Requires: php5-timezonedb #extensions that are no longer here Obsoletes: php-dbx php-dio php-fam php-filepro php-yp Source0: php-%{version}.tar.bz2 @@ -1136,6 +1137,12 @@ build-$sapi/Zend done %endif +vtzdb=`grep timezonedb_builtin ext/date/lib/timezonedb.h | sed -e 's/[^"]*"\([^"]\+\)"*[^"]*/\1\n/g' | head -n1` +if test "x${vtzdb}" != "x%{builtin_tz_ver}"; then + : Error: Built-in timezonedb version is now ${vtzdb}, expecting %{builtin_tz_ver}. + : Update the builtin_tz_ver macro and rebuild. + exit 1 +fi %build #find %{_libdir} -name "*.la" | xargs grep 'dependency_libs=''' @@ -1329,6 +1336,8 @@ # --with-recode=shared \ error: recode extension can not be configured together with: imap mysql yaz #disabled extensions # --enable-embedded-mysqli \ + +%check cd build-cli # Run tests, using the CLI SAPI export NO_INTERACTION=1 REPORT_EXIT_STATUS=1 MALLOC_CHECK_=2 LANG=POSIX LC_ALL=POSIX @@ -1803,6 +1812,10 @@ %config(noreplace) %{php_sysconf}/conf.d/zlib.ini %changelog +* Mon Jan 07 2008 - crrodriguez@suse.de +- Do not hard require php5-timezonedb, instead provide a capability + php(tzdatabase) = builtin_tz_ver so it gets installed via rpm + Supplements only when needed. * Thu Dec 27 2007 - crrodriguez@suse.de - PHP is leaking file descriptors badly on relative includes (php-5.2.5-fdleak.patch) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org