From 690c9e8153007a0de564b4602f028a13382b2f17 Mon Sep 17 00:00:00 2001
From: Dominik Mierzejewski <rpm@greysector.net>
Date: Feb 11 2015 15:07:13 +0000
Subject: update to the latest git snapshot


- fix build with gcc-5.0

---

diff --git a/.gitignore b/.gitignore
index fddf4e5..b9d89e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 abook-0.6.0pre2.tar.gz
 /abook-git-5840fceb1f91b066a4c4361b0599c417aa111386.zip
+/abook-git-6e550af8a907a680dc845c22a7d6c36d89e900c1.zip
diff --git a/abook-gcc5.patch b/abook-gcc5.patch
new file mode 100644
index 0000000..e742218
--- /dev/null
+++ b/abook-gcc5.patch
@@ -0,0 +1,24 @@
+diff -up abook-git-6e550af8a907a680dc845c22a7d6c36d89e900c1/database.c.gcc5 abook-git-6e550af8a907a680dc845c22a7d6c36d89e900c1/database.c
+--- abook-git-6e550af8a907a680dc845c22a7d6c36d89e900c1/database.c.gcc5	2014-11-28 16:29:52.000000000 +0100
++++ abook-git-6e550af8a907a680dc845c22a7d6c36d89e900c1/database.c	2015-02-11 16:02:15.837789303 +0100
+@@ -859,7 +859,7 @@ item_merge(list_item dest, list_item src
+  */
+ 
+ /* quick lookup by "standard" field number */
+-inline int
++extern inline int
+ field_id(int i)
+ {
+ 	assert((i >= 0) && (i < ITEM_FIELDS));
+diff -up abook-git-6e550af8a907a680dc845c22a7d6c36d89e900c1/database.h.gcc5 abook-git-6e550af8a907a680dc845c22a7d6c36d89e900c1/database.h
+--- abook-git-6e550af8a907a680dc845c22a7d6c36d89e900c1/database.h.gcc5	2014-11-28 16:29:52.000000000 +0100
++++ abook-git-6e550af8a907a680dc845c22a7d6c36d89e900c1/database.h	2015-02-11 16:02:23.465818915 +0100
+@@ -61,7 +61,7 @@ struct db_enumerator {
+ /*
+  * Field operations
+  */
+-inline int field_id(int i);
++extern inline int field_id(int i);
+ abook_field *find_standard_field(char *key, int do_declare);
+ abook_field *real_find_field(char *key, abook_field_list *list, int *nb);
+ #define find_field(key, list)		real_find_field(key, list, NULL)
diff --git a/abook.spec b/abook.spec
index 09fc082..798b3b8 100644
--- a/abook.spec
+++ b/abook.spec
@@ -1,15 +1,17 @@
-%global commit 5840fceb1f91b066a4c4361b0599c417aa111386
+%global commit 6e550af8a907a680dc845c22a7d6c36d89e900c1
 %global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 Name: abook
 Version: 0.6.0
-Release: 0.15.20140116git%{shortcommit}%{?dist}
+Release: 0.16.20141128git%{shortcommit}%{?dist}
 License: GPLv2+
 URL: http://abook.sourceforge.net/
 Summary: Text-based addressbook program for mutt
 Source0: http://sourceforge.net/code-snapshots/git/a/ab/abook/git.git/abook-git-%{commit}.zip
 # preserve all fields by default
 Patch0: %{name}-preserve.patch
+# fix build with gcc-5.0
+Patch1: %{name}-gcc5.patch
 BuildRequires: gettext
 BuildRequires: ncurses-devel
 BuildRequires: readline-devel
@@ -22,6 +24,7 @@ designed for use with the mutt mail client.
 %prep
 %setup -q -n %{name}-git-%{commit}
 %patch0 -p1 -b .p
+%patch1 -p1 -b .gcc5
 
 %build
 %configure
@@ -40,6 +43,10 @@ designed for use with the mutt mail client.
 %{_mandir}/man5/abookrc.*
 
 %changelog
+* Wed Feb 11 2015 Dominik Mierzejewski <rpm@greysector.net> 0.6.0-0.16.20141128git6e550af
+- update to the latest git snapshot
+- fix build with gcc-5.0
+
 * Fri Aug 15 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.0-0.15.20140116git5840fce
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
diff --git a/sources b/sources
index 7bb87a2..6f71286 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b650a70c1861eddee16a06b72d5b57c8  abook-git-5840fceb1f91b066a4c4361b0599c417aa111386.zip
+e0ce3e70973572c1597ec359be64dbf9  abook-git-6e550af8a907a680dc845c22a7d6c36d89e900c1.zip