summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile7
-rw-r--r--debian/changelog6
-rw-r--r--etckeeper.spec26
3 files changed, 25 insertions, 14 deletions
diff --git a/Makefile b/Makefile
index cb47591..8f8239d 100644
--- a/Makefile
+++ b/Makefile
@@ -14,8 +14,11 @@ INSTALL=install
INSTALL_EXE=${INSTALL} -D
INSTALL_DATA=${INSTALL} -m 0644 -D
-build:
+build: etckeeper.spec
-./etckeeper-bzr/__init__.py build || echo "** bzr support not built"
+
+etckeeper.spec:
+ sed -i "s/Version:.*/Version: $$(perl -e '$$_=<>;print m/\((.*?)\)/'<debian/changelog)/" etckeeper.spec
install:
mkdir -p $(DESTDIR)$(etcdir)/etckeeper/ $(DESTDIR)$(vardir)/cache/etckeeper/
@@ -39,3 +42,5 @@ endif
clean:
rm -rf build
+
+.PHONY: etckeeper.spec
diff --git a/debian/changelog b/debian/changelog
index f3c96ac..615cbde 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+etckeeper (0.33) unstable; urgency=low
+
+ * Add support for yum. Thanks, Jimmy Tang.
+
+ -- Joey Hess <joeyh@debian.org> Wed, 25 Feb 2009 14:38:12 -0500
+
etckeeper (0.32) unstable; urgency=low
* Add uninit subcommand, which cleans up all etckeeper and VCS droppings
diff --git a/etckeeper.spec b/etckeeper.spec
index 2242c3e..cab99a0 100644
--- a/etckeeper.spec
+++ b/etckeeper.spec
@@ -1,16 +1,16 @@
-Name: etckeeper
-Version: 0.32
-Release: 1%{?dist}
-Summary: store /etc in git, mercurial, bzr or darcs
-
-Group: System Tools
-License: GPLv2
-URL: http://kitenet.net/~joey/code/etckeeper/
-Source0: http://ftp.debian.org/debian/pool/main/e/etckeeper/%{name}_%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Requires: git >= 1.6.1-1
-Obsoletes: etckeeper = snapshot, yum-etckeeper
+Name: etckeeper
+Version: 0.33
+Release: 1%{?dist}
+Summary: store /etc in git, mercurial, bzr or darcs
+
+Group: System Tools
+License: GPLv2
+URL: http://kitenet.net/~joey/code/etckeeper/
+Source0: http://ftp.debian.org/debian/pool/main/e/etckeeper/%{name}_%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Requires: git >= 1.6.1-1
+Obsoletes: etckeeper = snapshot, yum-etckeeper
%description
The etckeeper program is a tool to let /etc be stored in a git,