- up to 5.3.1

[packages/whois.git] / whois.spec

diff --git a/whois.spec b/whois.spec
index 44e288af6b566d52e545a693abb89c567ea756a2..d78827c2d7e206599a67dee959f34b9490b77ffc 100644 (file)
--- a/whois.spec
+++ b/whois.spec
@@ -1,19 +1,23 @@
 Summary:       Enhanced WHOIS client
 Summary:       Enhanced WHOIS client

-Summary(pl):   Rozszerzony klient WHOIS
-Summary(ru):   õÌÕÞÛÅÎÎÙÊ ËÌÉÅÎÔ WHOIS
-Summary(uk):   ðÏËÒÁÝÅÎÉÊ Ë̦¤ÎÔ WHOIS
+Summary(pl.UTF-8):     Rozszerzony klient WHOIS
+Summary(ru.UTF-8):     Улучшенный клиент WHOIS
+Summary(uk.UTF-8):     Покращений клієнт WHOIS

 Name:          whois
 Name:          whois

-Version:       4.7.17
+Version:       5.3.1

 Release:       1
 Release:       1

-License:       GPL
+License:       GPL v2+

 Group:         Networking/Utilities
 Group:         Networking/Utilities

-Source0:       http://ftp.debian.org/debian/pool/main/w/whois/%{name}_%{version}.tar.gz
-# Source0-md5: 011d6615a413a5f4439191d773772b5c
+Source0:       http://ftp.debian.org/debian/pool/main/w/whois/%{name}_%{version}.tar.xz
+# Source0-md5: 5c436e40a7257a44401c001fc05c668c

 Patch0:                %{name}-idn.patch
 Patch0:                %{name}-idn.patch

-URL:           http://www.linux.it/~md/software/
-BuildRequires: gettext-devel
-BuildRequires: libidn-devel
+Patch1:                %{name}-config.patch
+Patch2:                %{name}-mkpwdhash.patch
+URL:           https://github.com/rfc1036/whois
+BuildRequires: gettext-tools
+BuildRequires: libidn2-devel

 BuildRequires: perl-base
 BuildRequires: perl-base

+BuildRequires: tar >= 1:1.22
+BuildRequires: xz

 Obsoletes:     inetutils-whois
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 Obsoletes:     inetutils-whois
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 


@@ -23,45 +27,48 @@ derived from and compatible with the usual BSD and RIPE whois(1)
 programs. It is intelligent and can automatically select the
 appropriate whois server for most queries.
 
 programs. It is intelligent and can automatically select the
 appropriate whois server for most queries.
 

-%description -l pl
-To jest nowy klient us³ugi whois (RFC 954) napisany ca³kowicie od
-nowa. Jest kompatybilny zarówno z whois z BSD oraz RIPE. Jest
+%description -l pl.UTF-8
+To jest nowy klient usługi whois (RFC 954) napisany całkowicie od
+nowa. Jest kompatybilny zarówno z whois z BSD oraz RIPE. Jest

 inteligentny i automatycznie dobiera poprawny serwer whois dla
 inteligentny i automatycznie dobiera poprawny serwer whois dla

-wiêkszosci zapytañ.
+większosci zapytań.

 
 

-%description -l ru
-üÔÏ ÎÁÐÉÓÁÎÎÙÊ Ó "ÎÕÌÑ" ËÌÉÅÎÔ (RFC 954), ÓÏ×ÍÅÓÔÉÍÙÊ Ó whois(1)
-ÐÒÏÇÒÁÍÍÁÍÉ BSD É RIPE. ÷ ÂÏÌØÛÉÎÓÔ×Å ÓÌÕÞÁÅ× ÏÎ ÍÏÖÅÔ Á×ÔÏÍÁÔÉÞÅÓËÉ
-×ÙÂÉÒÁÔØ ÐÒÁ×ÉÌØÎÙÊ whois ÓÅÒ×ÅÒ × ÚÁ×ÉÓÉÍÏÓÔÉ ÏÔ ÚÁÐÒÏÓÁ.
+%description -l ru.UTF-8
+Это написанный с "нуля" клиент (RFC 954), совместимый с whois(1)
+пÑ\80огÑ\80аммами BSD и RIPE. Ð\92 болÑ\8cÑ\88инÑ\81Ñ\82ве Ñ\81лÑ\83Ñ\87аев он можеÑ\82 авÑ\82омаÑ\82иÑ\87еÑ\81ки
+выбирать правильный whois сервер в зависимости от запроса.

 
 

-%description -l uk
-ãÅ ÚÁÎÏ×Ï ÎÁÐÉÓÁÎÉÊ Ë̦¤ÎÔ whois (RFC 954), ÓÕͦÓÎÉÊ Ú whois(1)
-ÐÒÏÇÒÁÍÁÍÉ BSD ÔÁ RIPE. ÷¦Î × Â¦ÌØÛÏÓÔ¦ ×ÉÐÁÄË¦× ÍÏÖÅ Á×ÔÏÍÁÔÉÞÎÏ
-×ÉÂÉÒÁÔÉ ÐÒÁ×ÉÌØÎÉÊ whois ÓÅÒ×ÅÒ × ÚÁÌÅÖÎÏÓÔ¦ ×¦Ä ÚÁÐÉÔÕ.
+%description -l uk.UTF-8
+Це заново написаний клієнт whois (RFC 954), сумісний з whois(1)
+пÑ\80огÑ\80амами BSD Ñ\82а RIPE. Ð\92Ñ\96н в бÑ\96лÑ\8cÑ\88оÑ\81Ñ\82Ñ\96 випадкÑ\96в може авÑ\82омаÑ\82иÑ\87но
+вибирати правильний whois сервер в залежності від запиту.

 
 %prep
 %setup -q
 %patch0 -p1
 
 %prep
 %setup -q
 %patch0 -p1

+%patch1 -p1
+%patch2 -p1

 
 

-mv -f po/{no,nb}.po
-%{__perl} -pi -e 's/no\.mo/nb.mo/' po/Makefile
+# Makefile vs po/Makefile mismatch
+echo 'install-pos: install' >> po/Makefile

 
 %build
 %{__make} \
        CC="%{__cc}" \
 
 %build
 %{__make} \
        CC="%{__cc}" \

-       OPTS="%{rpmcflags}" \
-       HAVE_LIBIDN=1
+       CFLAGS="%{rpmcflags} %{rpmcppflags}" \
+       HAVE_ICONV=1
+
+%{__make} -C po

 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_bindir},%{_mandir}/man1}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_bindir},%{_mandir}/man1}

-
-install whois.conf $RPM_BUILD_ROOT%{_sysconfdir}
-
-%{__make} install \
+%{__make} install install-pos \

        BASEDIR=$RPM_BUILD_ROOT \
        prefix=%{_prefix}
 
        BASEDIR=$RPM_BUILD_ROOT \
        prefix=%{_prefix}
 

+%{__cp} -p whois.conf $RPM_BUILD_ROOT%{_sysconfdir}
+

 %find_lang %{name}
 
 %clean
 %find_lang %{name}
 
 %clean


@@ -70,6 +77,9 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc README debian/changelog
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc README debian/changelog

-%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_bindir}/mkpwdhash
+%attr(755,root,root) %{_bindir}/whois

 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/whois.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/whois.conf

-%{_mandir}/man1/*
+%{_mandir}/man1/mkpwdhash.1*
+%{_mandir}/man1/whois.1*
+%{_mandir}/man5/whois.conf.5*