From 7a3cf97a136db61f1b9b962b1f61c6387d10b1a9 Mon Sep 17 00:00:00 2001
From: Thomas Moschny <thm@fedoraproject.org>
Date: Jul 16 2018 11:32:31 +0000
Subject: Merge branch 'master' into el6


---

diff --git a/etckeeper.spec b/etckeeper.spec
index 23542af..1385897 100644
--- a/etckeeper.spec
+++ b/etckeeper.spec
@@ -16,12 +16,12 @@
 %endif
 
 Name:      etckeeper
-Version:   1.18.7
-Release:   3%{?dist}
+Version:   1.18.8
+Release:   1%{?dist}
 Summary:   Store /etc in a SCM system (git, mercurial, bzr or darcs)
 License:   GPLv2+
-URL:       http://etckeeper.branchable.com/
-Source0:   http://ftp.debian.org/debian/pool/main/e/%{name}/%{name}_%{version}.orig.tar.gz
+URL:       https://etckeeper.branchable.com/
+Source0:   https://git.joeyh.name/index.cgi/etckeeper.git/snapshot/%{name}-%{version}.tar.gz
 Source1:   README.fedora
 Patch0:    etckeeper-makefile-remove-python-plugins.patch
 Patch1:    etckeeper-1.18.7-fix-rpm-ignores.patch
@@ -277,6 +277,16 @@ fi
 
 
 %changelog
+* Mon Jul 16 2018 Thomas Moschny <thomas.moschny@gmx.de> - 1.18.8-1
+- Update to 1.18.8.
+- Update URL: and Source: tags.
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.18.7-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 1.18.7-4
+- Rebuilt for Python 3.7
+
 * Mon May 14 2018 Thomas Moschny <thomas.moschny@gmx.de> - 1.18.7-3
 - Use correct Requires: for the hostname cmd on EPEL6.
 
diff --git a/sources b/sources
index 931f475..4e05080 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (etckeeper_1.18.7.orig.tar.gz) = 44b8f66b95663da1370943128bb5673e57bd7b9df7e727c93baea5dfc79852ebba9d0834827fed19722668849d3ed18b045db5cb42135e198576a2b839523d1a
+SHA512 (etckeeper-1.18.8.tar.gz) = 35607622d7533d9acb28af2320a571b66ac5a5e2dd44703ec542e0a95622b11a7709134f26d6dba6741b99247c00481172c2601109dc501630f02c25530a516c