packages: php-pear-DB_NestedSet/php-pear-DB_NestedSet.spec, php-pear-DB_Nes...

[glen]

Author: glen                         Date: Fri Aug 20 16:35:38 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix include path

---- Files affected:
packages/php-pear-DB_NestedSet:
   php-pear-DB_NestedSet.spec (1.38 -> 1.39) , includepath.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/php-pear-DB_NestedSet/php-pear-DB_NestedSet.spec
diff -u packages/php-pear-DB_NestedSet/php-pear-DB_NestedSet.spec:1.38 packages/php-pear-DB_NestedSet/php-pear-DB_NestedSet.spec:1.39
--- packages/php-pear-DB_NestedSet/php-pear-DB_NestedSet.spec:1.38	Thu Aug 19 21:11:40 2010
+++ packages/php-pear-DB_NestedSet/php-pear-DB_NestedSet.spec	Fri Aug 20 18:35:33 2010
@@ -4,17 +4,16 @@
 %define		_subclass	NestedSet
 %define		_status		stable
 %define		_pearname	%{_class}_%{_subclass}
-
 Summary:	%{_pearname} - API to build and query nested sets
 Summary(pl.UTF-8):	%{_pearname} - API to tworzenia i wykonywania zagnieżdżonych zapytań
 Name:		php-pear-%{_pearname}
 Version:	1.4.1
-Release:	1
-Epoch:		0
+Release:	2
 License:	PHP 2.02
 Group:		Development/Languages/PHP
 Source0:	http://pear.php.net/get/%{_pearname}-%{version}.tgz
 # Source0-md5:	b906275511a6f4d1e9b1ed95ac6d7546
+Patch0:		includepath.patch
 URL:		http://pear.php.net/package/DB_NestedSet/
 BuildRequires:	php-pear-PEAR
 BuildRequires:	rpm-php-pearprov >= 4.4.2-12
@@ -61,9 +60,9 @@
 Summary:	Tests for PEAR::%{_pearname}
 Summary(pl.UTF-8):	Testy dla PEAR::%{_pearname}
 Group:		Development/Languages/PHP
-Requires:	%{name} = %{epoch}:%{version}-%{release}
-AutoReq:	no
+Requires:	%{name} = %{version}-%{release}
 AutoProv:	no
+AutoReq:	no
 
 %description tests
 Tests for PEAR::%{_pearname}.
@@ -73,18 +72,19 @@
 
 %prep
 %pear_package_setup
+%patch0 -p1
 
-# fix tests
-cd ./%{php_pear_dir}/tests/%{_pearname}/tests
-
-# make it suitable after install
-sed -i -e 's,NestedSet.php,DB/NestedSet.php,' *.php
+install -d examples
+mv docs/%{_pearname}/docs/*example.php examples
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{php_pear_dir}
 %pear_package_install
 
+install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+cp -a examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -97,6 +97,8 @@
 %{php_pear_dir}/%{_class}/*.php
 %{php_pear_dir}/%{_class}/%{_subclass}/*.php
 
+%{_examplesdir}/%{name}-%{version}
+
 %files tests
 %defattr(644,root,root,755)
 %{php_pear_dir}/tests/*
@@ -107,6 +109,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.39  2010/08/20 16:35:33  glen
+- fix include path
+
 Revision 1.38  2010/08/19 19:11:40  glen
 - up to 1.4.1
 

================================================================
Index: packages/php-pear-DB_NestedSet/includepath.patch
diff -u /dev/null packages/php-pear-DB_NestedSet/includepath.patch:1.1
--- /dev/null	Fri Aug 20 18:35:39 2010
+++ packages/php-pear-DB_NestedSet/includepath.patch	Fri Aug 20 18:35:33 2010
@@ -0,0 +1,11 @@
+--- DB_NestedSet-1.4.1/usr/share/pear/DB/NestedSet.php~	2010-08-20 19:31:24.000000000 +0300
++++ DB_NestedSet-1.4.1/usr/share/pear/DB/NestedSet.php	2010-08-20 19:32:13.742068041 +0300
+@@ -358,7 +358,7 @@
+             include_once($driverpath);
+         }
+         // Todo: Only load the node class when needed
+-        include_once('NestedSet/Node.php');
++        include_once('DB/NestedSet/Node.php');
+         $c = & new $classname($dsn, $params);
+         return $c;
+     }
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php-pear-DB_NestedSet/php-pear-DB_NestedSet.spec?r1=1.38&r2=1.39&f=u