pghmcfc pushed to geoipupdate (epel7). "Version bump to 2.2.1 and install doc files in correct location (..more)"

[notifications at fedoraproject.org]

>From 13c4814fe440b0fda285aed37fb622dab9cb80bd Mon Sep 17 00:00:00 2001
From: "Philip A. Prindeville" <philipp at redfish-solutions.com>
Date: Wed, 4 Mar 2015 21:56:53 -0700
Subject: Version bump to 2.2.1 and install doc files in correct location

The fix for installing the doc files correctly has been submitted
upstream as https://github.com/maxmind/geoipupdate/pull/33. Also
moving 2.2.1 as it contains some important validations which
previously weren't done.

diff --git a/.gitignore b/.gitignore
index c6a9639..40015bc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /geoipupdate-2.1.0.tar.gz
+/geoipupdate-2.2.1.tar.gz
diff --git a/geoipupdate-2.1.0-docdir.patch b/geoipupdate-2.1.0-docdir.patch
new file mode 100644
index 0000000..15c8dac
--- /dev/null
+++ b/geoipupdate-2.1.0-docdir.patch
@@ -0,0 +1,20 @@
+diff --git a/Makefile.am b/Makefile.am
+index 668bd96..44e88b0 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -8,3 +8,5 @@ SUBDIRS =   \
+     man
+ 
+ EXTRA_DIST = ChangeLog.md LICENSE README.md bootstrap
++
++doc_DATA = ChangeLog.md README.md conf/GeoIP.conf.default
+diff --git a/conf/Makefile.am b/conf/Makefile.am
+index c55ec18..92e65ef 100644
+--- a/conf/Makefile.am
++++ b/conf/Makefile.am
+@@ -1,5 +1,3 @@
+-dist_sysconf_DATA = GeoIP.conf.default
+-
+ DEFAULT_CONFIG_FILE = $(sysconfdir)/GeoIP.conf
+ 
+ install-exec-hook:
diff --git a/geoipupdate.spec b/geoipupdate.spec
index f346da2..33e07e6 100644
--- a/geoipupdate.spec
+++ b/geoipupdate.spec
@@ -4,8 +4,8 @@
 %global _hardened_build 1
 
 Name:		geoipupdate
-Version:	2.1.0
-Release:	4%{?dist}
+Version:	2.2.1
+Release:	1%{?dist}
 Summary:	Update GeoIP2 and GeoIP Legacy binary databases from MaxMind
 Group:		Development/Tools
 License:	GPLv2
@@ -13,6 +13,7 @@ URL:		http://dev.maxmind.com/geoip/geoipupdate/
 Source0:	http://github.com/maxmind/geoipupdate/releases/download/v%{version}/geoipupdate-%{version}.tar.gz
 Source1:	geoipupdate.cron
 Source2:	geoipupdate6.cron
+Patch1:		geoipupdate-2.1.0-docdir.patch
 BuildRequires:	libcurl-devel
 BuildRequires:	zlib-devel
 # Perl modules used by IPv6 cron script
@@ -21,6 +22,7 @@ BuildRequires:	perl(File::Spec)
 BuildRequires:	perl(LWP::Simple)
 BuildRequires:	perl(PerlIO::gzip)
 BuildRequires:	perl(strict)
+BuildRequires:	automake, autoconf, libtool
 
 %description
 The GeoIP Update program performs automatic updates of GeoIP2 and GeoIP
@@ -57,12 +59,15 @@ Cron job for weekly updates to GeoIP IPv6 Legacy database from MaxMind.
 
 %prep
 %setup -q
+%patch1 -p1 -b .docdir
 
 %build
 %configure --disable-static --disable-dependency-tracking
 make %{?_smp_mflags}
 
 %install
+mkdir -p %{buildroot}%{_docdir}/%{name} %{buildroot}%{_sysconfdir}
+
 make install DESTDIR=%{buildroot}
 
 # fix up the config file to have geoipupdate fetch the free products by default
@@ -75,7 +80,7 @@ sed -i \
 install -D -m 755 %{SOURCE1} %{buildroot}%{_sysconfdir}/cron.weekly/geoipupdate
 install -D -m 755 %{SOURCE2} %{buildroot}%{_sysconfdir}/cron.weekly/geoipupdate6
 
-# Make the download directory for the IPv6 data cron job and soem ghost files
+# Make the download directory for the IPv6 data cron job and some ghost files
 mkdir -p %{buildroot}%{_datadir}/GeoIP/download/
 : > %{buildroot}%{_datadir}/GeoIP/download/GeoIPv6.dat.gz
 : > %{buildroot}%{_datadir}/GeoIP/download/GeoLiteCityv6.dat.gz
@@ -88,9 +93,8 @@ mkdir -p %{buildroot}%{_datadir}/GeoIP/download/
 # For now, see the LICENSE section in the README.md file below.
 
 %files
-%doc conf/GeoIP.conf.default README.md ChangeLog.md
+%doc conf/GeoIP.conf.default README.md ChangeLog.md LICENSE
 %config(noreplace) %{_sysconfdir}/GeoIP.conf
-%exclude %{_sysconfdir}/GeoIP.conf.default
 %{_bindir}/geoipupdate
 %{_mandir}/man1/geoipupdate.1*
 %{_mandir}/man5/GeoIP.conf.5*
@@ -107,6 +111,11 @@ mkdir -p %{buildroot}%{_datadir}/GeoIP/download/
 %ghost %{_datadir}/GeoIP/download/GeoIPASNumv6.dat.gz
 
 %changelog
+* Wed Mar  4 2015 Philip A. Prindeville <philipp at fedoraproject.org> - 2.2.1-1
+- Call out requirements for automake, autotools, libtool
+- Use interim fix for upstream issue #26 until it's accepted:
+	https://github.com/maxmind/geoipupdate/issues/26
+
 * Tue Feb 10 2015 Paul Howarth <paul at city-fan.org> - 2.1.0-4
 - New geoipupdate6 cron script written in Perl that doesn't download the data
   if it hasn't changed
diff --git a/sources b/sources
index 5321830..306a861 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9107d082f15c8e482f4b6f1080e7deaf  geoipupdate-2.1.0.tar.gz
+abfd4bb9dd7fd489c103888dde5f2a57  geoipupdate-2.2.1.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/geoipupdate.git/commit/?h=epel7&id=13c4814fe440b0fda285aed37fb622dab9cb80bd