Hello community, here is the log from the commit of package php5 checked in at Fri Jun 9 23:30:57 CEST 2006. -------- --- php5/php5.changes 2006-05-26 17:16:47.000000000 +0200 +++ php5/php5.changes 2006-06-09 12:55:15.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Jun 9 12:54:47 CEST 2006 - poeml@suse.de + +- fix BuildRequires to build on SUSE Linux 10.1, 10.0, 9.3 +- use the -fstack-protector compile switch only on 10.0 and newer + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ php5.spec ++++++ --- /var/tmp/diff_new_pack.cyahtf/_old 2006-06-09 23:30:10.000000000 +0200 +++ /var/tmp/diff_new_pack.cyahtf/_new 2006-06-09 23:30:10.000000000 +0200 @@ -11,8 +11,16 @@ # norootforbuild Name: php5 +BuildRequires: apache2-devel aspell-devel curl-devel db-devel fam-devel gmp-devel gtk-devel imap imap-devel krb5-devel libmcal libmcrypt-devel libtidy-devel libtiff-devel libxslt-devel mhash-devel mm-devel mysql-devel net-snmp-devel openldap2 openldap2-devel orbit-devel pam-devel pcre-devel pkgconfig postfix postgresql-devel qt3-devel readline-devel sablot-devel sqlite-devel t1lib-devel tcpd-devel unixODBC-devel update-desktop-files zip +%if %{?suse_version:%suse_version}%{?!suse_version:0} >= 1010 #!BuildIgnore: flex -BuildRequires: apache2-devel aspell-devel curl-devel db-devel fam-devel flex-old gmp-devel gtk-devel imap imap-devel krb5-devel libdrm-devel libmcal libmcrypt-devel libtidy-devel libtiff-devel libxslt-devel mhash-devel mm-devel mysql-devel net-snmp-devel openldap2 openldap2-devel orbit-devel pam-devel pcre-devel pkgconfig postfix postgresql-devel qt3-devel readline-devel sablot-devel sqlite-devel t1lib-devel tcpd-devel unixODBC-devel update-desktop-files zip +BuildRequires: flex-old +%else +BuildRequires: flex libgcrypt-devel rpm-devel +%endif +%if %{?suse_version:%suse_version}%{?!suse_version:0} < 1000 +BuildRequires: libjpeg libjpeg-devel +%endif %define extension_dir %{_libdir}/%{name}/extensions %define peardir %{_datadir}/%{name}/PEAR %define cgi_dir /srv/www/cgi-bin @@ -30,7 +38,7 @@ ### ### Version: 5.1.2 -Release: 29 +Release: 30 License: Other uncritical OpenSource License, Other License(s), see package Group: Productivity/Networking/Web/Servers Provides: php zend php-xml php-spl php-simplexml php-session php-pcre @@ -1497,8 +1505,12 @@ # regenerate configure etc. ./buildconf --force # export flags -CFLAGS="$RPM_OPT_FLAGS -fstack-protector -fno-strict-aliasing -D_GNU_SOURCE -DLDAP_DEPRECATED" -CXXFLAGS="$RPM_OPT_FLAGS -fstack-protector -fno-strict-aliasing -D_GNU_SOURCE -DLDAP_DEPRECATED" +CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -D_GNU_SOURCE -DLDAP_DEPRECATED" +CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -D_GNU_SOURCE -DLDAP_DEPRECATED" +%if %{?suse_version:%suse_version}%{?!suse_version:0} > 1000 +CFLAGS="$CFLAGS -fstack-protector" +CXXFLAGS="$CFLAGS -fstack-protector" +%endif export CFLAGS export CXXFLAGS # where to install extensions @@ -2015,6 +2027,9 @@ %config(noreplace) %{php_sysconf}/conf.d/zlib.ini %changelog -n php5 +* Fri Jun 09 2006 - poeml@suse.de +- fix BuildRequires to build on SUSE Linux 10.1, 10.0, 9.3 +- use the -fstack-protector compile switch only on 10.0 and newer * Thu May 11 2006 - postadal@suse.cz - fixed memory leak in imagecreatefromgif() [#173451] (phpbug-37346.patch) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit-help@opensuse.org