- Smarty has nothing to do with PEAR

- move Smarty out of PEAR dirs and kill PEAR dep (trigger included)
- rel 3

Changed files:
    Smarty.spec -> 1.28

diff --git a/Smarty.spec b/Smarty.spec
index fea402e2d2f8888ea9f7b4326c032163986399be..adfc53ff895e0d2b9376e7c36ba311706759a956 100644 (file)
--- a/Smarty.spec
+++ b/Smarty.spec
@@ -4,7 +4,7 @@ Summary:        Template engine for PHP
 Summary(pl):   System szablonów dla PHP
 Name:          Smarty
 Version:       2.6.10
-Release:       2
+Release:       3
 License:       LGPL
 Group:         Development/Languages/PHP
 Source0:       http://smarty.php.net/distributions/%{name}-%{version}.tar.gz
@@ -14,10 +14,11 @@ Source1:    http://smarty.php.net/distributions/manual/en/%{name}-%{_doc_version}-d
 URL:           http://smarty.php.net/
 BuildRequires: rpm-php-pearprov >= 4.3
 Requires:      php-common
-Requires:      php-pear
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define                _smartydir      %{_datadir}/php/Smarty
+
 %description
 Smarty is a template engine for PHP. Smarty provides your basic
 variable substitution and dynamic block functionality, and also takes
@@ -51,26 +52,41 @@ Dokumentacja do systemu szablon
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{php_pear_dir}/%{name}/{internals,plugins}
+install -d $RPM_BUILD_ROOT{%{_smartydir}/{internals,plugins},%{php_pear_dir}}
+
+install libs/{Config_File,Smarty{,_Compiler}}.class.php $RPM_BUILD_ROOT%{_smartydir}
+install libs/debug.tpl $RPM_BUILD_ROOT%{_smartydir}
+install libs/internals/*.php $RPM_BUILD_ROOT%{_smartydir}/internals
+install libs/plugins/*.php $RPM_BUILD_ROOT%{_smartydir}/plugins
 
-install libs/{Config_File,Smarty{,_Compiler}}.class.php $RPM_BUILD_ROOT%{php_pear_dir}/%{name}
-install libs/debug.tpl $RPM_BUILD_ROOT%{php_pear_dir}/%{name}
-install libs/internals/*.php $RPM_BUILD_ROOT%{php_pear_dir}/%{name}/internals
-install libs/plugins/*.php $RPM_BUILD_ROOT%{php_pear_dir}/%{name}/plugins
+# backards compatible
+ln -s %{_smartydir} $RPM_BUILD_ROOT%{php_pear_dir}/%{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+# make compat symlink, the symlink is discarded using %ghost on package uninstall
+%triggerpostun -- Smarty < 2.6.10-1.2
+if [ -d %{php_pear_dir}/%{name}/plugins ]; then
+       mv %{php_pear_dir}/%{name}/plugins/* %{_smartydir}/plugins
+       rmdir %{php_pear_dir}/%{name}/plugins 2>/dev/null
+fi
+rmdir %{php_pear_dir}/%{name} 2>/dev/null || mv -v %{php_pear_dir}/%{name}{,.rpmsave}
+ln -s %{_smartydir} %{php_pear_dir}/%{name}
+
 %files
 %defattr(644,root,root,755)
 %doc BUGS ChangeLog FAQ INSTALL NEWS README RELEASE_NOTES TODO
-%dir %{php_pear_dir}/%{name}
-%dir %{php_pear_dir}/%{name}/internals
-%dir %{php_pear_dir}/%{name}/plugins
-%{php_pear_dir}/%{name}/*.class.php
-%{php_pear_dir}/%{name}/debug.tpl
-%{php_pear_dir}/%{name}/internals/*.php
-%{php_pear_dir}/%{name}/plugins/*.php
+%dir %{_smartydir}
+%dir %{_smartydir}/internals
+%dir %{_smartydir}/plugins
+%{_smartydir}/*.class.php
+%{_smartydir}/debug.tpl
+%{_smartydir}/internals/*.php
+%{_smartydir}/plugins/*.php
+
+# for the sake of bc
+%ghost %{php_pear_dir}/%{name}
 
 %files doc
 %defattr(644,root,root,755)