pghmcfc pushed to GeoIP (GeoIP-1.6.5-2.el5). "Work around for CentOS Bug#8488 for EPEL-5 build (..more)"

[notifications at fedoraproject.org]

>From 505cc6ffe752fd82a44a99d4b811d68f66bc685d Mon Sep 17 00:00:00 2001
From: Paul Howarth <paul at city-fan.org>
Date: Thu, 23 Apr 2015 16:32:09 +0100
Subject: Work around for CentOS Bug#8488 for EPEL-5 build

Work around problems with old GeoIP-data package in CentOS 5 Extras
repo (http://bugs.centos.org/view.php?id=8488) by requiring
GeoIP-GeoLite-data rather than the virtual GeoIP-data for EL-5 builds only

diff --git a/GeoIP.spec b/GeoIP.spec
index 74dd269..83d3ca5 100644
--- a/GeoIP.spec
+++ b/GeoIP.spec
@@ -6,7 +6,7 @@
 
 Name:		GeoIP
 Version:	1.6.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Library for country/city/organization to IP address or hostname mapping
 Group:		Development/Libraries
 License:	LGPLv2+
@@ -14,7 +14,17 @@ URL:		http://www.maxmind.com/app/c
 Source0:	https://github.com/maxmind/geoip-api-c/releases/download/v%{version}/GeoIP-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
 BuildRequires:	zlib-devel
+
+# CentOS Extras for EL-5 has GeoIP-data-20090201-1.el5.centos
+# and even an epoch bump in the GeoIP-data provide in GeoIP-GeoLite-data is
+# insufficient to persuade EL-5's yum to install it in preference to that old
+# package, so for EL-5 only, explicitly require GeoIP-GeoLite-data rather
+# than GeoIP-data (http://bugs.centos.org/view.php?id=8488)
+%if "%{?rhel}" == "5"
+Requires:	GeoIP-GeoLite-data
+%else
 Requires:	GeoIP-data
+%endif
 
 # For compatibility with original release of GeoIP in old distributions
 %if 0%{?fedora} < 22 && 0%{?rhel} < 8
@@ -97,6 +107,11 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/geoip.pc
 
 %changelog
+* Thu Apr 23 2015 Paul Howarth <paul at city-fan.org> - 1.6.5-2
+- Work around problems with old GeoIP-data package in CentOS 5 Extras
+  repo (http://bugs.centos.org/view.php?id=8488) by requiring
+  GeoIP-GeoLite-data rather than the virtual GeoIP-data for EL-5 builds only
+
 * Mon Mar  2 2015 Paul Howarth <paul at city-fan.org> - 1.6.5-1
 - Update to 1.6.5
   - Fixed a segmentation fault in geoiplookup when the utility was passed an
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/GeoIP.git/commit/?h=GeoIP-1.6.5-2.el5&id=505cc6ffe752fd82a44a99d4b811d68f66bc685d