pghmcfc pushed to GeoIP (el5). "Sub-package the data (..more)"

[notifications at fedoraproject.org]

>From bc29cf717c1c9bfb1158cffc54ebbfb72cec24d1 Mon Sep 17 00:00:00 2001
From: Paul Howarth <paul at city-fan.org>
Date: Tue, 10 Feb 2015 12:30:13 +0000
Subject: Sub-package the data

Sub-package the data; going forward, this would be better as a separate
package, since it has separate upstream releases than the library

diff --git a/GeoIP.spec b/GeoIP.spec
index eda0dd4..65a7851 100644
--- a/GeoIP.spec
+++ b/GeoIP.spec
@@ -6,10 +6,10 @@
 
 Name:		GeoIP
 Version:	1.6.4
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Library for country/city/organization to IP address or hostname mapping
 Group:		Development/Libraries
-License:	LGPLv2+ and CC-BY-SA
+License:	LGPLv2+
 URL:		http://www.maxmind.com/app/c
 Source0:	https://github.com/maxmind/geoip-api-c/releases/download/v%{version}/GeoIP-%{version}.tar.gz
 Source2:	fetch-geoipdata-city.pl
@@ -23,6 +23,7 @@ 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
+Requires:	GeoIP-data
 
 # For compatibility with original release of GeoIP in old distributions
 %if 0%{?fedora} < 22 && 0%{?rhel} < 8
@@ -40,8 +41,18 @@ GeoIP is a C library that enables the user to find the country that any IP
 address or hostname originates from.
 
 It uses file based databases that can optionally be updated on a weekly basis
-by installing the GeoIP-update (IPv4) and/or GeoIP-update6 (IPv6) packages.
+by installing the geoipupdate-cron (IPv4) and/or geoipupdate-cron6 (IPv6)
+packages.
 
+%package data
+Summary:	Free GeoLite data for GeoIP
+Group:		Development/Libraries
+License:	CC-BY-SA
+%if %{noarch_subpkgs}
+BuildArch:	noarch
+%endif
+
+%description data
 This package includes GeoLite data created by MaxMind, available from
 http://www.maxmind.com/
 
@@ -127,7 +138,6 @@ rm -rf %{buildroot}
 %postun -p /sbin/ldconfig
 
 %files
-# LGPLv2+
 %if 0%{?_licensedir:1}
 %license COPYING
 %else
@@ -140,7 +150,8 @@ rm -rf %{buildroot}
 %{_libdir}/libGeoIP.so.1.*
 %{_mandir}/man1/geoiplookup.1*
 %{_mandir}/man1/geoiplookup6.1*
-# CC-BY-SA
+
+%files data
 %dir %{_datadir}/GeoIP/
 # This is %%config(noreplace) so that it can be replaced by a commercial database if desired by the end user
 %config(noreplace) %{_datadir}/GeoIP/GeoIP.dat
@@ -157,13 +168,16 @@ rm -rf %{buildroot}
 %{_datadir}/GeoIP/GeoLiteASNumv6.dat
 
 %files devel
-# LGPLv2+
 %{_includedir}/GeoIP.h
 %{_includedir}/GeoIPCity.h
 %{_libdir}/libGeoIP.so
 %{_libdir}/pkgconfig/geoip.pc
 
 %changelog
+* Tue Feb 10 2015 Paul Howarth <paul at city-fan.org> - 1.6.4-3
+- Sub-package the data; going forward, this would be better as a separate
+  package, since it has separate upstream releases than the library
+
 * 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
diff --git a/sources b/sources
index cc654b9..7923adc 100644
--- a/sources
+++ b/sources
@@ -1,7 +1,7 @@
 c9f4f97fcf310b40faa0f900fac14630  GeoIP-1.6.4.tar.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
+508e3c10da15f2722774cf4014863976  GeoIP.dat.gz
+3dde07e1b2f5d21c2362ee92b9f103c1  GeoIPv6.dat.gz
+2ec4a73cd879adddf916df479f3581c7  GeoLiteCity.dat.gz
+ca64d35383892b3e7f52888d9e73ee50  GeoLiteCityv6.dat.gz
-- 
cgit v0.10.2


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