From 9c57b1fe005df542854efb89ff7ed2701892dc5a Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Mon, 2 Dec 2019 09:55:00 +0100 Subject: [PATCH 1/2] Avoid failing %autosetup on EPEL6. --- etckeeper.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/etckeeper.spec b/etckeeper.spec index f73ccd4..56357d1 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -132,7 +132,12 @@ etckeeper with DNF, install this package. %prep -%autosetup -p1 +%setup -q +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 %if 0%{?with_yum} # we set yum here, so the yum plugin gets built, and change that to # dnf later, if needed From ead48cb838cf9a3cb9b0ec1690f11e1921940e29 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Sat, 14 Mar 2020 10:01:09 +0100 Subject: [PATCH 2/2] Update to 1.18.14. Include zsh completion. Mark cron file as config file. --- etckeeper.spec | 12 ++++++++++-- sources | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/etckeeper.spec b/etckeeper.spec index 56357d1..95fd387 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -32,7 +32,7 @@ %endif Name: etckeeper -Version: 1.18.12 +Version: 1.18.14 Release: 1%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) License: GPLv2+ @@ -276,7 +276,7 @@ fi %{_sysconfdir}/%{name}/*.d %{_sysconfdir}/%{name}/daily %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf -%{_sysconfdir}/cron.daily/%{name} +%config(noreplace) %{_sysconfdir}/cron.daily/%{name} %if 0%{?fedora} || 0%{?rhel} >= 7 %dir %{_datadir}/bash-completion %dir %{_datadir}/bash-completion/completions @@ -285,6 +285,9 @@ fi %dir %{_sysconfdir}/bash_completion.d %{_sysconfdir}/bash_completion.d/%{name} %endif +%dir %{_datadir}/zsh +%dir %{_datadir}/zsh/vendor-completions +%{_datadir}/zsh/vendor-completions/_%{name} %if 0%{?with_yum} %dir %{_prefix}/lib/yum-plugins %{_prefix}/lib/yum-plugins/%{name}.* @@ -333,6 +336,11 @@ fi %changelog +* Sat Mar 14 2020 Thomas Moschny - 1.18.14-1 +- Update to 1.18.14. +- Include zsh completion. +- Mark cron file as config file. + * Sun Dec 1 2019 Thomas Moschny - 1.18.12-1 - Update to 1.18.12. - New version of patch to fix logging with Ansible (#1762693). diff --git a/sources b/sources index 67c6744..3db483a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (etckeeper-1.18.12.tar.gz) = 7fb75d89bbf69d5ef29fc93f34f8368f0d93adb6f89a96be4769be4a58faff793682f5a5fc6f6f2bf51bc5a151a28b61319396a4298cbf0aa75ff3c1bbb660d7 +SHA512 (etckeeper-1.18.14.tar.gz) = 1bc01845d47ce3af1ef56474745843e8be6e005da90a21bed302fe73476fbf1f64b84fae7dac73139c394ca698bd146e1609fa34ebbc6737ba73a6f61e670948