packages: php-phpquery/php-phpquery.spec, php-phpquery/svn.patch (NEW)=?UTF-8?Q?=20?=- ap...

[glen]

Author: glen                         Date: Wed Feb  8 20:29:10 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- apply fixes from svn

---- Files affected:
packages/php-phpquery:
   php-phpquery.spec (1.1 -> 1.2) , svn.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/php-phpquery/php-phpquery.spec
diff -u packages/php-phpquery/php-phpquery.spec:1.1 packages/php-phpquery/php-phpquery.spec:1.2
--- packages/php-phpquery/php-phpquery.spec:1.1	Wed Feb  8 21:25:22 2012
+++ packages/php-phpquery/php-phpquery.spec	Wed Feb  8 21:29:05 2012
@@ -5,12 +5,13 @@
 Summary:	phpQuery - jQuery port to PHP
 Name:		php-phpquery
 Version:	0.9.5.386
-Release:	0.10
+Release:	0.11
 License:	The MIT License
 Group:		Development/Languages/PHP
 Source0:	https://phpquery.googlecode.com/files/phpQuery-%{version}.zip
 # Source0-md5:	3ddab515c82a1a102a87f90ab319e7d1
-Patch0:		sys-mbstring.patch
+Patch0:		svn.patch
+Patch1:		sys-mbstring.patch
 URL:		https://code.google.com/p/phpquery/
 BuildRequires:	rpm-php-pearprov >= 4.4.2-11
 BuildRequires:	rpmbuild(macros) >= 1.610
@@ -40,6 +41,7 @@
 %setup -qc
 mv phpQuery .pq; mv .pq/* .
 %patch0 -p1
+%patch1 -p1
 
 # fix shebang
 %{__sed} -i -e '1s,^#!.*env php,#!/usr/bin/php,' cli/phpquery
@@ -82,5 +84,8 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2012/02/08 20:29:05  glen
+- apply fixes from svn
+
 Revision 1.1  2012/02/08 20:25:22  glen
 - new

================================================================
Index: packages/php-phpquery/svn.patch
diff -u /dev/null packages/php-phpquery/svn.patch:1.1
--- /dev/null	Wed Feb  8 21:29:10 2012
+++ packages/php-phpquery/svn.patch	Wed Feb  8 21:29:05 2012
@@ -0,0 +1,22 @@
+--- php-phpquery-0.9.5.386/phpQuery/phpQuery/DOMDocumentWrapper.php	2009-03-31 17:42:39.000000000 +0300
++++ phpQuery-dev/phpQuery/phpQuery/DOMDocumentWrapper.php	2012-02-08 22:26:30.486110050 +0200
+@@ -386,7 +386,7 @@
+ 			.($xhtml ? '/' : '')
+ 			.'>';
+ 		if (strpos($html, '<head') === false) {
+-			if (strpos($hltml, '<html') === false) {
++			if (strpos($html, '<html') === false) {
+ 				return $meta.$html;
+ 			} else {
+ 				return preg_replace(
+--- php-phpquery-0.9.5.386/phpQuery/phpQuery/phpQueryObject.php	2009-04-10 10:47:36.000000000 +0300
++++ phpQuery-dev/phpQuery/phpQuery/phpQueryObject.php	2012-02-08 22:26:30.489443233 +0200
+@@ -1329,7 +1329,7 @@
+ 			if (extension_loaded('mbstring') && phpQuery::$mbstringSupport)
+ 				mb_ereg('^([^ ]+) (.*)$', $url, $matches);
+ 			else
+-				preg_match('^([^ ]+) (.*)$', $url, $matches);
++				preg_match('@^([^ ]+) (.*)$@', $url, $matches);
+ 			$url = $matches[1];
+ 			$selector = $matches[2];
+ 			// FIXME this sucks, pass as callback param
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php-phpquery/php-phpquery.spec?r1=1.1&r2=1.2&f=u