5.0.18 bump

.gitignore

@@ -5,3 +5,4 @@
 /whois_5.0.15.tar.xz
 /whois_5.0.16.tar.xz
 /whois_5.0.17.tar.xz
+/whois_5.0.18.tar.xz

sources

@@ -1 +1 @@
-754ff9a089913bf198400eb937e24055  whois_5.0.17.tar.xz
+15d777273d44a5b9a0814c1ea0d22b1a  whois_5.0.18.tar.xz

whois-5.0.17-.xn-mgbaam7a8-is-handled-by-whois.aeda.net.ae.patch

@@ -1,26 +0,0 @@
-From 118dcc85d02a46e7d3d1a2a3c45e8f34664c7f08 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
-Date: Fri, 13 Jul 2012 09:13:15 +0200
-Subject: [PATCH] .xn--mgbaam7a8 is handled by whois.aeda.net.ae
-
-<http://www.iana.org/domains/root/db/xn--mgbaam7a8h.html>
----
- tld_serv_list |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/tld_serv_list b/tld_serv_list
-index 8c1dfdd..2196b78 100644
---- a/tld_serv_list
-+++ b/tld_serv_list
-@@ -357,7 +357,7 @@
- .xn--kpry57d		whois.twnic.net.tw	# Taiwan, Traditional Chinese
- .xn--lgbbat1ad8j	whois.nic.dz		# Algeria
- .xn--mgba3a4f16a	whois.nic.ir		# Iran
--.xn--mgbaam7a8h		whois.aeda.ae		# United Arab Emirates
-+.xn--mgbaam7a8h		whois.aeda.net.ae	# United Arab Emirates
- .xn--mgbayh7gpa		WEB http://idn.jo/whois_a.aspx	# Jordan
- .xn--mgbbh1a71e		whois.registry.in	# India, Urdu AW
- #.xn--mgbc0a9azcg	whois.iam.net.ma	# Morocco
--- 
-1.7.7.6
-

whois-5.0.17-Document-how-to-write-IDN-in-whois.conf.patch

@@ -1,43 +0,0 @@
-From cbe52c7364341f916bbc975e193a6484cebbce49 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
-Date: Fri, 13 Jul 2012 09:33:16 +0200
-Subject: [PATCH] Document how to write IDN in whois.conf
-
-The whois.conf parser cannot handle IDN names. Putting the regular
-expressions using ACE notation works.
----
- whois.1    |    3 ++-
- whois.conf |    3 ++-
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/whois.1 b/whois.1
-index ec5f86b..ba80b93 100644
---- a/whois.1
-+++ b/whois.1
-@@ -80,7 +80,8 @@ separator (which marks the beginning of the query string).
- If the \fI/etc/whois.conf\fR config file exists, it will be consulted
- to find a server before applying the normal rules. Each line of the
- file should contain a regular expression to be matched against the query
--text and the whois server to use, separated by white space.
-+text and the whois server to use, separated by white space. IDN names
-+have to be noted in ACE format. 
- .P
- The whois protocol does not specify an encoding for characters which
- cannot be represented by ASCII and implementations vary wildly.
-diff --git a/whois.conf b/whois.conf
-index 8eada18..33ef7c6 100644
---- a/whois.conf
-+++ b/whois.conf
-@@ -3,7 +3,8 @@
- # This file can contain details of alternative whois servers to use if
- # the compiled in servers are not suitable.  Each entry is a single
- # text line and consists of a regular expression pattern to match and
--# the whois server to be used for it, separated by blank space. 
-+# the whois server to be used for it, separated by blank space.  IDN names
-+# have to be noted in ACE format. 
- #
- # Eg: 
- # \.nz$ nz.whois-servers.net
--- 
-1.7.7.6
-

whois.spec

@@ -1,16 +1,12 @@
 Name:       whois       
-Version:    5.0.17
-Release:    3%{?dist}
+Version:    5.0.18
+Release:    1%{?dist}
 Summary:    Improved WHOIS client
 
 Group:      Applications/Internet
 License:    GPLv2+
 URL:        http://www.linux.it/~md/software/
 Source0:    http://ftp.debian.org/debian/pool/main/w/%{name}/%{name}_%{version}.tar.xz
-# Update xn-mgbaam7a8 TLD, bug #839893, submitted to upstream
-Patch0:     whois-5.0.17-.xn-mgbaam7a8-is-handled-by-whois.aeda.net.ae.patch
-# Document IDN in configuration file, bug #839898, submitted to upstream
-Patch1:     whois-5.0.17-Document-how-to-write-IDN-in-whois.conf.patch
 
 BuildRequires:  gettext, libidn-devel, perl
 Requires(post): %{_sbindir}/update-alternatives
@@ -32,8 +28,6 @@ addresses and network names.
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1 -b .xn-mgbaam7a8
-%patch1 -p1 -b .idnconf
 # Enable NLS
 sed -i -e 's:#\(.*pos\):\1:' Makefile
 
@@ -81,6 +75,9 @@ fi
 
 
 %changelog
+* Thu Aug 02 2012 Petr Pisar <ppisar@redhat.com> - 5.0.18-1
+- 5.0.18 bump
+
 * Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.0.17-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild