[etckeeper] - Update to 0.48. - Don't list /etc/etckeeper/*.d directories twice in %files. - Add patch from upst

[Thomas Moschny]

commit 24ac1812f8e4cf90512288ba7b0dca8b77f08ccb
Author: Thomas Moschny <thm at fedoraproject.org>
Date:   Tue Sep 7 01:25:24 2010 +0200

    - Update to 0.48.
    - Don't list /etc/etckeeper/*.d directories twice in %files.
    - Add patch from upstream that fixes bz 588086.

 .gitignore                    |    1 +
 etckeeper-0.48-fix_path.patch |   45 +++++++++++++++++++++++++++++++++++++++++
 etckeeper.spec                |   15 ++++++++++---
 sources                       |    2 +-
 4 files changed, 58 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bb31498..458823f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 etckeeper_0.41.tar.gz
+/etckeeper_0.48.tar.gz
diff --git a/etckeeper-0.48-fix_path.patch b/etckeeper-0.48-fix_path.patch
new file mode 100644
index 0000000..ae51274
--- /dev/null
+++ b/etckeeper-0.48-fix_path.patch
@@ -0,0 +1,45 @@
+From 60747c8dae14a12263124193572c7eb1177e475b Mon Sep 17 00:00:00 2001
+From: Joey Hess <joey at kitenet.net>
+Date: Sun, 25 Jul 2010 19:47:45 -0400
+Subject: [PATCH 1/1] Ensure that PATH contains the directory containing etckeeper, so that hook scripts that re-exec etckeeper are guaranteed to find it.
+
+---
+ debian/changelog |    7 +++++++
+ etckeeper        |    6 ++++++
+ 2 files changed, 13 insertions(+), 0 deletions(-)
+
+diff --git a/debian/changelog b/debian/changelog
+index 58bdbd1..3ddc0b6 100644
+--- a/debian/changelog
++++ b/debian/changelog
+@@ -1,3 +1,10 @@
++etckeeper (0.49) UNRELEASED; urgency=low
++
++  * Ensure that PATH contains the directory containing etckeeper, so
++    that hook scripts that re-exec etckeeper are guaranteed to find it.
++
++ -- Joey Hess <joeyh at debian.org>  Sun, 25 Jul 2010 19:44:37 -0400
++
+ etckeeper (0.48) unstable; urgency=low
+ 
+   * Fix backwards test for HGUSER. (Mike Rich)
+diff --git a/etckeeper b/etckeeper
+index 4c27005..d7b94a0 100755
+--- a/etckeeper
++++ b/etckeeper
+@@ -25,6 +25,12 @@ export VCS
+ HOME=~root
+ export HOME
+ 
++program_directory="${0%/*}"
++if [ -n "$program_directory" ]; then
++	PATH="$PATH:$program_directory"
++	export PATH
++fi
++
+ if [ ! -z "$GIT_COMMIT_OPTIONS" ]; then
+ 	export GIT_COMMIT_OPTIONS
+ fi
+-- 
+1.7.1
+
diff --git a/etckeeper.spec b/etckeeper.spec
index b233b85..d1d9aba 100644
--- a/etckeeper.spec
+++ b/etckeeper.spec
@@ -1,13 +1,15 @@
 %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
 
 Name:      etckeeper
-Version:   0.41
-Release:   2%{?dist}
+Version:   0.48
+Release:   1%{?dist}
 Summary:   Store /etc in a SCM system (git, mercurial, bzr or darcs)
 Group:     Applications/System
 License:   GPLv2+
 URL:       http://kitenet.net/~joey/code/etckeeper/
 Source0:   http://ftp.debian.org/debian/pool/main/e/etckeeper/%{name}_%{version}.tar.gz
+# this is from rev 60747c8d, will be in 0.49. fixes bz 588086.
+Patch0:    etckeeper-0.48-fix_path.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 Requires:  git >= 1.6
@@ -40,6 +42,7 @@ etckeeper with bzr backend, install this package.
 
 %prep
 %setup -q -n %{name}
+%patch0 -p1 -b .path
 %{__perl} -pi -e '
     s|HIGHLEVEL_PACKAGE_MANAGER=apt|HIGHLEVEL_PACKAGE_MANAGER=yum|;
     s|LOWLEVEL_PACKAGE_MANAGER=dpkg|LOWLEVEL_PACKAGE_MANAGER=rpm|;
@@ -69,8 +72,7 @@ rm -rf %{buildroot}
 %{_sbindir}/%{name}
 %{_mandir}/man8/%{name}.8*
 %dir %{_sysconfdir}/%{name}
-%dir %{_sysconfdir}/%{name}/*.d
-%{_sysconfdir}/%{name}/*.d/
+%{_sysconfdir}/%{name}/*.d
 %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
 %{_sysconfdir}/cron.daily/%{name}
 %dir %{_sysconfdir}/bash_completion.d
@@ -88,6 +90,11 @@ rm -rf %{buildroot}
 %{python_sitelib}/bzr_%{name}-*.egg-info
 
 %changelog
+* Fri Sep  3 2010 Thomas Moschny <thomas.moschny at gmx.de> - 0.48-1
+- Update to 0.48.
+- Don't list /etc/etckeeper/*.d directories twice in %%files.
+- Add patch from upstream that fixes bz 588086.
+
 * Wed Jul 21 2010 David Malcolm <dmalcolm at redhat.com> - 0.41-2
 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
 
diff --git a/sources b/sources
index bbdab18..1219a27 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d8929c79fcab4f3e57d7ebb03f20df63  etckeeper_0.41.tar.gz
+c73e4a12d292bbb769da108d82dd1798  etckeeper_0.48.tar.gz