[packages/etckeeper] up to 1.2, type-mksh.patch applied

glen glen at pld-linux.org
Thu May 9 10:09:18 CEST 2013


commit ff7b32845e28c542536d0091d54f2e4b457d2d40
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Thu May 9 11:09:00 2013 +0300

    up to 1.2, type-mksh.patch applied

 etckeeper.spec  |  6 ++----
 type-mksh.patch | 28 ----------------------------
 2 files changed, 2 insertions(+), 32 deletions(-)
---
diff --git a/etckeeper.spec b/etckeeper.spec
index cbc2419..7ba44df 100644
--- a/etckeeper.spec
+++ b/etckeeper.spec
@@ -3,14 +3,13 @@
 # - Subpackages for backends (git, etc)
 Summary:	Store /etc in a SCM system (git, mercurial, bzr or darcs)
 Name:		etckeeper
-Version:	1.1
+Version:	1.2
 Release:	0.29
 License:	GPL v2+
 Group:		Applications/System
 Source0:	http://ftp.debian.org/debian/pool/main/e/etckeeper/%{name}_%{version}.tar.gz
-# Source0-md5:	280f75205940f99f8f0295bb8ec3598f
+# Source0-md5:	b3d3b3162616a465e6b0f68dbd92dfc2
 Source1:	poldek.sh
-Patch0:		type-mksh.patch
 Patch1:		use-libdir.patch
 Patch2:		update-ignore.patch
 URL:		http://kitenet.net/~joey/code/etckeeper/
@@ -80,7 +79,6 @@ Bash completion routines for etckeeper.
 %setup -qc
 mv %{name} .tmp
 mv .tmp/* .
-%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %{__sed} -i -e '
diff --git a/type-mksh.patch b/type-mksh.patch
deleted file mode 100644
index c838040..0000000
--- a/type-mksh.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- etckeeper/uninit.d/50vcs-uninit~	2012-06-03 01:17:20.000000000 +0300
-+++ etckeeper/uninit.d/50vcs-uninit	2013-05-06 18:06:58.988017804 +0300
-@@ -21,9 +21,9 @@
- 	exit 0
- else
- 	realfile="$file"
--	if [ -n "`type -p tempfile`" ]; then
-+	if type -p tempfile >/dev/null 2>&1; then
- 		tempfile="tempfile"
--	elif [ -n "`type -p mktemp`" ]; then
-+	elif type -p mktemp >/dev/null 2>&1; then
- 		tempfile="mktemp"
- 	else
- 		echo "etckeeper warning: can't find tempfile or mktemp" >&2
---- etckeeper/update-ignore.d/01update-ignore~	2012-06-03 01:14:44.000000000 +0300
-+++ etckeeper/update-ignore.d/01update-ignore	2013-05-06 18:07:41.736533578 +0300
-@@ -170,9 +170,9 @@
- 		fi
- 	fi
- 	realfile="$file"
--	if [ -n "`type -p tempfile`" ]; then
-+	if type -p tempfile >/dev/null 2>&1; then
- 		tempfile="tempfile"
--	elif [ -n "`type -p mktemp`" ]; then
-+	elif type -p mktemp >/dev/null 2>&1; then
- 		tempfile="mktemp"
- 	else
- 		echo "etckeeper warning: can't find tempfile or mktemp" >&2
================================================================

---- gitweb:

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



More information about the pld-cvs-commit mailing list