SPECS (DEVEL): php-pear-PhpDocumentor.spec - use system Smarty

[glen]

Author: glen                         Date: Sun Sep 18 09:54:14 2005 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- use system Smarty

---- Files affected:
SPECS:
   php-pear-PhpDocumentor.spec (1.11.2.9 -> 1.11.2.10) 

---- Diffs:

================================================================
Index: SPECS/php-pear-PhpDocumentor.spec
diff -u SPECS/php-pear-PhpDocumentor.spec:1.11.2.9 SPECS/php-pear-PhpDocumentor.spec:1.11.2.10
--- SPECS/php-pear-PhpDocumentor.spec:1.11.2.9	Sun Sep 18 11:23:20 2005
+++ SPECS/php-pear-PhpDocumentor.spec	Sun Sep 18 11:54:09 2005
@@ -13,13 +13,14 @@
 Name:		php-pear-%{_pearname}
 Version:	1.3.0
 %define	_rc RC3
-Release:	0.%{_rc}.6
+Release:	0.%{_rc}.13
 License:	PHP 3.00
 Group:		Development/Languages/PHP
 Source0:	http://pear.php.net/get/%{_pearname}-%{version}%{_rc}.tgz
 # Source0-md5:	d96ccefa7cfce8b0f24216b8f5041ba4
 Patch0:		%{name}-includes_fix.patch
 Patch1:		%{name}-html_treemenu_includes_fix.patch
+Patch2:		%{name}-smarty.patch
 URL:		http://pear.php.net/package/PhpDocumentor/
 BuildRequires:	php-pear-PEAR >= 1:1.4.0-0.b1.3
 BuildRequires:	rpm-php-pearprov >= 4.0.2-98
@@ -32,6 +33,8 @@
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		_smartyplugindir	%{php_pear_dir}/Smarty/plugins
+
 # don't require %{php_pear_dir}/data files we provide.
 # TODO treemenu needs patching (removing from this package)
 # pear/PhpDocumentor can optionally use package "pear/XML_Beautifier" (version >= 1.1)
@@ -124,28 +127,25 @@
 %prep
 %pear_package_setup
 
-# jesus, remove the Smarty cache, poldek goes crazy on them (provides/requires payload exceeded 64k)
+# remove bundled Smarty cache, poldek goes crazy on them (provides/requires payload exceeded 64k)
 find -name templates_c | xargs -ri sh -c 'rm -rf {}; mkdir {}'
 
 # patches
 #%patch0 -p1
 #%patch1 -p1
+%patch2 -p1
+
+# remove bundled Smarty. use system one.
+mkdir plugins
+mv ./%{php_pear_dir}/PhpDocumentor/phpDocumentor/Smarty-*/libs/plugins/\
+{block.strip.php,function.{assign,var_dump}.php,modifier.{htmlentities,rawurlencode}.php} plugins
+rm -rf ./%{php_pear_dir}/PhpDocumentor/phpDocumentor/Smarty-*
+rm -rf ./%{php_pear_dir}/data/PhpDocumentor/phpDocumentor/Smarty-*
 
 # useless
 cd ./%{php_pear_dir}
 rm -rf tests/PhpDocumentor/Documentation/tests
 
-# patch the sources
-# include only these to this package and depend on smarty?
-#Only in Smarty-2.5.0/libs/plugins: block.strip.php
-#Only in Smarty-2.5.0/libs/plugins: function.assign.php
-#Only in Smarty-2.5.0/libs/plugins: function.var_dump.php
-#Only in Smarty-2.5.0/libs/plugins: modifier.htmlentities.php
-#Only in Smarty-2.5.0/libs/plugins: modifier.rawurlencode.php
-
-# wasn't bundled before. so remove
-rm -f PhpDocumentor/phpDocumentor/Smarty-2.5.0/{BUGS,COPYING.lib,ChangeLog,FAQ,INSTALL,NEWS,README,RELEASE_NOTES,TODO}
-
 # and these. correct if it's wrong
 cd data/PhpDocumentor/phpDocumentor/Converters/HTML
 rm -f \
@@ -158,9 +158,10 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT{%{_bindir},%{php_pear_dir}}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{php_pear_dir},%{_smartyplugindir}}
 cp -a ./%{_bindir}/phpdoc $RPM_BUILD_ROOT%{_bindir}
 cp -a ./%{php_pear_dir}/* $RPM_BUILD_ROOT%{php_pear_dir}
+cp -a plugins/* $RPM_BUILD_ROOT%{_smartyplugindir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -180,12 +181,18 @@
 %{php_pear_dir}/%{_class}
 %{php_pear_dir}/data/%{_class}
 
+# extra Smarty plugins
+%{_smartyplugindir}/*
+
 %define	date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11.2.10  2005/09/18 09:54:09  glen
+- use system Smarty
+
 Revision 1.11.2.9  2005/09/18 09:23:20  glen
 - pear/XML_Beautifier is optional
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/php-pear-PhpDocumentor.spec?r1=1.11.2.9&r2=1.11.2.10&f=u