added yum-etckeeper plugin to top level etckeeper specfile. made makefile install said plugin when yum is selected as a high level package manager.

11 files changed, 11 insertions, 107 deletions

diff --git a/Makefile b/Makefile
index d07417c..cb47591 100644
--- a/Makefile
+++ b/Makefile
@@ -30,6 +30,10 @@ endif
 ifeq ($(LOWLEVEL_PACKAGE_MANAGER),pacman-g2)
 	$(INSTALL_DATA) pacman-g2.hook $(DESTDIR)$(etcdir)/pacman-g2/hooks/etckeeper
 endif
+ifeq ($(HIGHLEVEL_PACKAGE_MANAGER),yum)
+	$(INSTALL_DATA) yum-etckeeper.py $(DESTDIR)$(prefix)/lib/yum-plugins/etckeeper.py
+	$(INSTALL_DATA) yum-etckeeper.conf $(DESTDIR)$(etcdir)/yum/pluginconf.d/etckeeper.conf
+endif
 	-./etckeeper-bzr/__init__.py install --root=$(DESTDIR) || echo "** bzr support not installed"
 	echo "** installation successful"
 
diff --git a/etckeeper.conf b/etckeeper.conf
index 2de81dd..f810870 100644
--- a/etckeeper.conf
+++ b/etckeeper.conf
@@ -26,7 +26,7 @@ VCS="git"
 #AVOID_COMMIT_BEFORE_INSTALL=1
 
 # The high-level package manager that's being used.
-# (apt, pacman-g2, etc)
+# (apt, pacman-g2, yum etc)
 HIGHLEVEL_PACKAGE_MANAGER=apt
 
 # The low-level package manager that's being used.
diff --git a/etckeeper.spec b/etckeeper.spec
index 351244a..41402f0 100644
--- a/etckeeper.spec
+++ b/etckeeper.spec
@@ -1,5 +1,5 @@
 Name:           etckeeper
-Version:        0.31
+Version:        0.32
 Release:        1%{?dist}
 Summary:        store /etc in git, mercurial, bzr or darcs
 
@@ -10,7 +10,7 @@ Source0:        http://ftp.debian.org/debian/pool/main/e/etckeeper/%{name}_%{ver
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       git >= 1.6.1-1
-Obsoletes:	etckeeper = snapshot
+Obsoletes:	etckeeper = snapshot, yum-etckeeper
 
 %description
 The etckeeper program is a tool to let /etc be stored in a git,
@@ -50,8 +50,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_sbindir}/*
 %{_mandir}/*
 /etc/*
-
+%{_prefix}/lib/*
 
 %changelog
+* Wed Feb 25 2009 Jimmy Tang <jtang@tchpc.tcd.ie> - 0.32-1
+- yum etckeeper plugin is now apart of this package
+
 * Tue Feb 24 2009 Jimmy Tang <jtang@tchpc.tcd.ie> - 0.31-1
 - initial package
diff --git a/yum-etckeeper/etckeeper.conf b/yum-etckeeper.conf
index 8e4d76c..8e4d76c 100644
--- a/yum-etckeeper/etckeeper.conf
+++ b/yum-etckeeper.conf
diff --git a/yum-etckeeper/etckeeper.py b/yum-etckeeper.py
index f1b7edb..f3ec762 100644
--- a/yum-etckeeper/etckeeper.py
+++ b/yum-etckeeper.py
@@ -13,10 +13,6 @@
 #   [main]
 #   enabled=1
 #
-# this was also needed in /etc/etckeeper/list-installed.d/60list-installed
-#if [ "$LOWLEVEL_PACKAGE_MANAGER" = rpm ]; then
-#	rpm -qa --queryformat "%{name} %{version} %{arch}\n" | sort
-#fi
 
 import os
 from glob import fnmatch
diff --git a/yum-etckeeper/AUTHORS b/yum-etckeeper/AUTHORS
deleted file mode 100644
index 37bddf3..0000000
--- a/yum-etckeeper/AUTHORS
+++ /dev/null
@@ -1 +0,0 @@
-jtang@tchpc.tcd.ie
diff --git a/yum-etckeeper/LICENSE b/yum-etckeeper/LICENSE
deleted file mode 100644
index e69de29..0000000
--- a/yum-etckeeper/LICENSE
+++ /dev/null
diff --git a/yum-etckeeper/README b/yum-etckeeper/README
deleted file mode 100644
index 0d91824..0000000
--- a/yum-etckeeper/README
+++ /dev/null
@@ -1,8 +0,0 @@
-yum pre and post install hook, this is similar to the apt get hook.
-its probably not as refined.
-
-there is a simple spec file and makefile for generating installable
-rpms. it also relies on the etckeeper package that I cooked up.
-
-i've been using it on my own systems and it appears to work fine with
-the autoupdate system and when i install/remove apps with yum.
diff --git a/yum-etckeeper/list-installed.d/60list-installed b/yum-etckeeper/list-installed.d/60list-installed
deleted file mode 100755
index aac39ea..0000000
--- a/yum-etckeeper/list-installed.d/60list-installed
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-# Output to stdout a *sorted* list of all currently installed 
-# (or removed but still with config-files) packages, in the
-# format "package version\n".
-if [ "$LOWLEVEL_PACKAGE_MANAGER" = rpm ]; then
-	rpm -qa --queryformat "%{name} %{version} %{arch}\n" | sort
-fi
diff --git a/yum-etckeeper/makefile b/yum-etckeeper/makefile
deleted file mode 100644
index 1a666ef..0000000
--- a/yum-etckeeper/makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-DESTDIR?=
-prefix=/usr
-etcdir=/etc
-CONFFILE=etckeeper.conf
-
-INSTALL=install 
-INSTALL_EXE=${INSTALL} -D
-INSTALL_DATA=${INSTALL} -m 0644 -D
-
-PACKAGE=yum-etckeeper
-DISTFILE=$(PACKAGE).tar.gz
-
-dist: $(DISTFILE)
-
-$(DISTFILE):
-	tar -C .. --exclude .git --exclude $(DISTFILE) \
-	--exclude \*.diff --exclude .gitignore \
-	--exclude .svn \
-	--exclude \*.swp \
-	-cvzf $(DISTFILE) $(PACKAGE)
-
-install:
-	mkdir -p $(DESTDIR)$(etcdir)/etckeeper/list-installed.d $(DESTDIR)$(prefix)/lib/yum-plugins $(DESTDIR)$(etcdir)/yum/pluginconf.d
-	$(INSTALL_DATA) $(CONFFILE) $(DESTDIR)$(etcdir)/yum/pluginconf.d/etckeeper.conf
-	$(INSTALL_DATA) etckeeper.py $(DESTDIR)$(prefix)/lib/yum-plugins/etckeeper.py
-	$(INSTALL_EXE) list-installed.d/60list-installed $(DESTDIR)$(etcdir)/etckeeper/list-installed.d/60list-installed
-
-rpms: dist
-	rpmbuild -ta $(DISTFILE)
-
-clean:
-	-rm -f $(DISTFILE)
diff --git a/yum-etckeeper/yum-etckeeper.spec b/yum-etckeeper/yum-etckeeper.spec
deleted file mode 100644
index e8f9fe5..0000000
--- a/yum-etckeeper/yum-etckeeper.spec
+++ /dev/null
@@ -1,51 +0,0 @@
-Name:           yum-etckeeper
-Version:        snapshot
-Release:        9%{?dist}
-Summary:        etckeeper pre and post transaction hook for yum
-
-Group:          System Environment/Base
-License:        TCD
-URL:            http://www.tchpc.tcd.ie
-Source0:        yum-etckeeper.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  etckeeper >= 0.31, yum, git >= 1.6.0.3-1
-Requires:       etckeeper >= 0.31, yum, git >= 1.6.0.3-1
-
-%description
-etckeeper pre and post transaction hook for yum
-
-%prep
-%setup -q -n yum-etckeeper
-
-
-%build
-exit 0
-
-%install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS  LICENSE  README
-/etc/etckeeper/list-installed.d/60list-installed
-/etc/yum/pluginconf.d/etckeeper.conf
-/usr/lib/yum-plugins/etckeeper.py*
-
-
-%changelog
-* Tue Feb 24 2009 Jimmy Tang <jtang@tchpc.tcd.ie> - snapshot-9
-- ignore previous change, since I've packaged up etckeeper properly now
-* Tue Feb 24 2009 Jimmy Tang <jtang@tchpc.tcd.ie> - snapshot-7
-- upstream etckeeper has a list installed script for rpm so 
-removing my own one
-* Mon Feb 16 2009 Jimmy Tang <jtang@tchpc.tcd.ie> - snapshot-4
-- made it work in sl4
-* Mon Feb 16 2009 Jimmy Tang <jtang@tchpc.tcd.ie> - snapshot-1
-- initial package