[packages/etckeeper] - up to 1.18

zawadaa zawadaa at pld-linux.org
Tue Apr 7 01:21:53 CEST 2015


commit d9348a1f516100a6258b6d0122cc658f4804e51b
Author: Andrzej Zawadzki <zawadaa at pld-linux.org>
Date:   Tue Apr 7 01:21:31 2015 +0200

    - up to 1.18

 etckeeper.spec   |  8 ++++----
 use-libdir.patch | 13 ++++++-------
 2 files changed, 10 insertions(+), 11 deletions(-)
---
diff --git a/etckeeper.spec b/etckeeper.spec
index 949ab69..879b296 100644
--- 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 df5dcec..a643d85 100644
--- 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
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/etckeeper.git/commitdiff/d9348a1f516100a6258b6d0122cc658f4804e51b



More information about the pld-cvs-commit mailing list