diff --git a/ipcalc-0.2.5.tar.gz b/ipcalc-0.2.5.tar.gz deleted file mode 100644 index e84db5c..0000000 Binary files a/ipcalc-0.2.5.tar.gz and /dev/null differ diff --git a/ipcalc-0.4.1.tar.gz b/ipcalc-0.4.1.tar.gz new file mode 100644 index 0000000..e427a56 Binary files /dev/null and b/ipcalc-0.4.1.tar.gz differ diff --git a/ipcalc.spec b/ipcalc.spec index 5e4f7fa..4c71b97 100644 --- a/ipcalc.spec +++ b/ipcalc.spec @@ -1,5 +1,5 @@ Name: ipcalc -Version: 0.2.5 +Version: 0.4.1 Release: 1 Summary: IP network address calculator @@ -7,7 +7,7 @@ License: GPLv2+ URL: https://gitlab.com/ipcalc/%{name} Source0: %{url}/-/archive/%{version}/%{name}-%{version}.tar.gz -BuildRequires: gcc libmaxminddb-devel +BuildRequires: gcc libmaxminddb-devel meson %description ipcalc provides a simple way to calculate IP information for a host. @@ -21,18 +21,16 @@ be specified. Most operations also require a netmask or a CIDR prefix as well. %autosetup -n %{name}-%{version} -p1 %build -CFLAGS="${CFLAGS:-%optflags} $RPM_LD_FLAGS" \ - USE_RUNTIME_LINKING=yes USE_GEOIP=no USE_MAXMIND=yes LIBPATH=%{_libdir} -%make_build +%meson -Duse_maxminddb=enabled -Duse_runtime_linking=enabled +%meson_build %install -install -d %{buildroot}%{_bindir} -install -p -m 0755 ipcalc %{buildroot}%{_bindir}/ -install -d -m 0755 %{buildroot}%{_mandir}/man1 -install -p -m 0644 ipcalc.1 %{buildroot}%{_mandir}/man1 +%meson_install %check -make check +HOSTNAME=`cat /etc/hosts | grep 127.0.0.1 | head -1| awk '{print $2}'` +sed -i 's/localhost/'$HOSTNAME'/g' tests/ip-localhost-ipv4 +%meson_test %files %defattr(-,root,root) @@ -45,5 +43,8 @@ make check %{_mandir}/man1/* %changelog +* Sat Jul 25 2020 hanzhijun - 0.4.1-1 +- update 0.4.1 + * Fri Aug 30 2019 openEuler Buildteam - 0.2.5-1 - Package init