- move Smarty.class.php to include_path; rel 3

Changed files:
    Smarty.spec -> 1.51
    path.patch -> 1.1

diff --git a/Smarty.spec b/Smarty.spec
index 0b71de5056d52a59ebe825cdce75f92e55e2e8c7..3990f78def2613d9915f8c6a9582ab551d7b1409 100644 (file)
--- a/Smarty.spec
+++ b/Smarty.spec
@@ -5,8 +5,8 @@ Summary:        Template engine for PHP
 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
@@ -14,6 +14,7 @@ Source0:      http://www.smarty.net/distributions/%{name}-%{version}.tar.gz
 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}
@@ -55,20 +56,25 @@ Dokumentacja do systemu szablonów Smarty.
 
 %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
 
@@ -87,11 +93,15 @@ ln -s %{appdir} %{php_pear_dir}/%{name}
 %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

diff --git a/path.patch b/path.patch
new file mode 100644 (file)
index 0000000..1d9187b
--- /dev/null
+++ b/path.patch
@@ -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')) {