fix [BTS:0002990]

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@10810 ec354946-7b23-47d6-9f5a-488ba84defc7

j/jwhois/jwhois-vl.spec

@@ -2,7 +2,7 @@ Summary: Internet whois/nicname client.
 Summary(ja): whois クライアント
 Name: jwhois
 Version: 4.0
-Release: 5%{?_dist_release}
+Release: 7%{?_dist_release}
 
 License: GPLv3
 Group: Applications/Internet
@@ -12,19 +12,23 @@ Source: ftp://ftp.gnu.org/gnu/jwhois/jwhois-%{version}.tar.gz
 Source1: ftp://ftp.gnu.org/gnu/jwhois/jwhois-%{version}.tar.gz.sig
 
 # newest jwhois.conf can be obtained from:
-# http://savannah.gnu.org/cgi-bin/viewcvs/jwhois/jwhois/example/jwhois.conf
-# revision: 1.143
-Source10: jwhois-r1.143.conf
+# https://github.com/jodrell/jwhois/tree/master/example
+# revision: cdad436 (28 Jun 2014)
+Source10: jwhois.conf
+# # http://savannah.gnu.org/cgi-bin/viewcvs/jwhois/jwhois/example/jwhois.conf
+# # revision: 1.143
+# Source10: jwhois-r1.143.conf
 
 Patch0: jwhois-4.0-connect.patch
 Patch1: jwhois-4.0-ipv6match.patch
 Patch2: jwhois-4.0-fclose.patch
 Patch3: jwhois-4.0-select.patch
-Patch4: jwhois-4.0-conf-update.patch
+# Patch4: jwhois-4.0-conf-update.patch
 Patch5: jwhois-4.0-multi-homed.patch
 Patch6: jwhois-4.0-libidn2.patch
 Patch7: jwhois-4.0-idna.patch
 Patch8: jwhois-4.0-idnfail.patch
+Patch9: jwhois-4.0-conf-update-newgTLD.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: libidn-devel
@@ -41,23 +45,27 @@ A whois client that accepts both traditional and finger-style queries.
 
 %prep
 %setup -q
+%{__cp} %{SOURCE10} example/
+
 %patch0 -p1 -b .connect
 %patch1 -p1 -b .ipv6match
 %patch2 -p1 -b .fclose
 %patch3 -p1 -b .select
-%patch4 -p1 -b .conf-update
+# %patch4 -p1 -b .conf-update
 %patch5 -p1 -b .multi-homed
 %patch6 -p1 -b .libidn2
 %patch7 -p1 -b .idna
 %patch8 -p1 -b .idnfail
+# add several new gTLD
+# http://fukumoto-tech.serveblog.net/wiki/index.php?%BF%B7gTLD%A4%CEwhois%20%A5%B5%A1%BC%A5%D0%C5%D0%CF%BF%C6%E2%CD%C6%A4%CB%A4%C4%A4%A4%A4%C6
+%patch9 -b .conf-update-newgTLD
 
 iconv -f iso-8859-1 -t utf-8 < doc/sv/jwhois.1 > doc/sv/jwhois.1_
 mv doc/sv/jwhois.1_ doc/sv/jwhois.1
 
 %build
 %configure --without-cache
-make
-
+make %{?_smp_mflags}
 
 %install
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -fr $RPM_BUILD_ROOT
@@ -73,7 +81,7 @@ ln -sf jwhois $RPM_BUILD_ROOT/%{_bindir}/whois
 echo .so man1/jwhois.1 > $RPM_BUILD_ROOT/%{_mandir}/man1/whois.1
 
 # install newest jwhois.conf
-#install -m 644 %{SOURCE10} ${RPM_BUILD_ROOT}/etc/jwhois.conf
+# install -m 644 %{SOURCE10} ${RPM_BUILD_ROOT}/etc/jwhois.conf
 
 
 %files -f %{name}.lang
@@ -85,7 +93,6 @@ echo .so man1/jwhois.1 > $RPM_BUILD_ROOT/%{_mandir}/man1/whois.1
 %{_infodir}/jwhois.info.gz
 %config(noreplace) %{_sysconfdir}/jwhois.conf
 
-
 %post
 /sbin/install-info %{_infodir}/jwhois.info.gz %{_infodir}/dir
 
@@ -99,6 +106,14 @@ fi
 
 
 %changelog
+* Sat Nov 12 2016 Toshiaki Ara <ara_t@384.jp> 4.0-7
+- update jwhois.conf from GitHub head
+- add several new gTLD
+
+* Sun Feb 28 2016 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 4.0-6
+- rebuilt current env
+- use smp flage in make section
+
 * Thu Jul  9 2015 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.0-5
 - import patches from rawhide.