From b8a7452b06eae9c674756d3a154ba81749096143 Mon Sep 17 00:00:00 2001
From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Sat, 23 Nov 2019 06:38:18 +0100
Subject: [PATCH] updated to 0.3.0

---
 .gitignore  |  1 +
 ipcalc.spec | 20 ++++++++++----------
 sources     |  2 +-
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index f655b65..74cb090 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@
 /ipcalc-0.2.3.tar.gz
 /ipcalc-0.2.4.tar.gz
 /ipcalc-0.2.5.tar.gz
+/ipcalc-0.3.0.tar.gz
diff --git a/ipcalc.spec b/ipcalc.spec
index d3489fd..391eeb1 100644
--- a/ipcalc.spec
+++ b/ipcalc.spec
@@ -1,6 +1,6 @@
 Name: ipcalc
-Version: 0.2.5
-Release: 3%{?dist}
+Version: 0.3.0
+Release: 1%{?dist}
 Summary: IP network address calculator
 
 # This is an updated version of ipcalc originally found
@@ -11,7 +11,7 @@ License: GPLv2+
 URL: https://gitlab.com/ipcalc/ipcalc
 Source0: https://gitlab.com/ipcalc/ipcalc/-/archive/%{version}/ipcalc-%{version}.tar.gz
 
-BuildRequires: gcc, libmaxminddb-devel
+BuildRequires: gcc, libmaxminddb-devel, meson
 Recommends:    libmaxminddb, geolite2-city, geolite2-country
 
 # Explicitly conflict with older initscript packages that ship ipcalc
@@ -31,17 +31,14 @@ or check the validity of an address.
 %autosetup
 
 %build
-CFLAGS="${CFLAGS:-%optflags} $RPM_LD_FLAGS" \
-  USE_RUNTIME_LINKING=yes USE_GEOIP=no USE_MAXMIND=yes LIBPATH=%{_libdir} make %{?_smp_mflags}
+%meson -Duse_maxminddb=enabled -Duse_runtime_linking=enabled
+%meson_build
 
 %install
-mkdir -p %{buildroot}%{_bindir}
-install -p -m 755 ipcalc %{buildroot}%{_bindir}/
-mkdir -p -m 755 %{buildroot}%{_mandir}/man1
-install -p -m 644 ipcalc.1 %{buildroot}%{_mandir}/man1
+%meson_install
 
 %check
-make check
+%meson_test
 
 %files
 
@@ -51,6 +48,9 @@ make check
 %{_mandir}/man1/ipcalc.1*
 
 %changelog
+* Sat Nov 23 2019 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.3.0-1
+- Updated to 0.3.0
+
 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
diff --git a/sources b/sources
index a865284..5df16d0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ipcalc-0.2.5.tar.gz) = c49fe63e3aa58f75a3cd8c02c424da853af1442659e92aafd069d7ea808fd545523c3b39b42a03096e4c065b08a306026e870e78ffd1cd47522e4d6cb1935b55
+SHA512 (ipcalc-0.3.0.tar.gz) = e74f5273d495bd13aafd433047bab398f3c39edfd1a7bbf2bc3a6bd9032fb2ca8cb930adfb2246e91a943bb33a68e7c77663b8679bc549cc55c877b8b31b8600