Author: glen Date: Tue Jun 2 10:12:37 2009 GMT Module: packages Tag: HEAD ---- Log message: - ZendFramework-db_charset.patch was cause of syntax errors - ZF-1541 was fixed in 1.8.0; rel 2
---- Files affected: packages/ZendFramework: ZendFramework.spec (1.60 -> 1.61) , ZendFramework-db_charset.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ Index: packages/ZendFramework/ZendFramework.spec diff -u packages/ZendFramework/ZendFramework.spec:1.60 packages/ZendFramework/ZendFramework.spec:1.61 --- packages/ZendFramework/ZendFramework.spec:1.60 Tue Jun 2 11:57:02 2009 +++ packages/ZendFramework/ZendFramework.spec Tue Jun 2 12:12:32 2009 @@ -1,13 +1,10 @@ # $Revision$, $Date$ -# PHP Fatal error: Cannot redeclare Zend_Db_Adapter_Pdo_Mysql::_connect() in library/Zend/Db/Adapter/Pdo/Mysql.php on line 120 -# Errors parsing library/Zend/Db/Adapter/Pdo/Mysql.php -# upstream bug: http://framework.zend.com/issues/browse/ZF-6881 %include /usr/lib/rpm/macros.php Summary: Zend Framework Summary(pl.UTF-8): Szkielet Zend Name: ZendFramework Version: 1.8.2 -Release: 0.1 +Release: 2 License: New BSD License Group: Development/Languages/PHP Source0: http://framework.zend.com/releases/%{name}-%{version}/%{name}-%{version}.tar.gz @@ -16,9 +13,8 @@ # Source1-md5: 993547c3d128cde28197bb013024d945 Source2: %{name}-find-lang.sh Patch0: %{name}-additional-locales.patch -Patch1: %{name}-db_charset.patch -Patch2: %{name}-deps.patch -Patch3: %{name}-bug6499.patch +Patch1: %{name}-deps.patch +Patch2: %{name}-bug6499.patch URL: http://framework.zend.com/ BuildRequires: rpm-php-pearprov >= 4.4.2-11 BuildRequires: sed >= 4.0 @@ -1266,14 +1262,14 @@ mv %{name}-%{version}/documentation . find '(' -name '*.php' -o -name '*.xml' ')' -print0 | xargs -0 %{__sed} -i -e 's,\r$,,' %patch0 -p1 -cd library -%patch1 -p0 -cd - -%patch2 -p1 -%patch3 -p0 +%patch1 -p1 +%patch2 -p0 install %{SOURCE2} find-lang.sh +# cleanup backups after patching +find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f + %build # check *.php files syntax using runkit extension lint_php() { @@ -1707,6 +1703,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.61 2009/06/02 10:12:32 glen +- ZendFramework-db_charset.patch was cause of syntax errors +- ZF-1541 was fixed in 1.8.0; rel 2 + Revision 1.60 2009/06/02 09:57:02 glen - link to upstream bug ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ZendFramework/ZendFramework.spec?r1=1.60&r2=1.61&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
