summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2012-10-22 00:02:31 -0400
committerLuke Shumaker <LukeShu@sbcglobal.net>2012-10-22 00:02:31 -0400
commit08ed8de1b8f57547d4bbf90bfcc2155cdb7c7a56 (patch)
tree0d7724a009c6c8e279c5ef74dbb4d4bae886e8e7
parent95b6d407fca371873eae870c3d2b185c72002263 (diff)
update ~lukeshu/etckeeper
-rw-r--r--~lukeshu/etckeeper/PKGBUILD22
-rw-r--r--~lukeshu/etckeeper/etckeeper-pacman.patch9
2 files changed, 23 insertions, 8 deletions
diff --git a/~lukeshu/etckeeper/PKGBUILD b/~lukeshu/etckeeper/PKGBUILD
index a359500b5..163c320db 100644
--- a/~lukeshu/etckeeper/PKGBUILD
+++ b/~lukeshu/etckeeper/PKGBUILD
@@ -1,26 +1,31 @@
-#Contributor: Danie Roux <accounts@danieroux.com>
-#Maintainer: Buce <dmbuce@gmail.com>
+# Maintainer (Parabola): Luke Shumaker <lukeshu@sbcglobal.net>
+# Maintainer (AUR): Buce <dmbuce@gmail.com>
+# Contributor: Danie Roux <accounts@danieroux.com>
-# This requires lukeshu's modified makepkg to build
+# This requires makepkg newer than 4.0.3, which at this time means from git
pkgname=etckeeper
-pkgver=0.63
-pkgrel=2.3
+pkgver=0.64
pkgdesc="collection of tools to let /etc be stored in a git, hg, bzr or darcs repository."
-arch=('any')
-backup=('etc/etckeeper/etckeeper.conf')
url="http://kitenet.net/~joey/code/etckeeper/"
license=('GPL2')
-provides=('etckeeper')
+
+pkgrel=1
+arch=('any')
depends=('inetutils' 'python2')
makedepends=('bzr') # bzr must be there at compile time to have bzr support
optdepends=('git' 'hg' 'bzr' 'darcs')
+backup=(etc/etckeeper/etckeeper.conf)
source=("etckeeper-$pkgver::git://git.kitenet.net/etckeeper#tag=${pkgver}"
+ etckeeper-pacman.patch
etckeeper-archlinux.conf)
build() {
cd "$srcdir/etckeeper-$pkgver"
+ # add pacman support to list-to `list-installed`
+ patch -p0 -i "$srcdir/etckeeper-pacman.patch"
+
# use python2
sed -i 's@^#!/usr/bin/python$@&2@' etckeeper-bzr/__init__.py
@@ -34,4 +39,5 @@ package() {
}
md5sums=('SKIP'
+ 'f1f00bf9331d1ef7f29b0ac29cdfcbda'
'99d8d2838f49fa0f2f21c9e37948100d')
diff --git a/~lukeshu/etckeeper/etckeeper-pacman.patch b/~lukeshu/etckeeper/etckeeper-pacman.patch
new file mode 100644
index 000000000..1fb4acb62
--- /dev/null
+++ b/~lukeshu/etckeeper/etckeeper-pacman.patch
@@ -0,0 +1,9 @@
+--- list-installed.d/50list-installed.orig 2012-10-21 23:45:30.000000000 -0400
++++ list-installed.d/50list-installed 2012-10-21 23:45:39.000000000 -0400
+@@ -7,4 +7,6 @@
+ egrep '(ok installed|ok config-files)' | cut -f2,3
+ elif [ "$LOWLEVEL_PACKAGE_MANAGER" = rpm ]; then
+ rpm -qa --qf "%|epoch?{%{epoch}}:{0}|:%{name}-%{version}-%{release}.%{arch}\n" | sort
++elif [ "$LOWLEVEL_PACKAGE_MANAGER" = pacman ]; then
++ { pacman -Qd|sed 's/.*/& (dep)/'; pacman -Qe|sed 's/.*/& (explicit)/'; } |sort
+ fi