Author: zergin Date: Sun Jul 27 15:50:14 2008 GMT Module: SPECS Tag: DEVEL ---- Log message: - removed mime_magic: functionality now provided by fileinfo - fileinfo now available in core - added provides/obsoletes - requires -DHAVE_STRNDUP (dunno why explicitly) - added FreeTDS patch from HEAD (as patch38): fixes build with freetds 0.82 - mysqli and pdo-mysql switched to mysqlnd (insted of libmysql) - new and better, see: http://dev.mysql.com/downloads/connector/php-mysqlnd/ - fixes missing symbols (compiled with libmysql pdo-mysql requires php-mysql) - pdo-mysql doesn't honor --with-mysql-sock configure option, use ini setting pdo_mysql.default_socket - updated to current snap (200807271230) - rel up to 0.18
---- Files affected: SPECS: php.spec (1.688.2.13 -> 1.688.2.14) ---- Diffs: ================================================================ Index: SPECS/php.spec diff -u SPECS/php.spec:1.688.2.13 SPECS/php.spec:1.688.2.14 --- SPECS/php.spec:1.688.2.13 Fri Jul 25 10:27:18 2008 +++ SPECS/php.spec Sun Jul 27 17:50:08 2008 @@ -26,7 +26,6 @@ %bcond_without interbase # without InterBase extension module %bcond_without ldap # without LDAP extension module %bcond_without mhash # without mhash extension module -%bcond_without mime_magic # without mime-magic module %bcond_without ming # without ming extension module %bcond_without mm # without mm support for session storage %bcond_without mssql # without MS SQL extension module @@ -67,8 +66,8 @@ ERROR: You need to select at least one Apache SAPI to build shared modules. %endif -%define _rel 0.14 -%define _snap 200807250630 +%define _rel 0.18 +%define _snap 200807271230 Summary: PHP: Hypertext Preprocessor Summary(fr.UTF-8): Le langage de script embarque-HTML PHP Summary(pl.UTF-8): Język skryptowy PHP @@ -82,7 +81,7 @@ License: PHP Group: Libraries Source0: http://snaps.php.net/%{name}%{version}-%{_snap}.tar.bz2 -# Source0-md5: eb8f2c9250b2324d8fe408db468bc60c +# Source0-md5: d83532167568752266f3097c9df9b3a9 Source2: zend.gif Source3: %{name}-mod_%{name}.conf Source4: %{name}-cgi-fcgi.ini @@ -121,6 +120,7 @@ Patch27: %{name}-linkflags-clean.patch Patch29: %{name}-config-dir.patch Patch31: %{name}-fcgi-graceful.patch +Patch38: %{name}-tds.patch URL: http://www.php.net/ %{?with_interbase:%{!?with_interbase_inst:BuildRequires: Firebird-devel >= 1.0.2.908-2}} %{?with_pspell:BuildRequires: aspell-devel >= 2:0.50.0} @@ -359,6 +359,7 @@ Requires: glibc >= 6:2.3.5 Requires: php-dirs Provides: php(date) +Provides: php(fileinfo) Provides: php(hash) Provides: php(libxml) Provides: php(modules_api) = %{php_api_version} @@ -376,6 +377,7 @@ Provides: php5(thread-safety) = %{zend_zts} Obsoletes: php-pcre < 4:5.2.0 Obsoletes: php-pecl-domxml +Obsoletes: php-pecl-fileinfo Obsoletes: php-session < 3:4.2.1-2 Conflicts: php4-common < 3:4.4.4-8 Conflicts: rpm < 4.4.2-0.2 @@ -811,22 +813,6 @@ %description mhash -l pl.UTF-8 Moduł PHP udostępniający funkcje mieszające z biblioteki mhash. -%package mime_magic -Summary: mime_magic extension module for PHP -Summary(pl.UTF-8): Moduł mime_magic dla PHP -Group: Libraries -Requires: %{name}-common = %{epoch}:%{version}-%{release} -Requires: /usr/share/file/magic.mime -Provides: php(mime_magic) - -%description mime_magic -This PHP module adds support for MIME type lookup via file magic -numbers using magic.mime database. - -%description mime_magic -l pl.UTF-8 -Moduł PHP dodający obsługę wyszukiwania typów MIME według magicznych -znaczników plików z użyciem bazy danych magic.mime. - %package ming Summary: ming extension module for PHP Summary(pl.UTF-8): Moduł ming dla PHP @@ -1560,6 +1546,7 @@ %patch29 -p1 %patch31 -p1 +%patch38 -p1 # conflict seems to be resolved by recode patches rm -f ext/recode/config9.m4 @@ -1604,7 +1591,7 @@ touch _built-conf fi export PROG_SENDMAIL="/usr/lib/sendmail" -export CPPFLAGS=-DDEBUG_FASTCGI +export CPPFLAGS="-DDEBUG_FASTCGI -DHAVE_STRNDUP" sapis=" %if %{with fcgi} @@ -1682,7 +1669,8 @@ %if %{with interbase} && !%{with interbase_inst} --with-pdo-firebird=shared,/usr \ %endif - --with-pdo-mysql=shared \ + --with-mysql-sock=/var/lib/mysql/mysql.sock \ + --with-pdo-mysql=shared,mysqlnd \ %{?with_oci8:--with-pdo-oci=shared} \ %{?with_odbc:--with-pdo-odbc=shared,unixODBC,/usr} \ %{?with_pgsql:--with-pdo-pgsql=shared} \ @@ -1728,13 +1716,11 @@ %{?with_ldap:--with-ldap=shared --with-ldap-sasl} \ --with-mcrypt=shared \ %{?with_mhash:--with-mhash=shared} \ - %{?with_mime_magic:--with-mime-magic=shared,/usr/share/file/magic}%{!?with_mime_magic:--disable-mime-magic} \ %{?with_ming:--with-ming=shared} \ %{?with_mm:--with-mm} \ %{?with_mssql:--with-mssql=shared} \ --with-mysql=shared,/usr \ - --with-mysql-sock=/var/lib/mysql/mysql.sock \ - %{?with_mysqli:--with-mysqli=shared} \ + %{?with_mysqli:--with-mysqli=shared,mysqlnd} \ %{?with_oci8:--with-oci8=shared} \ %{?with_openssl:--with-openssl=shared} \ --with-kerberos \ @@ -1901,7 +1887,7 @@ # use system automake and {lib,sh}tool ln -snf /usr/share/automake/config.{guess,sub} $RPM_BUILD_ROOT%{_libdir}/php/build ln -snf %{_aclocaldir}/libtool.m4 $RPM_BUILD_ROOT%{_libdir}/php/build -ln -snf %{_datadir}/libtool/ltmain.sh $RPM_BUILD_ROOT%{_libdir}/php/build +ln -snf %{_datadir}/libtool/config/ltmain.sh $RPM_BUILD_ROOT%{_libdir}/php/build ln -snf %{_bindir}/shtool $RPM_BUILD_ROOT%{_libdir}/php/build # as a result of ext/pcre/pcrelib removal in %%prep, ext/pcre/php_pcre.h @@ -2008,7 +1994,6 @@ %extension_scripts mbstring %extension_scripts mcrypt %extension_scripts mhash -%extension_scripts mime_magic %extension_scripts ming %extension_scripts mssql %extension_scripts mysql @@ -2110,9 +2095,6 @@ %triggerun mhash -- %{name}-mhash < 4:5.0.4-9.1 %{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*mhash\.so/d' %{_sysconfdir}/php.ini -%triggerun mime_magic -- %{name}-mime_magic < 4:5.0.4-9.1 -%{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*mime_magic\.so/d' %{_sysconfdir}/php.ini - %triggerun ming -- %{name}-ming < 4:5.0.4-9.1 %{__sed} -i -e '/^extension[[:space:]]*=[[:space:]]*ming\.so/d' %{_sysconfdir}/php.ini @@ -2426,13 +2408,6 @@ %attr(755,root,root) %{php_extensiondir}/mhash.so %endif -%if %{with mime_magic} -%files mime_magic -%defattr(644,root,root,755) -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mime_magic.ini -%attr(755,root,root) %{php_extensiondir}/mime_magic.so -%endif - %if %{with ming} %files ming %defattr(644,root,root,755) @@ -2698,6 +2673,20 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.688.2.14 2008/07/27 15:50:08 zergin +- removed mime_magic: functionality now provided by fileinfo +- fileinfo now available in core + - added provides/obsoletes + - requires -DHAVE_STRNDUP (dunno why explicitly) +- added FreeTDS patch from HEAD (as patch38): fixes build with freetds 0.82 +- mysqli and pdo-mysql switched to mysqlnd (insted of libmysql) + - new and better, see: http://dev.mysql.com/downloads/connector/php-mysqlnd/ + - fixes missing symbols (compiled with libmysql pdo-mysql requires php-mysql) + - pdo-mysql doesn't honor --with-mysql-sock configure option, use ini + setting pdo_mysql.default_socket +- updated to current snap (200807271230) +- rel up to 0.18 + Revision 1.688.2.13 2008/07/25 08:27:18 zergin - Up to snap 2008.07.26 06:30 - remove no-metaccld patch (no longer needed) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/php.spec?r1=1.688.2.13&r2=1.688.2.14&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
