[phpMyAdmin] Demacrofy the spec file a bit, use install(1) rather cp(1)

Robert Scheck robert at fedoraproject.org
Tue Jul 26 20:43:49 UTC 2011


commit 300079ea9529dc23a02ae6704f1e5707de753067
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Tue Jul 26 22:43:17 2011 +0200

    Demacrofy the spec file a bit, use install(1) rather cp(1)

 phpMyAdmin.spec |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/phpMyAdmin.spec b/phpMyAdmin.spec
index 55f0ad1..9148700 100644
--- a/phpMyAdmin.spec
+++ b/phpMyAdmin.spec
@@ -48,15 +48,15 @@ sed -e "/'CHANGELOG_FILE'/s at ./ChangeLog@%{_datadir}/doc/%{name}-%{version}/Chang
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__mkdir} -p $RPM_BUILD_ROOT{%{_datadir}/%{name},%{_sysconfdir}/{httpd/conf.d,%{name}}}
-%{__mkdir} -p $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/{upload,save,config}
-%{__cp} -ad ./* $RPM_BUILD_ROOT%{_datadir}/%{name}
-%{__cp} -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/%{name}.conf
-%{__cp} -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/config.inc.php
-
-%{__rm} -f $RPM_BUILD_ROOT%{_datadir}/%{name}/{[CIRLT]*,*txt}
-%{__rm} -f $RPM_BUILD_ROOT%{_datadir}/%{name}/{libraries,setup/{lib,frames}}/.htaccess
-%{__rm} -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/contrib
+mkdir -p $RPM_BUILD_ROOT{%{_datadir}/%{name},%{_sysconfdir}/{httpd/conf.d,%{name}}}
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/{upload,save,config}
+cp -ad * $RPM_BUILD_ROOT%{_datadir}/%{name}
+install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/%{name}.conf
+install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/config.inc.php
+
+rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/{[CIRLT]*,*txt}
+rm -f $RPM_BUILD_ROOT%{_datadir}/%{name}/{libraries,setup/{lib,frames}}/.htaccess
+rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/contrib
 
 %clean
 rm -rf $RPM_BUILD_ROOT


More information about the scm-commits mailing list