pghmcfc pushed to geoipupdate (el5). "Revise obsoletes/provides (..more)"

[notifications at fedoraproject.org]

>From ca6c41f85ee1dc68af91b32e1aec66340fd927ba Mon Sep 17 00:00:00 2001
From: Paul Howarth <paul at city-fan.org>
Date: Fri, 6 Feb 2015 19:56:47 +0000
Subject: Revise obsoletes/provides

- Revise obsoletes/provides
- Add cron6 subpackage, equivalent to old GeoIP-update6 package

diff --git a/geoipupdate.spec b/geoipupdate.spec
index 4a97776..c8fd442 100644
--- a/geoipupdate.spec
+++ b/geoipupdate.spec
@@ -5,59 +5,70 @@
 
 Name:		geoipupdate
 Version:	2.1.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Update GeoIP2 and GeoIP Legacy binary databases from MaxMind
-
 Group:		Development/Tools
 License:	GPLv2
 URL:		http://dev.maxmind.com/geoip/geoipupdate/
 Source0:	http://github.com/maxmind/geoipupdate/releases/download/v%{version}/geoipupdate-%{version}.tar.gz
 Source1:	geoipupdate.cron
-
-BuildRequires:	zlib-devel, libcurl-devel
+Source2:	geoipupdate6.cron
+BuildRequires:	libcurl-devel
+BuildRequires:	zlib-devel
 
 %description
 The GeoIP Update program performs automatic updates of GeoIP2 and GeoIP
 Legacy binary databases.
 
-
 %package cron
 Summary:	Cron job to do weekly updates of GeoIP databases
 Group:		Development/Tools
 %if %{noarch_subpkgs}
 BuildArch:	noarch
 %endif
-Requires:	%{name} = %{version}-%{release}, crontabs
-Provides:	GeoIP-cron = 1.6.0
-Obsoletes:	GeoIP-cron < 1.6.0
+Requires:	%{name} = %{version}-%{release}
+Requires:	crontabs
+Obsoletes:	GeoIP-update < 1.6.0
+Provides:	GeoIP-update = 1.6.0
 
 %description cron
 Cron job for weekly updates to GeoIP2 and GeoIP Legacy database from MaxMind.
 
+%package cron6
+Summary:	Cron job to do weekly updates of GeoIP IPv6 databases
+Group:		Development/Tools
+%if %{noarch_subpkgs}
+BuildArch:	noarch
+%endif
+Requires:	%{name} = %{version}-%{release}
+Requires:	crontabs
+Requires:	wget
+Obsoletes:	GeoIP-update6 < 1.6.0
+Provides:	GeoIP-update6 = 1.6.0
+
+%description cron6
+Cron job for weekly updates to GeoIP2 and GeoIP IPv6 Legacy database from
+MaxMind.
+
 %prep
 %setup -q
 
-
 %build
 %configure --disable-static --disable-dependency-tracking
 make %{?_smp_mflags}
 
-
 %install
-rm -rf %{buildroot}
-%make_install
-
-%{__mkdir_p} %{buildroot}%{_docdir}/%{name}
+make install DESTDIR=%{buildroot}
 
 # fix up the config file to have geoipupdate fetch the free products by default
-%{__sed} -i \
+sed -i \
 	-e 's/YOUR_USER_ID_HERE$/999999/' \
 	-e 's/YOUR_LICENSE_KEY_HERE$/000000000000/' \
 	-e 's/^\(ProductIds\) .*$/\1 506 517 533/' \
 	%{buildroot}%{_sysconfdir}/GeoIP.conf
 
 install -D -m 755 %{SOURCE1} %{buildroot}%{_sysconfdir}/cron.weekly/geoipupdate
-
+install -D -m 755 %{SOURCE2} %{buildroot}%{_sysconfdir}/cron.weekly/geoipupdate6
 
 # LICENSE file is being omitted from release tarball. As soon as this issue:
 #   https://github.com/maxmind/geoipupdate/issues/25
@@ -70,17 +81,22 @@ install -D -m 755 %{SOURCE1} %{buildroot}%{_sysconfdir}/cron.weekly/geoipupdate
 %config(noreplace) %{_sysconfdir}/GeoIP.conf
 %exclude %{_sysconfdir}/GeoIP.conf.default
 %{_bindir}/geoipupdate
-%{_mandir}/man1/geoipupdate.1.*
-%{_mandir}/man5/GeoIP.conf.5.*
+%{_mandir}/man1/geoipupdate.1*
+%{_mandir}/man5/GeoIP.conf.5*
 
 %files cron
 %config(noreplace) %{_sysconfdir}/cron.weekly/geoipupdate
 
+%files cron6
+%config(noreplace) %{_sysconfdir}/cron.weekly/geoipupdate6
 
 %changelog
+* Fri Feb  6 2015 Paul Howarth <paul at city-fan.org> - 2.1.0-3
+- Add cron6 subpackage, equivalent to old GeoIP-update6 package
+- Revise obsoletes/provides
+
 * Sun Feb  1 2015 Philip A. Prindeville <philipp at fedoraproject.org> - 2.1.0-2
-- Remove architecture-specific dependency in noarch subpackage.
+- Remove architecture-specific dependency in noarch subpackage
 
 * Mon Jan 26 2015 Philip A. Prindeville <philipp at fedoraproject.org> - 2.1.0-1
-- Initial review package (generated by rpmdev-newspec).
-
+- Initial review package (generated by rpmdev-newspec)
diff --git a/geoipupdate6.cron b/geoipupdate6.cron
new file mode 100644
index 0000000..4273968
--- /dev/null
+++ b/geoipupdate6.cron
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+# Update IPv6 free databases
+
+# It would be much better if we could use geoipupdate for this as it only
+# downloads the data if it has changed and checks it after download
+
+DB_LOC=http://geolite.maxmind.com/download/geoip/database
+ASDB_LOC=http://download.maxmind.com/download/geoip/database/asnum
+
+cd /usr/share/GeoIP
+
+# IPv6 Country database
+wget --quiet $DB_LOC/GeoIPv6.dat.gz && mv -f GeoIPv6.dat GeoIPv6.dat.old && gunzip GeoIPv6.dat
+
+# IPv6 City database
+wget --quiet $DB_LOC/GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz && mv -f GeoLiteCityv6.dat GeoLiteCityv6.dat.old && gunzip GeoLiteCityv6.dat
+
+# IPv6 AS Number database
+wget --quiet $ASDB_LOC/GeoIPASNumv6.dat.gz && mv -f GeoIPASNumv6.dat GeoIPASNumv6.dat.old && gunzip GeoIPASNumv6.dat
-- 
cgit v0.10.2


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