- up to 5.5.5

[packages/whois.git] / whois.spec

diff --git a/whois.spec b/whois.spec
index 87bf29664465c797549d7c687024bb961d7c7c54..e0826dbb4718a86d701b1df87f67cd163cdc8c4f 100644 (file)
--- a/whois.spec
+++ b/whois.spec
@@ -1,27 +1,26 @@
-# TODO
-# - Why does whois provide something called mkpasswd (also provided by expect)
-#   and should we rm it durring %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
 Summary(uk.UTF-8):     Покращений клієнт WHOIS
 Name:          whois
-Version:       5.2.4
+Version:       5.5.5
 Release:       1
 License:       GPL v2+
 Group:         Networking/Utilities
 Source0:       http://ftp.debian.org/debian/pool/main/w/whois/%{name}_%{version}.tar.xz
-# Source0-md5: be5828dd4e24b264a3c818d254382ae3
+# Source0-md5: f352b440b70ed0e090d49718d370cc4b
 Patch0:                %{name}-idn.patch
 Patch1:                %{name}-config.patch
-URL:           http://www.linux.it/~md/software/
+Patch2:                %{name}-mkpwdhash.patch
+Patch3:                %{name}-pl.po-update.patch
+URL:           https://github.com/rfc1036/whois
 BuildRequires: gettext-tools
-BuildRequires: libidn-devel
+BuildRequires: libidn2-devel >= 2.0.3
+BuildRequires: libxcrypt-devel >= 4.1
 BuildRequires: perl-base
 BuildRequires: tar >= 1:1.22
 BuildRequires: xz
+Requires:      libidn2 >= 2.0.3
 Obsoletes:     inetutils-whois
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -48,9 +47,11 @@ większosci zapytań.
 вибирати правильний whois сервер в залежності від запиту.
 
 %prep
-%setup -q
+%setup -q -n %{name}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+#%patch3 -p1
 
 # Makefile vs po/Makefile mismatch
 echo 'install-pos: install' >> po/Makefile
@@ -59,21 +60,18 @@ echo 'install-pos: install' >> po/Makefile
 %{__make} \
        CC="%{__cc}" \
        CFLAGS="%{rpmcflags} %{rpmcppflags}" \
-       HAVE_LIBIDN=1
+       HAVE_ICONV=1
 
 %{__make} -C po
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_bindir},%{_mandir}/man1}
-
-install whois.conf $RPM_BUILD_ROOT%{_sysconfdir}
-
 %{__make} install 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}
 
@@ -83,7 +81,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*