[packages/yum] - use __mv, __rm macros

qboosh qboosh at pld-linux.org
Sat Sep 11 18:44:24 CEST 2021


commit 99cff9c93d5456466327b58a0c4151b60b1cb054
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Sep 11 18:46:20 2021 +0200

    - use __mv, __rm macros

 yum.spec | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)
---
diff --git a/yum.spec b/yum.spec
index d8f4d3e..a24fb3d 100644
--- a/yum.spec
+++ b/yum.spec
@@ -145,6 +145,7 @@ export LC_ALL=en_US.utf8
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir}/yum/pluginconf.d,%{_libdir}/yum-plugins,%{_datadir}/yum-plugins}
+
 %{__make} install -j1 \
 	INIT=systemd \
 	UNITDIR=%{systemdunitdir} \
@@ -163,8 +164,8 @@ install -d $RPM_BUILD_ROOT{%{_sysconfdir}/yum/pluginconf.d,%{_libdir}/yum-plugin
 %{__rm} $RPM_BUILD_ROOT/etc/cron.hourly/0yum-hourly.cron
 
 # for now, move repodir/yum.conf back
-mv $RPM_BUILD_ROOT%{_sysconfdir}/{yum/repos.d,/yum.repos.d}
-mv $RPM_BUILD_ROOT%{_sysconfdir}/{yum/yum.conf,yum.conf}
+%{__mv} $RPM_BUILD_ROOT%{_sysconfdir}/{yum/repos.d,/yum.repos.d}
+%{__mv} $RPM_BUILD_ROOT%{_sysconfdir}/{yum/yum.conf,yum.conf}
 
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d/pld.repo
 
@@ -177,11 +178,9 @@ touch $RPM_BUILD_ROOT/var/lib/yum/uuid
 
 %py_postclean %{_datadir}/yum-cli
 
-mv $RPM_BUILD_ROOT%{_localedir}/lt{_LT,}
+%{__mv} $RPM_BUILD_ROOT%{_localedir}/lt{_LT,}
 # duplicate with id, nl and pt
-rm -r $RPM_BUILD_ROOT%{_localedir}/id_ID
-rm -r $RPM_BUILD_ROOT%{_localedir}/nl_NL
-rm -r $RPM_BUILD_ROOT%{_localedir}/pt_PT
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/{id_ID,nl_NL,pt_PT}
 
 %find_lang %{name}
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/yum.git/commitdiff/a630c949272d3ab4231c9d1b281b32da3576f605



More information about the pld-cvs-commit mailing list