- up to 1.18.18

diff --git a/etckeeper.spec b/etckeeper.spec
index 4a667832f4548acc324c9acf0504fb3a2cd8e322..9028fe15ddb690f5fd210c88348e2d6de280cf73 100644 (file)
--- a/etckeeper.spec
+++ b/etckeeper.spec
@@ -3,16 +3,16 @@
 # - Subpackages for backends (darcs, git, hg)
 Summary:       Store /etc in a SCM system (git, mercurial, bzr or darcs)
 Name:          etckeeper
-Version:       1.18.16
+Version:       1.18.18
 Release:       1
 License:       GPL v2+
 Group:         Applications/System
 Source0:       https://git.joeyh.name/index.cgi/etckeeper.git/snapshot/%{name}-%{version}.tar.gz
-# Source0-md5: 3d1636d5b792a8e07d138060fd95cb02
+# Source0-md5: 2539b082a5c813fae3c1e0d5a6f27b95
 Source1:       pre-install.sh
 Source2:       post-install.sh
-Source3:       https://ftp.debian.org/debian/pool/main/e/etckeeper/etckeeper_1.18.16-1.debian.tar.xz
-# Source3-md5: 49849b13951d76dcb3c4015090a26511
+Source3:       https://ftp.debian.org/debian/pool/main/e/etckeeper/etckeeper_%{version}-1.debian.tar.xz
+# Source3-md5: f0499366768f9809a36f94b9c4c020d9
 Patch1:                use-libdir.patch
 Patch2:                update-ignore.patch
 URL:           http://etckeeper.branchable.com/

diff --git a/use-libdir.patch b/use-libdir.patch
index 47528465213deaf1b5bccbf2cb2d6851b1a6c7ca..8566d5b8e3f9db2968c4b03232fe756ba4fb166f 100644 (file)
--- a/use-libdir.patch
+++ b/use-libdir.patch
@@ -45,7 +45,7 @@
 -      for script in $ETCKEEPER_CONF_DIR/$command.d/*; do
 +      for script in "$ETCKEEPER_LIB_DIR/$command.d/"* "$ETCKEEPER_CONF_DIR/$command.d/"*; do
                if [ ! -d "$script" -a -x "$script" ]; then
-                       echo "$script" | egrep -q "/[-a-zA-Z0-9]+$"
+                       echo "$script" | grep -E -q "/[-a-zA-Z0-9]+$"
                        [ $? -eq 0 ] && "$script" "$@"
 --- etckeeper-1.18.4/systemd/etckeeper.service~        2016-06-20 08:06:01.000000000 +0300
 +++ etckeeper-1.18.4/systemd/etckeeper.service 2016-06-29 23:42:00.804296507 +0300