[arch-commits] Commit in tig/trunk (PKGBUILD tig-2.0-buildfix.patch)

[Lukas Fleischer]

    Date: Wednesday, April 30, 2014 @ 12:59:50
  Author: lfleischer
Revision: 110456

upgpkg: tig 2.0-1

Upstream update.

Added:
  tig/trunk/tig-2.0-buildfix.patch
Modified:
  tig/trunk/PKGBUILD

------------------------+
 PKGBUILD               |   18 +++++++++++++-----
 tig-2.0-buildfix.patch |   26 ++++++++++++++++++++++++++
 2 files changed, 39 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-04-30 10:44:50 UTC (rev 110455)
+++ PKGBUILD	2014-04-30 10:59:50 UTC (rev 110456)
@@ -4,7 +4,7 @@
 # Contributor: Nathan Jones <nathanj at insightbb.com>
 
 pkgname=tig
-pkgver=1.2.1
+pkgver=2.0
 pkgrel=1
 pkgdesc='Text-mode interface for Git.'
 depends=('git' 'ncurses')
@@ -12,13 +12,21 @@
 url='http://jonas.nitro.dk/tig/'
 license=('GPL')
 arch=('i686' 'x86_64')
-source=("http://jonas.nitro.dk/${pkgname}/releases/${pkgname}-${pkgver}.tar.gz")
-md5sums=('d5c1dd1d829f8e515f59c96a5d419323')
+backup=('etc/tigrc')
+source=("http://jonas.nitro.dk/${pkgname}/releases/${pkgname}-${pkgver}.tar.gz"
+        'tig-2.0-buildfix.patch')
+md5sums=('5c54013635bbc0ecf372e5fa8cbad394'
+         'f00affce7b8fe94866aef2ab0aff0deb')
 
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
+  patch -p1 -i ../tig-2.0-buildfix.patch
+}
+
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --sysconfdir=/etc
   make
 }
 
@@ -26,6 +34,6 @@
   cd "$srcdir/$pkgname-$pkgver"
 
   make DESTDIR="$pkgdir" install install-doc-man
-  install -Dm0644 contrib/tigrc "$pkgdir/etc/tigrc.sample"
+
   install -Dm0644 contrib/tig-completion.bash "$pkgdir/usr/share/bash-completion/completions/tig"
 }

Added: tig-2.0-buildfix.patch
===================================================================
--- tig-2.0-buildfix.patch	                        (rev 0)
+++ tig-2.0-buildfix.patch	2014-04-30 10:59:50 UTC (rev 110456)
@@ -0,0 +1,26 @@
+From 4787433d73895659cf9f968619eb2eaae9a8f05c Mon Sep 17 00:00:00 2001
+From: Gregory Pakosz <gregory.pakosz at gmail.com>
+Date: Wed, 30 Apr 2014 12:07:11 +0200
+Subject: [PATCH] Fixed typo in watch.c
+
+REFRESH_MODE_MANUEL -> REFRESH_MODE_MANUAL
+---
+ src/watch.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/watch.c b/src/watch.c
+index c1a1b9b..f40fe5e 100644
+--- a/src/watch.c
++++ b/src/watch.c
+@@ -154,7 +154,7 @@ static struct watch_handler watch_handlers[] = {
+ static bool
+ watch_no_refresh(enum watch_event event)
+ {
+-	return opt_refresh_mode == REFRESH_MODE_MANUEL ||
++	return opt_refresh_mode == REFRESH_MODE_MANUAL ||
+ 	       (opt_refresh_mode == REFRESH_MODE_AFTER_COMMAND &&
+ 		event != WATCH_EVENT_AFTER_EXTERNAL);
+ }
+-- 
+1.9.1
+