From aaaed7a1d1a1fe00d2bc1c4bdba50eae45a41448 Mon Sep 17 00:00:00 2001
From: Dominik Mierzejewski <rpm@greysector.net>
Date: Feb 27 2014 13:24:32 +0000
Subject: update to the latest git snapshot


- drop obsolete patch
- add comment explaining the preserve patch
- drop some more obsolete specfile parts

---

diff --git a/.gitignore b/.gitignore
index 5a22f21..fddf4e5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 abook-0.6.0pre2.tar.gz
+/abook-git-5840fceb1f91b066a4c4361b0599c417aa111386.zip
diff --git a/abook-autoconf269.patch b/abook-autoconf269.patch
deleted file mode 100644
index 158ea2c..0000000
--- a/abook-autoconf269.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -up abook-0.6.0pre2/configure.in.ac269 abook-0.6.0pre2/configure.in
---- abook-0.6.0pre2/configure.in.ac269	2006-09-05 09:55:35.000000000 +0200
-+++ abook-0.6.0pre2/configure.in	2014-02-27 12:33:06.611880272 +0100
-@@ -42,10 +42,6 @@ dnl ----------------------
- 
- AC_PROG_CC
- AC_ISC_POSIX
--AM_C_PROTOTYPES
--if test "x$U" != "x"; then
--	AC_MSG_ERROR(Compiler not ANSI compliant)
--fi
- AC_C_INLINE
- AC_PROG_INSTALL
- AC_HEADER_STDC
diff --git a/abook-preserve.patch b/abook-preserve.patch
index d384b6d..7a0df04 100644
--- a/abook-preserve.patch
+++ b/abook-preserve.patch
@@ -1,6 +1,6 @@
-diff -up abook-0.6.0pre2/abookrc.5.p abook-0.6.0pre2/abookrc.5
---- abook-0.6.0pre2/abookrc.5.p	2006-09-04 21:24:13.000000000 +0200
-+++ abook-0.6.0pre2/abookrc.5	2010-12-04 18:01:27.000000000 +0100
+diff -up abook-git-5840fceb1f91b066a4c4361b0599c417aa111386/abookrc.5.p abook-git-5840fceb1f91b066a4c4361b0599c417aa111386/abookrc.5
+--- abook-git-5840fceb1f91b066a4c4361b0599c417aa111386/abookrc.5.p	2014-01-16 12:51:40.000000000 +0100
++++ abook-git-5840fceb1f91b066a4c4361b0599c417aa111386/abookrc.5	2014-02-27 13:44:46.473852144 +0100
 @@ -80,7 +80,7 @@ only preserve the standard fields (see a
  discards any unknown field.
  .RE
@@ -10,9 +10,9 @@ diff -up abook-0.6.0pre2/abookrc.5.p abook-0.6.0pre2/abookrc.5
  
  .TP
  \fBindex_format\fP=format_string
-diff -up abook-0.6.0pre2/options.c.p abook-0.6.0pre2/options.c
---- abook-0.6.0pre2/options.c.p	2006-09-06 10:48:33.000000000 +0200
-+++ abook-0.6.0pre2/options.c	2010-12-04 18:01:53.000000000 +0100
+diff -up abook-git-5840fceb1f91b066a4c4361b0599c417aa111386/options.c.p abook-git-5840fceb1f91b066a4c4361b0599c417aa111386/options.c
+--- abook-git-5840fceb1f91b066a4c4361b0599c417aa111386/options.c.p	2014-02-27 13:44:46.474852147 +0100
++++ abook-git-5840fceb1f91b066a4c4361b0599c417aa111386/options.c	2014-02-27 13:45:10.105923099 +0100
 @@ -64,7 +64,7 @@ static struct option abook_vars[] = {
  	{ "use_ascii_only", OT_BOOL, BOOL_USE_ASCII_ONLY, FALSE },
  
@@ -21,4 +21,4 @@ diff -up abook-0.6.0pre2/options.c.p abook-0.6.0pre2/options.c
 +	{ "preserve_fields", OT_STR, STR_PRESERVE_FIELDS, UL "all" },
  	{ "sort_field", OT_STR, STR_SORT_FIELD, UL "nick" },
  	{ "show_cursor", OT_BOOL, BOOL_SHOW_CURSOR, FALSE },
- 
+ 	{ "use_mouse", OT_BOOL, BOOL_USE_MOUSE, FALSE },
diff --git a/abook.spec b/abook.spec
index e9236b1..651da19 100644
--- a/abook.spec
+++ b/abook.spec
@@ -1,16 +1,16 @@
+%global commit 5840fceb1f91b066a4c4361b0599c417aa111386
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+
 Name: abook
 Version: 0.6.0
-Release: 0.12.pre2%{?dist}
+Release: 0.13.20140116git%{shortcommit}%{?dist}
 License: GPLv2+
 URL: http://abook.sourceforge.net/
 Summary: Text-based addressbook program for mutt
-#Source: http://dl.sourceforge.net/sourceforge/abook/%{name}-%{version}.tar.gz
-Source: http://abook.sourceforge.net/devel/abook-0.6.0pre2.tar.gz
+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
-Patch1: %{name}-autoconf269.patch
-BuildRequires: gettext-devel
-BuildRequires: autoconf
-BuildRequires: automake
+BuildRequires: gettext
 BuildRequires: ncurses-devel
 BuildRequires: readline-devel
 Requires: webclient
@@ -20,10 +20,8 @@ Abook is a small and powerful text-based addressbook program
 designed for use with the mutt mail client.
 
 %prep
-%setup -q -n %{name}-%{version}pre2
+%setup -q -n %{name}-git-%{commit}
 %patch0 -p1 -b .p
-%patch1 -p1 -b .ac269
-autoreconf -vif
 
 %build
 %configure
@@ -35,13 +33,19 @@ autoreconf -vif
 %find_lang %{name}
 
 %files -f %{name}.lang
-%defattr(0644,root,root,0755)
+%defattr(-,root,root,-)
 %doc AUTHORS BUGS COPYING ChangeLog FAQ README RELEASE_NOTES THANKS TODO sample.abookrc
-%attr(0755,root,root) %{_bindir}/abook
+%{_bindir}/abook
 %{_mandir}/man1/abook.*
 %{_mandir}/man5/abookrc.*
 
 %changelog
+* Thu Feb 27 2014 Dominik Mierzejewski <rpm@greysector.net> 0.6.0-0.13.20140116git5840fceb
+- update to the latest git snapshot
+- drop obsolete patch
+- add comment explaining the preserve patch
+- drop some more obsolete specfile parts
+
 * Thu Feb 27 2014 Dominik Mierzejewski <rpm@greysector.net> 0.6.0-0.12.pre2
 - fix build on aarch64
 - drop obsolete specfile parts
diff --git a/sources b/sources
index 9805982..7bb87a2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1e4a7210b3507db7b3d47ee7a2457934  abook-0.6.0pre2.tar.gz
+b650a70c1861eddee16a06b72d5b57c8  abook-git-5840fceb1f91b066a4c4361b0599c417aa111386.zip