mktemp fix

diff --git a/etckeeper.spec b/etckeeper.spec
index f2be64142f073780d32910cc74b71ec38179082b..8c885613846f91881c10258d198337ddc5feca37 100644 (file)
--- a/etckeeper.spec
+++ b/etckeeper.spec
@@ -6,16 +6,18 @@
 Summary:       Store /etc in a SCM system (git, mercurial, bzr or darcs)
 Name:          etckeeper
 Version:       1.0
-Release:       0.5
+Release:       0.6
 License:       GPL v2
 Group:         Applications/System
 Source0:       http://ftp.debian.org/debian/pool/main/e/etckeeper/%{name}_%{version}.tar.gz
 # Source0-md5: 1d7e402b41721f2a9ea0b217b969ba89
+Patch0:                type-mksh.patch
 URL:           http://kitenet.net/~joey/code/etckeeper/
 BuildRequires: bzr
 BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.219
 BuildRequires: sed >= 4.0
+Requires:      mktemp
 Requires:      perl-base
 Suggests:      %{name}-bash-completions
 Suggests:      %{name}-bzr
@@ -64,6 +66,7 @@ Bash completion routines for etckeeper.
 %setup -qc
 mv %{name} .tmp
 mv .tmp/* .
+%patch0 -p1
 %{__sed} -i -e '
        s|HIGHLEVEL_PACKAGE_MANAGER=apt|HIGHLEVEL_PACKAGE_MANAGER=poldek|;
        s|LOWLEVEL_PACKAGE_MANAGER=dpkg|LOWLEVEL_PACKAGE_MANAGER=rpm|;

diff --git a/type-mksh.patch b/type-mksh.patch
new file mode 100644 (file)
index 0000000..c838040
--- /dev/null
+++ b/type-mksh.patch
@@ -0,0 +1,28 @@
+--- 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