From b6c364df8deb9e3dc9722cfe6c2fb89c39b24f98 Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Sat, 3 Dec 2022 13:58:22 +0100 Subject: [PATCH 1/2] Update to 1.18.18. Rebase patches. --- ...nings.patch => etckeeper-1.18.18-fix-hg-warnings.patch | 4 ++-- etckeeper.spec | 8 ++++++-- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) rename etckeeper-1.18.7-fix-hg-warnings.patch => etckeeper-1.18.18-fix-hg-warnings.patch (95%) diff --git a/etckeeper-1.18.7-fix-hg-warnings.patch b/etckeeper-1.18.18-fix-hg-warnings.patch similarity index 95% rename from etckeeper-1.18.7-fix-hg-warnings.patch rename to etckeeper-1.18.18-fix-hg-warnings.patch index 90c6818..7a74e70 100644 --- a/etckeeper-1.18.7-fix-hg-warnings.patch +++ b/etckeeper-1.18.18-fix-hg-warnings.patch @@ -1,5 +1,5 @@ diff --git a/pre-commit.d/20warn-problem-files b/pre-commit.d/20warn-problem-files -index 6bd5c2b..7899268 100755 +index 43320e4..7899268 100755 --- a/pre-commit.d/20warn-problem-files +++ b/pre-commit.d/20warn-problem-files @@ -1,19 +1,20 @@ @@ -7,7 +7,7 @@ index 6bd5c2b..7899268 100755 set -e -exclude_internal () { -- egrep -v '(^|/)(\.git|\.hg|\.bzr|_darcs)/' +- grep -E -v '(^|/)(\.git|\.hg|\.bzr|_darcs)/' -} +# (Note that when using this, the find expression must end with +# -print or -exec, else the excluded directories will actually be diff --git a/etckeeper.spec b/etckeeper.spec index 17a5813..eca11ec 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -17,7 +17,7 @@ %endif Name: etckeeper -Version: 1.18.17 +Version: 1.18.18 Release: 1%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) License: GPLv2+ @@ -30,7 +30,7 @@ Patch0: etckeeper-makefile-remove-python-plugins.patch # see rhbz#1460461 Patch1: etckeeper-1.18.7-fix-rpm-ignores.patch # see rhbz#1480843 -Patch2: etckeeper-1.18.7-fix-hg-warnings.patch +Patch2: etckeeper-1.18.18-fix-hg-warnings.patch # From https://bugs.launchpad.net/ubuntu/+source/etckeeper/+bug/1826855 Patch3: etckeeper-add-breezy-python3-plugin.patch # see rhbz#1762693 and https://github.com/ansible/ansible/issues/54949 @@ -288,6 +288,10 @@ fi %changelog +* Fri Dec 2 2022 Thomas Moschny - 1.18.18-1 +- Update to 1.18.18. +- Rebase patches. + * Tue Mar 8 2022 Thomas Moschny - 1.18.17-1 - Update to 1.18.17. diff --git a/sources b/sources index 73fac7e..9afa13c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (etckeeper-1.18.17.tar.gz) = 6e75d0f38c8d27ba290ab6e1a51d50ca7a736c958da7a1edb792a5c7f1eedd4848adbb43571425f127bf2c5fe39d5b7887968b09178ca5385ec0abeaeb6cfa00 +SHA512 (etckeeper-1.18.18.tar.gz) = 57b2f7297c0b71e3d39a7838dd3e6599bb3f1275d86200be9d7986f46f0392aa0ba130cb38ba7a5757fcb5d6fa33b4d32233237dba15e8ce9fb8c52565cf251b From 45d0cd08a871320bb3925300551f9612f40249bd Mon Sep 17 00:00:00 2001 From: Thomas Moschny Date: Sat, 28 Jan 2023 10:13:06 +0100 Subject: [PATCH 2/2] Update to 1.18.20. --- etckeeper.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/etckeeper.spec b/etckeeper.spec index eca11ec..1858fcc 100644 --- a/etckeeper.spec +++ b/etckeeper.spec @@ -17,7 +17,7 @@ %endif Name: etckeeper -Version: 1.18.18 +Version: 1.18.20 Release: 1%{?dist} Summary: Store /etc in a SCM system (git, mercurial, bzr or darcs) License: GPLv2+ @@ -288,6 +288,9 @@ fi %changelog +* Sat Jan 28 2023 Thomas Moschny - 1.18.20-1 +- Update to 1.18.20. + * Fri Dec 2 2022 Thomas Moschny - 1.18.18-1 - Update to 1.18.18. - Rebase patches. diff --git a/sources b/sources index 9afa13c..5d4192f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (etckeeper-1.18.18.tar.gz) = 57b2f7297c0b71e3d39a7838dd3e6599bb3f1275d86200be9d7986f46f0392aa0ba130cb38ba7a5757fcb5d6fa33b4d32233237dba15e8ce9fb8c52565cf251b +SHA512 (etckeeper-1.18.20.tar.gz) = b190da11ac589d6240c8293d961b75efe01e835091f9b5fba84c3c9062ffb4cb1dc52c9ea2bdf881f021c7d5584c4487d3c60121fdcb0a2a35e349c8321422c6