updated to ipcalc 0.1.6
This commit is contained in:
parent
332725f9b7
commit
8cf4478e8f
1
.gitignore
vendored
1
.gitignore
vendored
@ -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
|
||||
|
||||
@ -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) {
|
||||
11
ipcalc.spec
11
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
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user