packages: php-docblox-DocBlox/php-docblox-DocBlox.spec, php-docblox-DocBlox...

[glen]

Author: glen                         Date: Mon May 16 12:44:30 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- minor path fixes

---- Files affected:
packages/php-docblox-DocBlox:
   php-docblox-DocBlox.spec (1.1 -> 1.2) , paths.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/php-docblox-DocBlox/php-docblox-DocBlox.spec
diff -u packages/php-docblox-DocBlox/php-docblox-DocBlox.spec:1.1 packages/php-docblox-DocBlox/php-docblox-DocBlox.spec:1.2
--- packages/php-docblox-DocBlox/php-docblox-DocBlox.spec:1.1	Mon May 16 14:37:31 2011
+++ packages/php-docblox-DocBlox/php-docblox-DocBlox.spec	Mon May 16 14:44:24 2011
@@ -9,11 +9,12 @@
 Summary:	%{pearname} - PHP 5.3 compatible API Documentation generator aimed at projects of all sizes and Continuous Integration
 Name:		php-docblox-DocBlox
 Version:	0.10.0
-Release:	0.1
+Release:	0.3
 License:	MIT
 Group:		Development/Languages/PHP
 Source0:	http://pear.docblox-project.org/get/%{pearname}-%{version}.tgz
 # Source0-md5:	ce67ba9e42a66bec3df8225968ddd19a
+Patch0:		paths.patch
 URL:		http://pear.docblox-project.org/package/DocBlox/
 BuildRequires:	php-channel(pear.docblox-project.org)
 BuildRequires:	php-packagexml2cl
@@ -65,6 +66,8 @@
 # ELF binary blobs?!
 rm -rf DocBlox/src/wkhtmltopdf
 
+%patch0 -p1
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{php_pear_dir}}
@@ -89,5 +92,8 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2011/05/16 12:44:24  glen
+- minor path fixes
+
 Revision 1.1  2011/05/16 12:37:31  glen
 - new

================================================================
Index: packages/php-docblox-DocBlox/paths.patch
diff -u /dev/null packages/php-docblox-DocBlox/paths.patch:1.1
--- /dev/null	Mon May 16 14:44:30 2011
+++ packages/php-docblox-DocBlox/paths.patch	Mon May 16 14:44:24 2011
@@ -0,0 +1,24 @@
+--- DocBlox-0.10.0/usr/share/pear/DocBlox/Core/Abstract.php~	2011-05-16 15:36:28.000000000 +0300
++++ DocBlox-0.10.0/usr/share/pear/DocBlox/Core/Abstract.php	2011-05-16 15:36:29.847690920 +0300
+@@ -260,7 +260,7 @@
+   {
+     if (self::$config === null)
+     {
+-      self::$config = new DocBlox_Core_Config(dirname(__FILE__) . '/../../../data/docblox.tpl.xml');
++      self::$config = new DocBlox_Core_Config(dirname(__FILE__) . '/../../data/DocBlox/docblox.tpl.xml');
+     }
+ 
+     return self::$config;
+--- DocBlox-0.10.0/usr/share/pear/DocBlox/Core/Config.php~	2011-05-16 15:42:43.000000000 +0300
++++ DocBlox-0.10.0/usr/share/pear/DocBlox/Core/Config.php	2011-05-16 15:42:46.778661119 +0300
+@@ -32,8 +32,8 @@
+       $this->paths = new Zend_Config(array(), true);
+     }
+ 
+-    $this->paths->application = realpath(dirname(__FILE__) . '/../../..');
+-    $this->paths->data        = realpath($this->paths->application . '/data');
++    $this->paths->application = realpath(dirname(__FILE__) . '/..');
++    $this->paths->data        = realpath(dirname($this->paths->application) . '/data/'.basename($this->paths->application));
+     $this->paths->templates   = realpath($this->paths->data . '/themes');
+     $this->paths->themes      = $this->paths->templates;
+     $this->mergeTemplateConfigurations();
================================================================

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