[packages/whois] don't install mkpasswd just to rm it

glen glen at pld-linux.org
Fri Jun 12 14:49:59 CEST 2015


commit 2ec34a2638b2d1b12c5fd208aa33075d16027db9
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Fri Jun 12 15:49:40 2015 +0300

    don't install mkpasswd just to rm it

 whois.spec | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)
---
diff --git a/whois.spec b/whois.spec
index 3122028..2a72dde 100644
--- a/whois.spec
+++ b/whois.spec
@@ -1,8 +1,3 @@
-# TODO
-# - Why does whois provide something called mkpasswd (also provided by expect)
-#   and should we rm it during %install with a note as to why we aren't using it?
-#   - "because of historical reasons" (quoting README)
-#
 Summary:	Enhanced WHOIS client
 Summary(pl.UTF-8):	Rozszerzony klient WHOIS
 Summary(ru.UTF-8):	Улучшенный клиент WHOIS
@@ -66,14 +61,11 @@ echo 'install-pos: install' >> po/Makefile
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_bindir},%{_mandir}/man1}
-
-install whois.conf $RPM_BUILD_ROOT%{_sysconfdir}
-
 %{__make} install-whois install-pos \
 	BASEDIR=$RPM_BUILD_ROOT \
 	prefix=%{_prefix}
 
-%{__rm} $RPM_BUILD_ROOT{%{_bindir}/mkpasswd,%{_mandir}/man1/mkpasswd.1}
+cp -p whois.conf $RPM_BUILD_ROOT%{_sysconfdir}
 
 %find_lang %{name}
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/whois.git/commitdiff/2ec34a2638b2d1b12c5fd208aa33075d16027db9



More information about the pld-cvs-commit mailing list