From d7cf6da26f477054ef54c7c606f046a9a72d2801 Mon Sep 17 00:00:00 2001 From: Peter Bieringer Date: Sep 24 2020 13:04:07 +0000 Subject: Merge branch 'master' into f33 --- diff --git a/IP2Location.spec b/IP2Location.spec index 4f1edb5..4126d1c 100644 --- a/IP2Location.spec +++ b/IP2Location.spec @@ -12,7 +12,7 @@ Name: IP2Location Summary: C library for mapping IP address to geolocation information Version: %{version} -Release: 9%{?gittag}%{?dist} +Release: 10%{?gittag}%{?dist} License: MIT URL: http://www.ip2location.com/ %if 0%{?gitcommit:1} @@ -24,6 +24,12 @@ Patch1: IP2Location-8.0.9-rpmlint.patch %endif BuildRequires: libtool BuildRequires: perl(Math::BigInt) +BuildRequires: gcc +BuildRequires: autoconf +BuildRequires: automake + +Obsoletes: libip2location < %{version} +Provides: libip2location = %{version} %description @@ -43,6 +49,10 @@ Summary: Static library and header files for the IP2Location library Requires: %{name} = %{version}-%{release} Provides: %{name}-devel = %{version}-%{release} +Obsoletes: libip2location-devel < %{version} +Provides: libip2location-devel = %{version} + + %description devel IP2Location C library enables the user to get the country, region, city, coordinates, ZIP code, time zone, ISP, domain name, connection type, @@ -58,6 +68,10 @@ This package contains the development files for the IP2Location library. Summary: Sample data files for the IP2Location library Requires: %{name} = %{version}-%{release} +Obsoletes: ip2location-country < %{version} +Provides: ip2location-country = %{version} + + %description data-sample IP2Location C library enables the user to get the country, region, city, coordinates, ZIP code, time zone, ISP, domain name, connection type, @@ -147,6 +161,9 @@ install -p data/IPV6-COUNTRY.BIN %{buildroot}%{_datadir}/%{name}/IPV6-COUNTRY.SA %changelog +* Thu Sep 24 2020 Peter Bieringer - 8.0.9-10 +- add additional Obsoletes/Provides/BuildRequires + * Tue Sep 15 2020 Peter Bieringer - 8.0.9-8 - subpackage data-sample: add suffix "SAMPLE" to included BIN files, fix file permissions - use latest sources, git commit 6e49424dfc998856fa790df498bf77520e72ca28