From 8cf4478e8f59c19c9aba702e97048f57cae813e5 Mon Sep 17 00:00:00 2001
From: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: Tue, 8 Dec 2015 09:47:35 +0100
Subject: [PATCH] updated to ipcalc 0.1.6

---
 .gitignore                  |  1 +
 ipcalc-0.1.4-all-info.patch | 13 -------------
 ipcalc.spec                 | 11 +++++------
 sources                     |  2 +-
 4 files changed, 7 insertions(+), 20 deletions(-)
 delete mode 100644 ipcalc-0.1.4-all-info.patch

diff --git a/.gitignore b/.gitignore
index bd417b8..14118fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /0.1.2.tar.gz
 /ipcalc-0.1.3.tar.gz
 /ipcalc-0.1.4.tar.gz
+/ipcalc-0.1.6.tar.gz
diff --git a/ipcalc-0.1.4-all-info.patch b/ipcalc-0.1.4-all-info.patch
deleted file mode 100644
index f22414c..0000000
--- a/ipcalc-0.1.4-all-info.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/ipcalc.c b/ipcalc.c
-index 0fa9c24..1e503c3 100644
---- a/ipcalc.c
-+++ b/ipcalc.c
-@@ -1110,7 +1110,7 @@ int main(int argc, const char **argv)
- 	if (hostname)
- 		flags |= FLAG_RESOLVE_IP;
- 
--	if (geo_setup() == 0 && (flags & FLAG_SHOW_ALL_INFO))
-+	if (geo_setup() == 0 && ((flags & FLAG_SHOW_ALL_INFO) == FLAG_SHOW_ALL_INFO))
- 		flags |= FLAG_GET_GEOIP;
- 
- 	if (hostname && randomStr) {
diff --git a/ipcalc.spec b/ipcalc.spec
index c5849d5..77baeec 100644
--- a/ipcalc.spec
+++ b/ipcalc.spec
@@ -1,6 +1,6 @@
 Name: ipcalc
-Version: 0.1.4
-Release: 2%{?dist}
+Version: 0.1.6
+Release: 1%{?dist}
 Summary: IP network address calculator
 
 # This is an updated version of ipcalc originally found
@@ -10,10 +10,8 @@ Summary: IP network address calculator
 License: GPLv2+
 URL: https://github.com/nmav/ipcalc
 Source0: https://github.com/nmav/ipcalc/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
-Patch0: ipcalc-0.1.4-all-info.patch
 
 BuildRequires: GeoIP-devel
-BuildRequires: popt-devel
 Recommends:    GeoIP
 
 # Explicitly conflict with older initscript packages that ship ipcalc
@@ -32,8 +30,6 @@ or check the validity of an address.
 %prep
 %setup -q
 
-%patch0 -p1 -b .all-info
-
 %build
 CFLAGS="${CFLAGS:-%optflags}" LIBPATH=%{_libdir} make %{?_smp_mflags}
 
@@ -54,6 +50,9 @@ make check
 %{_mandir}/man1/ipcalc.1*
 
 %changelog
+* Tue Dec  8 2015 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.1.6-1
+- New upstream release
+
 * Wed Oct 14 2015 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.1.4-2
 - Corrected issue on --all-info
 
diff --git a/sources b/sources
index c8c1385..91a8989 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-981e77d863ca82261e6eb394462ab2b9  ipcalc-0.1.4.tar.gz
+e7f2a63eb12699005b423d95a870d5d1  ipcalc-0.1.6.tar.gz