- package mkpasswd as mkpwdhash to avoid conflict with expect

[packages/whois.git] / whois.spec

diff --git a/whois.spec b/whois.spec
index 789cd891f350b5160e9c585db767d748b0b4de42..0a67e5a04fd62e02e5fad3b810ca135a8648c672 100644 (file)
--- a/whois.spec
+++ b/whois.spec
@@ -4,13 +4,14 @@ Summary(ru.UTF-8):    Улучшенный клиент WHOIS
 Summary(uk.UTF-8):     Покращений клієнт WHOIS
 Name:          whois
 Version:       5.3.0
-Release:       1
+Release:       2
 License:       GPL v2+
 Group:         Networking/Utilities
 Source0:       http://ftp.debian.org/debian/pool/main/w/whois/%{name}_%{version}.tar.xz
 # Source0-md5: 2355e5f4d9b91d4ec5ab608c1ea37a9e
 Patch0:                %{name}-idn.patch
 Patch1:                %{name}-config.patch
+Patch2:                %{name}-mkpwdhash.patch
 URL:           https://github.com/rfc1036/whois
 BuildRequires: gettext-tools
 BuildRequires: libidn2-devel
@@ -46,6 +47,7 @@ większosci zapytań.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 # Makefile vs po/Makefile mismatch
 echo 'install-pos: install' >> po/Makefile
@@ -61,11 +63,11 @@ echo 'install-pos: install' >> po/Makefile
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_bindir},%{_mandir}/man1}
-%{__make} install-whois install-pos \
+%{__make} install install-pos \
        BASEDIR=$RPM_BUILD_ROOT \
        prefix=%{_prefix}
 
-cp -p whois.conf $RPM_BUILD_ROOT%{_sysconfdir}
+%{__cp} -p whois.conf $RPM_BUILD_ROOT%{_sysconfdir}
 
 %find_lang %{name}
 
@@ -75,7 +77,9 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc README debian/changelog
+%attr(755,root,root) %{_bindir}/mkpwdhash
 %attr(755,root,root) %{_bindir}/whois
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/whois.conf
+%{_mandir}/man1/mkpwdhash.1*
 %{_mandir}/man1/whois.1*
 %{_mandir}/man5/whois.conf.5*