Merge branch 'f13'

abook-preserve.patch

@@ -0,0 +1,24 @@
+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
+@@ -80,7 +80,7 @@ only preserve the standard fields (see a
+ discards any unknown field.
+ .RE
+ .IP
+-Default is \fIstandard\fP.
++Default is \fIall\fP.
+ 
+ .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
+@@ -64,7 +64,7 @@ static struct option abook_vars[] = {
+ 	{ "use_ascii_only", OT_BOOL, BOOL_USE_ASCII_ONLY, FALSE },
+ 
+ 	{ "add_email_prevent_duplicates", OT_BOOL, BOOL_ADD_EMAIL_PREVENT_DUPLICATES, FALSE },
+-	{ "preserve_fields", OT_STR, STR_PRESERVE_FIELDS, UL "standard" },
++	{ "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 },
+ 

abook.spec

@@ -1,12 +1,13 @@
 Name: abook
 Version: 0.6.0
-Release: 0.5.pre2%{?dist}
+Release: 0.6.pre2%{?dist}
 License: GPLv2+
 URL: http://abook.sourceforge.net/
 Summary: Text-based addressbook program for mutt
 Group: Applications/Productivity
 #Source: http://dl.sourceforge.net/sourceforge/abook/%{name}-%{version}.tar.gz
 Source: http://abook.sourceforge.net/devel/abook-0.6.0pre2.tar.gz
+Patch0: %{name}-preserve.patch
 BuildRequires: gettext
 BuildRequires: ncurses-devel
 BuildRequires: readline-devel
@@ -19,6 +20,7 @@ designed for use with the mutt mail client.
 
 %prep
 %setup -q -n %{name}-%{version}pre2
+%patch0 -p1 -b .p
 
 %build
 %configure
@@ -41,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man5/abookrc.*
 
 %changelog
+* Sat Dec 04 2010 Dominik Mierzejewski <rpm@greysector.net> 0.6.0-0.6.pre2
+- preserve all fields by default (bug #365701), fix based on patch by Stephen Beahm
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.0-0.5.pre2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild