[arch-commits] Commit in etckeeper/repos/community-any (3 files)

[Christian Hesse]

    Date: Friday, November 29, 2019 @ 06:33:32
  Author: eworm
Revision: 534312

archrelease: copy trunk to community-any

Added:
  etckeeper/repos/community-any/0001-remove-superfluous-parenthesis.patch
    (from rev 534311, etckeeper/trunk/0001-remove-superfluous-parenthesis.patch)
  etckeeper/repos/community-any/PKGBUILD
    (from rev 534311, etckeeper/trunk/PKGBUILD)
Deleted:
  etckeeper/repos/community-any/PKGBUILD

-------------------------------------------+
 0001-remove-superfluous-parenthesis.patch |   23 +++++++
 PKGBUILD                                  |   86 +++++++++++++++-------------
 2 files changed, 70 insertions(+), 39 deletions(-)

Copied: etckeeper/repos/community-any/0001-remove-superfluous-parenthesis.patch (from rev 534311, etckeeper/trunk/0001-remove-superfluous-parenthesis.patch)
===================================================================
--- 0001-remove-superfluous-parenthesis.patch	                        (rev 0)
+++ 0001-remove-superfluous-parenthesis.patch	2019-11-29 06:33:32 UTC (rev 534312)
@@ -0,0 +1,23 @@
+From d263b7ffcbd73667600305a95f32ed57900f8961 Mon Sep 17 00:00:00 2001
+From: Christian Hesse <mail at eworm.de>
+Date: Fri, 29 Nov 2019 07:28:26 +0100
+Subject: [PATCH 1/1] remove superfluous parenthesis
+
+Signed-off-by: Christian Hesse <mail at eworm.de>
+---
+ commit.d/50vcs-commit | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/commit.d/50vcs-commit b/commit.d/50vcs-commit
+index 32395c1..4eaeb26 100755
+--- a/commit.d/50vcs-commit
++++ b/commit.d/50vcs-commit
+@@ -21,7 +21,7 @@ else
+ 	logfile=""
+ fi
+ 
+-hostname=`hostname 2>/dev/null || cat /etc/hostname)`
++hostname=`hostname 2>/dev/null || cat /etc/hostname`
+ hostname="${hostname%%.*}"
+ dnsdomainname=`dnsdomainname 2>/dev/null || true`
+ if [ -n "$dnsdomainname" ]; then

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-11-29 06:33:30 UTC (rev 534311)
+++ PKGBUILD	2019-11-29 06:33:32 UTC (rev 534312)
@@ -1,39 +0,0 @@
-# Maintainer: Christian Hesse <mail at eworm.de>
-# Contributor: mathieu.clabaut <mathieu.clabaut at gmail.com>
-# Contributor: Buce <dmbuce at gmail.com>
-# Contributor: Danie Roux <accounts at danieroux.com>
-
-pkgname=etckeeper
-_tag=11732dcdbfa65dce7dd7df2decd4be40486aeb2e # git rev-parse ${pkgver}
-pkgver=1.18.11
-pkgrel=1
-pkgdesc='Collection of tools to let /etc be stored in a git, hg or bzr repository'
-arch=(any)
-url='https://etckeeper.branchable.com/'
-license=(GPL2)
-depends=(git diffutils inetutils sed)
-makedepends=(python2 mercurial bzr)
-optdepends=('mercurial: use mercurial for version control'
-            'bzr: use bazaar for version control'
-            'which: etckeeper vcs <subcommand> support')
-backup=('etc/etckeeper/etckeeper.conf')
-source=("git+https://git.kitenet.net/git/etckeeper.git#tag=${_tag}?signed")
-sha256sums=(SKIP)
-validpgpkeys=(E85A5F63B31D24C1EBF0D81CC910D9222512E3C7) # Joey Hess <joeyh at joeyh.name>
-
-build() {
-	cd ${pkgname}
-
-	# Fix python name
-	sed -i '/^PYTHON=/c PYTHON=python2' Makefile
-	sed -i '1s/python/python2/' zypper-etckeeper.py
-
-	# 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
-}
-
-package() {
-	cd ${pkgname}
-	make DESTDIR="${pkgdir}" systemddir=/usr/lib/systemd/system install
-}

Copied: etckeeper/repos/community-any/PKGBUILD (from rev 534311, etckeeper/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-11-29 06:33:32 UTC (rev 534312)
@@ -0,0 +1,47 @@
+# Maintainer: Christian Hesse <mail at eworm.de>
+# Contributor: mathieu.clabaut <mathieu.clabaut at gmail.com>
+# Contributor: Buce <dmbuce at gmail.com>
+# Contributor: Danie Roux <accounts at danieroux.com>
+
+pkgname=etckeeper
+_tag=11732dcdbfa65dce7dd7df2decd4be40486aeb2e # git rev-parse ${pkgver}
+pkgver=1.18.11
+pkgrel=2
+pkgdesc='Collection of tools to let /etc be stored in a git, hg or bzr repository'
+arch=(any)
+url='https://etckeeper.branchable.com/'
+license=(GPL2)
+depends=(git diffutils inetutils sed)
+makedepends=(python2 mercurial bzr)
+optdepends=('mercurial: use mercurial for version control'
+            'bzr: use bazaar for version control'
+            'which: etckeeper vcs <subcommand> support')
+backup=('etc/etckeeper/etckeeper.conf')
+source=("git+https://git.kitenet.net/git/etckeeper.git#tag=${_tag}?signed"
+        '0001-remove-superfluous-parenthesis.patch')
+sha256sums=('SKIP'
+            '72ba696b2bb100075300a5bc34af985f06bf02d76ce30e388f28a3769434d5cb')
+validpgpkeys=('E85A5F63B31D24C1EBF0D81CC910D9222512E3C7') # Joey Hess <joeyh at joeyh.name>
+
+prepare() {
+	cd ${pkgname}
+
+	patch -Np1 < ../0001-remove-superfluous-parenthesis.patch
+}
+
+build() {
+	cd ${pkgname}
+
+	# Fix python name
+	sed -i '/^PYTHON=/c PYTHON=python2' Makefile
+	sed -i '1s/python/python2/' zypper-etckeeper.py
+
+	# 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
+}
+
+package() {
+	cd ${pkgname}
+	make DESTDIR="${pkgdir}" systemddir=/usr/lib/systemd/system install
+}