Author: paszczus Date: Sun Dec 12 18:29:20 2010 GMT Module: packages Tag: HEAD ---- Log message: - reverted. Smarty3 is now in Smarty3.spec
---- Files affected: packages/Smarty: Smarty.spec (1.53 -> 1.54) , path.patch (1.2 -> 1.3) ---- Diffs: ================================================================ Index: packages/Smarty/Smarty.spec diff -u packages/Smarty/Smarty.spec:1.53 packages/Smarty/Smarty.spec:1.54 --- packages/Smarty/Smarty.spec:1.53 Sun Dec 12 19:08:59 2010 +++ packages/Smarty/Smarty.spec Sun Dec 12 19:29:15 2010 @@ -1,25 +1,24 @@ # $Revision$, $Date$ -%define doc_version 3.0 -%define php_min_version 5.2.0 +%define doc_version 2.6.14 +%define php_min_version 5.0.0 %include /usr/lib/rpm/macros.php Summary: Template engine for PHP Summary(pl.UTF-8): System szablonów dla PHP Name: Smarty -Version: 3.0.5 -Release: 0.1 +Version: 2.6.26 +Release: 4 License: LGPL v2.1+ Group: Development/Languages/PHP -Source0: http://www.smarty.net/files/%{name}-%{version}.tar.gz -# Source0-md5: f7483eaa36ec72337827060076296478 -# Source1Download: http://www.smarty.net/documentation -Source1: http://www.smarty.net/files/docs/manual-en-%{doc_version}.zip -# Source1-md5: 8db376266f1313927cc8e112f2526e21 +Source0: http://www.smarty.net/distributions/%{name}-%{version}.tar.gz +# Source0-md5: e0da351443b8613e1013c481ab30cb84 +# Source1Download: http://www.smarty.net/download-docs.php +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 Patch1: modifier.mb_truncate.patch URL: http://www.smarty.net/ BuildRequires: rpm-php-pearprov >= 4.4.2-11 -BuildRequires: unzip Requires: php-common >= 4:%{php_min_version} Requires: php-date Requires: php-pcre @@ -61,16 +60,17 @@ %setup -q -a1 %patch0 -p1 cp -a libs/plugins/modifier.{,mb_}truncate.php -#%patch1 -p1 +%patch1 -p1 %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{appdir}/{plugins,sysplugins},%{php_pear_dir}} +install -d $RPM_BUILD_ROOT{%{appdir}/{internals,plugins},%{php_pear_dir}} 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 libs/sysplugins/*.php $RPM_BUILD_ROOT%{appdir}/sysplugins cp -a %{SOURCE2} $RPM_BUILD_ROOT%{appdir}/plugins/function.html_input_image.php # backards compatible with pear dir @@ -96,25 +96,27 @@ %files %defattr(644,root,root,755) -%doc README SMARTY2_BC_NOTES +%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 -%dir %{appdir}/sysplugins %{appdir}/Smarty.class.php +%{appdir}/Config_File.class.php +%{appdir}/Smarty_Compiler.class.php %{appdir}/debug.tpl +%{appdir}/internals/*.php %{appdir}/plugins/*.php -%{appdir}/sysplugins/*.php # for the sake of bc when installed to pear dir %ghost %{php_pear_dir}/%{name} %files doc %defattr(644,root,root,755) -%doc demo/* +%doc manual/* %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -122,11 +124,8 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ -Revision 1.53 2010/12/12 18:08:59 paszczus -- updated to 3.0.5 (stable) -- updated path.patch -- Patch1 needs update -- Smarty 2.x series moved to SMARTY_2 tag +Revision 1.54 2010/12/12 18:29:15 paszczus +- reverted. Smarty3 is now in Smarty3.spec Revision 1.52 2010/11/19 11:38:36 glen - create mb_truncate modifier, ================================================================ Index: packages/Smarty/path.patch diff -u packages/Smarty/path.patch:1.2 packages/Smarty/path.patch:1.3 --- packages/Smarty/path.patch:1.2 Sun Dec 12 19:09:12 2010 +++ packages/Smarty/path.patch Sun Dec 12 19:29:15 2010 @@ -1,12 +1,11 @@ -diff -ur Smarty-3.0.5/libs/Smarty.class.php Smarty-3.0.5.new//libs/Smarty.class.php ---- Smarty-3.0.5/libs/Smarty.class.php 2010-11-21 03:59:07.000000000 +0100 -+++ Smarty-3.0.5.new//libs/Smarty.class.php 2010-12-12 19:05:26.021806440 +0100 -@@ -43,7 +43,7 @@ - * Sets SMARTY_DIR only if user application has not already defined it. +--- 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__) . DS); +- 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.53&r2=1.54&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/Smarty/path.patch?r1=1.2&r2=1.3&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
