- up to 1.18

diff --git a/etckeeper.spec b/etckeeper.spec
index 949ab699b58d61cd32f8e968eeed44d0a156ff48..879b296f136b594fc9e66dcf4f26c46c8781d0d6 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.11
+Version:       1.18
 Release:       1
 License:       GPL v2+
 Group:         Applications/System
 Source0:       https://github.com/joeyh/etckeeper/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 3db4879745e6a8306e23b1b2952d1e69
+# Source0-md5: cfdf340f7dc2c072a13d0a09ee560cb8
 Source1:       poldek.sh
 Patch1:                use-libdir.patch
 Patch2:                update-ignore.patch
-URL:           http://kitenet.net/~joey/code/etckeeper/
+URL:           http://etckeeper.branchable.com/
 BuildRequires: bzr
 BuildRequires: python-devel
 BuildRequires: rpm-pythonprov
@@ -133,7 +133,7 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc INSTALL TODO README
+%doc INSTALL
 %dir %{_sysconfdir}/%{name}
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/%{name}.conf
 %dir /lib/%{name}

diff --git a/use-libdir.patch b/use-libdir.patch
index df5dcecfe6d8edbbc34abe563a87094d12b9dcb9..a643d850fb0d605a605addbacca856374ab26c49 100644 (file)
--- a/use-libdir.patch
+++ b/use-libdir.patch
@@ -1,5 +1,5 @@
---- etckeeper-1.1/etckeeper    2012-12-28 18:09:51.000000000 +0200
-+++ etckeeper-1.1/etckeeper    2013-05-07 13:05:25.000000000 +0300
+--- etckeeper/etckeeper.orig   2015-03-14 18:24:26.000000000 +0100
++++ etckeeper/etckeeper        2015-04-07 00:54:26.014557154 +0200
 @@ -1,6 +1,10 @@
  #!/bin/sh
  set -e
@@ -11,7 +11,7 @@
  if [ -z "$ETCKEEPER_CONF_DIR" ]; then
        ETCKEEPER_CONF_DIR=/etc/etckeeper
  fi
-@@ -71,8 +75,8 @@
+@@ -84,8 +88,8 @@
        command=pre-install
  fi
  
@@ -22,10 +22,10 @@
        exit 1
  fi
  
-@@ -109,13 +113,14 @@
+@@ -122,13 +126,14 @@
  
  lsscripts() {
-       perl -e '
+       LANG=C perl -e '
 -              $dir=shift;
 +              for $dir (@ARGV) {
                print join "\n", grep { ! -d $_ && -x $_ }
@@ -37,7 +37,6 @@
  }
  
 -for script in $(lsscripts "$ETCKEEPER_CONF_DIR/$command.d"); do
--      "$script" "$@"
 +for script in $(lsscripts "$ETCKEEPER_LIB_DIR/$command.d" "$ETCKEEPER_CONF_DIR/$command.d"); do
-+      "$script" "$@"
+       "$script" "$@"
  done