[packages/Smarty-plugin-gettext] help rpm5 out: tsmarty2c is deliberately packaged to both packages with same name

glen glen at pld-linux.org
Wed Oct 30 17:29:26 CET 2013


commit 2e412f500cc0570dbb8a030cd2ab09b497e3fedb
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Wed Oct 30 18:29:13 2013 +0200

    help rpm5 out: tsmarty2c is deliberately packaged to both packages with same name

 Smarty-plugin-gettext.spec | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/Smarty-plugin-gettext.spec b/Smarty-plugin-gettext.spec
index c3135a6..535dbe5 100644
--- a/Smarty-plugin-gettext.spec
+++ b/Smarty-plugin-gettext.spec
@@ -25,8 +25,11 @@ Obsoletes:	smarty-gettext-devel
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_smartyplugindir	%{_datadir}/php/Smarty/plugins
-%define		_smarty3plugindir	%{_datadir}/php/Smarty3/plugins
+%define		_smartyplugindir	%{php_data_dir}/Smarty/plugins
+%define		_smarty3plugindir	%{php_data_dir}/Smarty3/plugins
+
+# tsmarty2c is deliberately packaged to both packages with same name
+%define		_duplicate_files_terminate_build   0
 
 %description
 smarty-gettext provides gettext support for Smarty, the popular PHP
@@ -40,9 +43,9 @@ silnika szablonów dla PHP - <http://smarty.php.net/>.
 Summary:	Gettext support for Smarty
 Summary(pl.UTF-8):	Obsługa gettexta dla systemu Smarty
 Group:		Development/Languages/PHP
-Requires:	php-Smarty >= 3.1.8-4
 Requires:	php(core) >= %{php_min_version}
 Requires:	php(gettext)
+Requires:	php-Smarty >= 3.1.8-4
 
 %description -n php-Smarty-plugin-gettext
 smarty-gettext provides gettext support for Smarty, the popular PHP
@@ -58,8 +61,8 @@ silnika szablonów dla PHP - <http://smarty.php.net/>.
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_smartyplugindir},%{_smarty3plugindir},%{_bindir}}
-cp -a block.t.php $RPM_BUILD_ROOT%{_smartyplugindir}
-cp -a block.t.php $RPM_BUILD_ROOT%{_smarty3plugindir}
+cp -p block.t.php $RPM_BUILD_ROOT%{_smartyplugindir}
+cp -p block.t.php $RPM_BUILD_ROOT%{_smarty3plugindir}
 install -p %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/tsmarty2c
 
 %clean
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/Smarty-plugin-gettext.git/commitdiff/2e412f500cc0570dbb8a030cd2ab09b497e3fedb



More information about the pld-cvs-commit mailing list