commit etckeeper-git 1.18.3.r27.geeae1aa-1

4 files changed, 16 insertions, 47 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a18a80e55185..9d27bce2e995 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by mksrcinfo v8
+# Wed May 18 19:43:53 UTC 2016
 pkgbase = etckeeper-git
 	pkgdesc = collection of tools to let /etc be stored in a git, hg or bzr repository - git checkout
-	pkgver = 1.18.1.r0.gc1bfd1a
-	pkgrel = 3
+	pkgver = 1.18.3.r27.geeae1aa
+	pkgrel = 1
 	url = http://kitenet.net/~joey/code/etckeeper/
 	arch = any
 	license = GPL2
@@ -14,11 +16,7 @@ pkgbase = etckeeper-git
 	conflicts = etckeeper
 	backup = etc/etckeeper/etckeeper.conf
 	source = git://git.kitenet.net/etckeeper
-	source = etckeeper.service
-	source = etckeeper.timer
 	sha256sums = SKIP
-	sha256sums = b92c15e4e2d7211ded184dccf3d4b219031eef4bc5fbe0b8d294e8c0f61195fd
-	sha256sums = 256326aaaf5ce44a1b965e102cccd0cba433a76444ad9053428fb9f16428b8e5
 
 pkgname = etckeeper-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 9322da739936..16d9ec0b2771 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,8 @@
 # Contributor: Danie Roux <accounts@danieroux.com>
 
 pkgname=etckeeper-git
-pkgver=1.18.1.r0.gc1bfd1a
-pkgrel=3
+pkgver=1.18.3.r27.geeae1aa
+pkgrel=1
 pkgdesc='collection of tools to let /etc be stored in a git, hg or bzr repository - git checkout'
 arch=('any')
 url='http://kitenet.net/~joey/code/etckeeper/'
@@ -17,20 +17,21 @@ makedepends=('mercurial' 'bzr')
 optdepends=('mercurial: use mercurial for version control'
 	'bzr: use bazaar for version control')
 backup=('etc/etckeeper/etckeeper.conf')
-source=('git://git.kitenet.net/etckeeper'
-	'etckeeper.service'
-	'etckeeper.timer')
-sha256sums=('SKIP'
-            'b92c15e4e2d7211ded184dccf3d4b219031eef4bc5fbe0b8d294e8c0f61195fd'
-            '256326aaaf5ce44a1b965e102cccd0cba433a76444ad9053428fb9f16428b8e5')
+source=('git://git.kitenet.net/etckeeper')
+sha256sums=('SKIP')
 
 pkgver() {
 	cd "${srcdir}/etckeeper/"
 
 	if GITTAG="$(git describe --abbrev=0 --tags 2>/dev/null)"; then
-		echo "$(sed -e "s/^${pkgname%%-git}//" -e 's/^[-_/a-zA-Z]\+//' -e 's/[-_+]/./g' <<< ${GITTAG}).r$(git rev-list --count ${GITTAG}..).g$(git log -1 --format="%h")"
+		printf '%s.r%s.g%s' \
+			"$(sed -e "s/^${pkgname%%-git}//" -e 's/^[-_/a-zA-Z]\+//' -e 's/[-_+]/./g' <<< ${GITTAG})" \
+			"$(git rev-list --count ${GITTAG}..)" \
+			"$(git log -1 --format='%h')"
 	else
-		echo "0.r$(git rev-list --count master).g$(git log -1 --format="%h")"
+		printf '0.r%s.g%s' \
+			"$(git rev-list --count master)" \
+			"$(git log -1 --format='%h')"
 	fi
 }
 
@@ -41,10 +42,7 @@ build() {
 	sed -i '/^PYTHON=/c PYTHON=python2' Makefile
 	sed -i '1s/python/python2/' zypper-etckeeper.py
 
-	# install path for bash-completion
-	sed -i '/bash_completion/s|$(etcdir)/bash_completion.d|${prefix}/share/bash-completion/completions|' Makefile
-
-	# This does not exist, but we do not want the apt stuff installed.
+	# We want pacman :D
 	sed -i -e "/^LOWLEVEL_PACKAGE_MANAGER/c LOWLEVEL_PACKAGE_MANAGER=pacman" \
 		-e "/^HIGHLEVEL_PACKAGE_MANAGER/c HIGHLEVEL_PACKAGE_MANAGER=pacman" etckeeper.conf
 }
@@ -53,10 +51,5 @@ package() {
 	cd "${srcdir}/etckeeper/"
 
 	make DESTDIR=${pkgdir} install
-
-	# autocommit timer
-	install -D -m0755 debian/cron.daily ${pkgdir}/usr/bin/etckeeper-autocommit
-	install -D -m0644 ${srcdir}/etckeeper.service ${pkgdir}/usr/lib/systemd/system/etckeeper.service
-	install -D -m0644 ${srcdir}/etckeeper.timer ${pkgdir}/usr/lib/systemd/system/etckeeper.timer
 }
 
diff --git a/etckeeper.service b/etckeeper.service
deleted file mode 100644
index 204f43c8bc99..000000000000
--- a/etckeeper.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Autocommit of changes in /etc directory
-Documentation=man:etckeeper(8)
-DefaultDependencies=no
-Conflicts=shutdown.target
-After=local-fs.target time-sync.target
-Before=shutdown.target
-
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/etckeeper-autocommit
-IOSchedulingClass=idle
diff --git a/etckeeper.timer b/etckeeper.timer
deleted file mode 100644
index 364c0892e57f..000000000000
--- a/etckeeper.timer
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Daily autocommit of changes in /etc directory
-Documentation=man:etckeeper(8)
-
-[Timer]
-OnBootSec=15min
-OnUnitActiveSec=1d
-
-[Install]
-WantedBy=multi-user.target