packages: Smarty/Smarty.spec, Smarty/path.patch (NEW) - move Smarty.class.p...

[glen]

Author: glen                         Date: Fri May 28 11:52:33 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- move Smarty.class.php to include_path; rel 3

---- Files affected:
packages/Smarty:
   Smarty.spec (1.50 -> 1.51) , path.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/Smarty/Smarty.spec
diff -u packages/Smarty/Smarty.spec:1.50 packages/Smarty/Smarty.spec:1.51
--- packages/Smarty/Smarty.spec:1.50	Fri May 28 13:27:24 2010
+++ packages/Smarty/Smarty.spec	Fri May 28 13:52:27 2010
@@ -6,8 +6,8 @@
 Summary(pl.UTF-8):	System szablonów dla PHP
 Name:		Smarty
 Version:	2.6.26
-Release:	2
-License:	LGPL
+Release:	3
+License:	LGPL v2.1+
 Group:		Development/Languages/PHP
 Source0:	http://www.smarty.net/distributions/%{name}-%{version}.tar.gz
 # Source0-md5:	e0da351443b8613e1013c481ab30cb84
@@ -15,6 +15,7 @@
 Source1:	http://www.smarty.net/distributions/manual/en/%{name}-%{doc_version}-docs.tar.gz
 # Source1-md5:	5123152dd248898a84b96b806f551e78
 Source2:	%{name}-function.html_input_image.php
+Patch0:		path.patch
 URL:		http://www.smarty.net/
 BuildRequires:	rpm-php-pearprov >= 4.4.2-11
 Requires:	php-common >= 4:%{php_min_version}
@@ -56,20 +57,25 @@
 
 %prep
 %setup -q -a1
+%patch0 -p1
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{appdir}/{internals,plugins},%{php_pear_dir}}
 
-cp -a libs/{Config_File,Smarty{,_Compiler}}.class.php $RPM_BUILD_ROOT%{appdir}
+cp -a libs/Smarty.class.php $RPM_BUILD_ROOT%{php_data_dir}
+cp -a libs/{Config_File,Smarty_Compiler}.class.php $RPM_BUILD_ROOT%{appdir}
 cp -a libs/debug.tpl $RPM_BUILD_ROOT%{appdir}
 cp -a libs/internals/*.php $RPM_BUILD_ROOT%{appdir}/internals
 cp -a libs/plugins/*.php $RPM_BUILD_ROOT%{appdir}/plugins
 cp -a %{SOURCE2} $RPM_BUILD_ROOT%{appdir}/plugins/function.html_input_image.php
 
-# backards compatible
+# backards compatible with pear dir
 ln -s %{appdir} $RPM_BUILD_ROOT%{php_pear_dir}/%{name}
 
+# backards compatible with entry point in subdir
+ln -s ../Smarty.class.php $RPM_BUILD_ROOT%{appdir}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -88,11 +94,15 @@
 %files
 %defattr(644,root,root,755)
 %doc BUGS ChangeLog FAQ INSTALL NEWS README RELEASE_NOTES TODO
+# entry point in include_path
+%{php_data_dir}/Smarty.class.php
+
+# app itself
 %dir %{appdir}
 %dir %{appdir}/internals
 %dir %{appdir}/plugins
-%{appdir}/Config_File.class.php
 %{appdir}/Smarty.class.php
+%{appdir}/Config_File.class.php
 %{appdir}/Smarty_Compiler.class.php
 %{appdir}/debug.tpl
 %{appdir}/internals/*.php
@@ -111,6 +121,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.51  2010/05/28 11:52:27  glen
+- move Smarty.class.php to include_path; rel 3
+
 Revision 1.50  2010/05/28 11:27:24  glen
 - update for php deps
 

================================================================
Index: packages/Smarty/path.patch
diff -u /dev/null packages/Smarty/path.patch:1.1
--- /dev/null	Fri May 28 13:52:33 2010
+++ packages/Smarty/path.patch	Fri May 28 13:52:27 2010
@@ -0,0 +1,11 @@
+--- Smarty-2.6.26/libs/Smarty.class.php~	2009-06-18 17:47:04.000000000 +0300
++++ Smarty-2.6.26/libs/Smarty.class.php	2010-05-28 14:46:48.810070152 +0300
+@@ -46,7 +46,7 @@
+  */
+ 
+ if (!defined('SMARTY_DIR')) {
+-    define('SMARTY_DIR', dirname(__FILE__) . DIRECTORY_SEPARATOR);
++    define('SMARTY_DIR', '/usr/share/php/Smarty/');
+ }
+ 
+ if (!defined('SMARTY_CORE_DIR')) {
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/Smarty/Smarty.spec?r1=1.50&r2=1.51&f=u