pghmcfc pushed to GeoIP (el5). "Only require geoipupdate prior to F-22, for back-compatibility (..more)"

[notifications at fedoraproject.org]

>From 21ed6a0ec8997475da1e5ad31143871ec926670e Mon Sep 17 00:00:00 2001
From: Paul Howarth <paul at city-fan.org>
Date: Fri, 6 Feb 2015 19:40:59 +0000
Subject: Only require geoipupdate prior to F-22, for back-compatibility

- Only require geoipupdate prior to F-22, for back-compatibility
- Use %license where possible
- GeoIP-devel provides geoip-devel as well as obsoleting it
- Update bundled databases

diff --git a/.gitignore b/.gitignore
index 78efd8d..466552b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,10 +2,10 @@
 /GeoIP-1.4.8.tar.gz
 /GeoIP-1.5.0.tar.gz
 /GeoIP-1.5.1.tar.gz
+/GeoIP-1.6.4.tar.gz
 /GeoIP.dat.gz
 /GeoIPASNum.dat.gz
 /GeoIPASNumv6.dat.gz
 /GeoIPv6.dat.gz
 /GeoLiteCity.dat.gz
 /GeoLiteCityv6.dat.gz
-/GeoIP-1.6.4.tar.gz
diff --git a/GeoIP.spec b/GeoIP.spec
index 626f9f8..eda0dd4 100644
--- a/GeoIP.spec
+++ b/GeoIP.spec
@@ -6,7 +6,7 @@
 
 Name:		GeoIP
 Version:	1.6.4
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Library for country/city/organization to IP address or hostname mapping
 Group:		Development/Libraries
 License:	LGPLv2+ and CC-BY-SA
@@ -23,7 +23,13 @@ Source14:	http://download.maxmind.com/download/geoip/database/asnum/GeoIPASNum.d
 Source15:	http://download.maxmind.com/download/geoip/database/asnum/GeoIPASNumv6.dat.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
 BuildRequires:	zlib-devel
+
+# For compatibility with original release of GeoIP in old distributions
+%if 0%{?fedora} < 22 && 0%{?rhel} < 8
 Requires:	geoipupdate
+%endif
+
+# Old names of GeoIP library and data packages
 Obsoletes:	geoip < %{version}-%{release}
 Provides:	geoip = %{version}-%{release}
 Obsoletes:	geoip-geolite < 2013.04-2
@@ -43,6 +49,7 @@ http://www.maxmind.com/
 Summary:	Development headers and libraries for GeoIP
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
+Provides:	geoip-devel = %{version}-%{release}
 Obsoletes:	geoip-devel < %{version}-%{release}
 
 %description devel
@@ -82,14 +89,13 @@ make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
-make DESTDIR=%{buildroot} INSTALL="install -p" install install-am
+make DESTDIR=%{buildroot} INSTALL="install -p" install
 
 # nix the stuff we don't need like .la files.
 rm -f %{buildroot}%{_libdir}/*.la
 
-mkdir %{buildroot}%{_datadir}/GeoIP/
-
 # install GeoLite databases
+mkdir %{buildroot}%{_datadir}/GeoIP/
 for db in \
 	GeoLiteCountry.dat \
 	GeoIPv6.dat \
@@ -101,8 +107,6 @@ do
 	install -p -m 644 data/$db %{buildroot}%{_datadir}/GeoIP/
 done
 
-%{__mkdir_p} %{buildroot}%{_libexecdir}
-
 # make the default GeoIP.dat a symlink to GeoLiteCountry.dat,
 # since it's actually an old snapshot of that database
 ln -sf GeoLiteCountry.dat %{buildroot}%{_datadir}/GeoIP/GeoIP.dat
@@ -124,7 +128,12 @@ rm -rf %{buildroot}
 
 %files
 # LGPLv2+
-%doc AUTHORS COPYING ChangeLog fetch-*
+%if 0%{?_licensedir:1}
+%license COPYING
+%else
+%doc COPYING
+%endif
+%doc AUTHORS ChangeLog NEWS.md README.md fetch-*
 %{_bindir}/geoiplookup
 %{_bindir}/geoiplookup6
 %{_libdir}/libGeoIP.so.1
@@ -155,6 +164,12 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/geoip.pc
 
 %changelog
+* Fri Feb  6 2015 Paul Howarth <paul at city-fan.org> - 1.6.4-2
+- Only require geoipupdate prior to F-22, for back-compatibility
+- Use %%license where possible
+- GeoIP-devel provides geoip-devel as well as obsoleting it
+- Update bundled databases
+
 * Thu Jan 29 2015 Philip Prindeville <philipp at fedoraproject.org> - 1.6.4-1
 - Require geoipupdate per Paul
 
diff --git a/sources b/sources
index bfd12c3..cc654b9 100644
--- a/sources
+++ b/sources
@@ -1,7 +1,7 @@
 c9f4f97fcf310b40faa0f900fac14630  GeoIP-1.6.4.tar.gz
-07e7c99c305c0607cf71f68019aa5a59  GeoIPASNum.dat.gz
-55af75660db5db2f94effcbdc1b7fed9  GeoIPASNumv6.dat.gz
-a551a8f2044c3e6e364c1aa82fe183b3  GeoIP.dat.gz
-c635ff5a0ec3afb83b7c291b17323174  GeoIPv6.dat.gz
-5a595f80ce459527a73a2aa61aa5221f  GeoLiteCity.dat.gz
-61dfc4c65e6433a2402b25e43347594e  GeoLiteCityv6.dat.gz
+f8ed8b468ecee0f7a98cb05c33af7b14  GeoIPASNum.dat.gz
+621a358853e0cb550a27e8c25d948d6d  GeoIPASNumv6.dat.gz
+4bc1e8280fe2db0adc3fe48663b8926e  GeoIP.dat.gz
+aac7e6e9b141de80934ecee52daf7f56  GeoIPv6.dat.gz
+15a42c684c53d2309e6632a6d6e02531  GeoLiteCity.dat.gz
+49d6ec946fa0a2575b5112a68d71f933  GeoLiteCityv6.dat.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/GeoIP.git/commit/?h=el5&id=21ed6a0ec8997475da1e5ad31143871ec926670e