From 08ed8de1b8f57547d4bbf90bfcc2155cdb7c7a56 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Mon, 22 Oct 2012 00:02:31 -0400 Subject: update ~lukeshu/etckeeper --- ~lukeshu/etckeeper/PKGBUILD | 22 ++++++++++++++-------- ~lukeshu/etckeeper/etckeeper-pacman.patch | 9 +++++++++ 2 files changed, 23 insertions(+), 8 deletions(-) create mode 100644 ~lukeshu/etckeeper/etckeeper-pacman.patch 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 -#Maintainer: Buce +# Maintainer (Parabola): Luke Shumaker +# Maintainer (AUR): Buce +# Contributor: Danie Roux -# 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 -- cgit v1.2.3-54-g00ecf