From: Jan Rękorajski <baggins@pld-linux.org>
Date: Sat, 25 Jan 2020 13:57:33 +0000 (+0100)
Subject: - drop obsolete and outdated manual inclusion of rpm macros
X-Git-Url: http://git.pld-linux.org/?p=packages%2FCodeIgniter-lib-smarty.git;a=commitdiff_plain;h=HEAD;hp=8b91c9cd281d8ed0c4a434947d7fa08b2a2e4308

- drop obsolete and outdated manual inclusion of rpm macros
---

diff --git a/CodeIgniter-lib-smarty.spec b/CodeIgniter-lib-smarty.spec
index c391750..d66810f 100644
--- a/CodeIgniter-lib-smarty.spec
+++ b/CodeIgniter-lib-smarty.spec
@@ -1,15 +1,14 @@
 %define		php_min_version 5.2.4
 %define		shortname	smarty
-%include	/usr/lib/rpm/macros.php
 Summary:	Use smarty template engine in CodeIgniter
 Name:		CodeIgniter-lib-%{shortname}
-Version:	1
+Version:	2
 Release:	0.1
 License:	GPL
 Group:		Development/Languages/PHP
 Source0:	Smarty_tpl.php
 Requires:	CodeIgniter >= 2.0.0
-Requires:	php-Smarty >= 3.0
+Requires:	php-Smarty >= 3.1
 Requires:	php-common >= 4:%{php_min_version}
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
diff --git a/Smarty_tpl.php b/Smarty_tpl.php
index d7d7839..a21d3c9 100644
--- a/Smarty_tpl.php
+++ b/Smarty_tpl.php
@@ -10,18 +10,18 @@ class smarty_tpl extends Smarty {
     function smarty_tpl() {
         $this->Smarty();
         // templates folder
-        $this->template_dir=    APPPATH."views/templates";
+        $this->setTemplateDir(APPPATH."views/templates");
         // compiled templates folder
-        $this->compile_dir=     APPPATH."views/templates_c";
+	$this->setCompileDir(APPPATH."views/templates_c");
         // cache folder
-        $this->cache_dir=       APPPATH."views/cache";
+        $this->setCacheDir(APPPATH."views/cache");
         //config folder
-        $this->config_dir=      APPPATH."views/config";
+        $this->setConfigDir(APPPATH."views/config");
 	//plugins folder
-	$this->plugins_dir = array(
+	$this->setPluginsDir(array(
 		"/usr/share/php/Smarty3/plugins/",
 		"/usr/share/php/Smarty3/sysplugins/"
-	);
+	));
 
         // template recheck on
         $this->compile_check=   true;