From 5dee8d61d90da8390f540e74e9ad97507f907926febf8353f1953e4d6935bcc7 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.com>
Date: Fri, 13 Mar 2015 17:22:44 +0000
Subject: [PATCH] Accepting request 290342 from
 home:AndreasStieger:branches:devel:tools:scm

tig 2.1

OBS-URL: https://build.opensuse.org/request/show/290342
OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm/tig?expand=0&rev=34
---
 tig-2.0.3.tar.gz   |  3 ---
 tig-2.1.tar.gz     |  3 +++
 tig-fix-build.diff | 13 -------------
 tig.changes        | 14 ++++++++++++++
 tig.spec           | 25 +++++++++----------------
 5 files changed, 26 insertions(+), 32 deletions(-)
 delete mode 100644 tig-2.0.3.tar.gz
 create mode 100644 tig-2.1.tar.gz
 delete mode 100644 tig-fix-build.diff

diff --git a/tig-2.0.3.tar.gz b/tig-2.0.3.tar.gz
deleted file mode 100644
index f617f9b..0000000
--- a/tig-2.0.3.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:faac0fd80cb771cf34ae0aa9b2fedba1cc0f8aa70731d400661660c8d48f96c4
-size 605513
diff --git a/tig-2.1.tar.gz b/tig-2.1.tar.gz
new file mode 100644
index 0000000..31f4623
--- /dev/null
+++ b/tig-2.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:306287f684f57563a53abf1cf46149e0d30c6b500fbc0c39e9bc059506373cb0
+size 635114
diff --git a/tig-fix-build.diff b/tig-fix-build.diff
deleted file mode 100644
index 2b421f3..0000000
--- a/tig-fix-build.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: Makefile
-===================================================================
---- Makefile.orig
-+++ Makefile
-@@ -37,7 +37,7 @@ RPM_VERLIST = $(filter-out g% dirty,$(su
- RPM_VERSION = $(word 1,$(RPM_VERLIST))
- RPM_RELEASE = $(word 2,$(RPM_VERLIST))$(if $(WTDIRTY),.dirty)
- 
--LDLIBS ?= -lcurses
-+LDLIBS ?= -lncurses
- CFLAGS ?= -Wall -O2
- DFLAGS	= -g -DDEBUG -Werror -O0
- EXE	= src/tig
diff --git a/tig.changes b/tig.changes
index df9ad6b..b325b6d 100644
--- a/tig.changes
+++ b/tig.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Wed Mar 11 19:25:11 UTC 2015 - astieger@suse.com
+
+- tig 2.1:
+  * navigation updates and fixes
+  * UI improvements
+  * speed improvements
+  * Add :exec prompt command
+  * Add :save-options prompt command
+  * documentation updates
+- Replace tig-fix-build.diff, autoconf call with configure option
+- use make install-doc
+- build with readline support
+
 -------------------------------------------------------------------
 Fri Aug 29 07:11:29 UTC 2014 - multyrealm@gmail.com
 
diff --git a/tig.spec b/tig.spec
index 8d945f8..55d37a1 100644
--- a/tig.spec
+++ b/tig.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package tig
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,19 +17,17 @@
 
 
 Name:           tig
-Version:        2.0.3
+Version:        2.1
 Release:        0
 Summary:        An ncurses-based text-mode interface for git
 License:        GPL-2.0+
 Group:          Development/Tools/Version Control
 Url:            http://jonas.nitro.dk/tig/
 Source0:        http://jonas.nitro.dk/tig/releases/tig-%{version}.tar.gz
-Patch0:         tig-fix-build.diff
 Patch1:         tig-remove_build_timestamp.patch
 BuildRequires:  asciidoc
-BuildRequires:  automake
-BuildRequires:  libxslt-tools
 BuildRequires:  ncurses-devel
+BuildRequires:  readline-devel
 Requires:       git-core
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -45,22 +43,17 @@ showing the commit with the log message, diffstat, and the diff.
 
 %prep
 %setup -q
-%patch0
 %patch1
 
 %build
-autoreconf -vi -I contrib
-%configure
-make prefix=%{_prefix} mandir=%{_mandir}
+%configure \
+	--with-ncurses \
+	--docdir=%{_docdir}
+make %{?_smp_mflags} prefix=%{_prefix} mandir=%{_mandir}
 
 %install
 make DESTDIR=%{buildroot} prefix="%{_prefix}" mandir="%{_mandir}" install
-a2x -f manpage -D %{_tmppath} doc/tig.1.adoc
-a2x -f manpage -D %{_tmppath} doc/tigrc.5.adoc
-a2x -f manpage -D %{_tmppath} doc/tigmanual.7.adoc
-install -D -m0644 %{_tmppath}/tig.1       "%{buildroot}/%{_mandir}/man1/tig.1"
-install -D -m0644 %{_tmppath}/tigrc.5     "%{buildroot}/%{_mandir}/man5/tigrc.5"
-install -D -m0644 %{_tmppath}/tigmanual.7 "%{buildroot}/%{_mandir}/man7/tigmanual.7"
+make DESTDIR=%{buildroot} prefix="%{_prefix}" mandir="%{_mandir}" install-doc
 
 %files
 %defattr(-,root,root)
@@ -69,6 +62,6 @@ install -D -m0644 %{_tmppath}/tigmanual.7 "%{buildroot}/%{_mandir}/man7/tigmanua
 %doc %{_mandir}/man1/tig.1%{ext_man}
 %doc %{_mandir}/man5/tigrc.5%{ext_man}
 %doc %{_mandir}/man7/tigmanual.7%{ext_man}
-%config /etc/tigrc
+%config %{_sysconfdir}/tigrc
 
 %changelog