Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild

- switch to autosetup macro
- correct license tag

.cvsignore

@@ -1 +0,0 @@
-abook-0.6.0pre2.tar.gz

.gitignore

@@ -0,0 +1,4 @@
+abook-0.6.0pre2.tar.gz
+/abook-git-5840fceb1f91b066a4c4361b0599c417aa111386.zip
+/abook-git-6e550af8a907a680dc845c22a7d6c36d89e900c1.zip
+/abook-0.6.1.tar.gz

0001-fixed-bug-6.patch

@@ -0,0 +1,28 @@
+From 0618ad68a289b10bcc0c5fdbc8a0c8fa71542e4d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rapha=C3=ABl=20Droz?= <raphael.droz+floss@gmail.com>
+Date: Sun, 27 Mar 2016 17:05:44 -0300
+Subject: [PATCH 1/3] fixed bug #6
+
+---
+ filter.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/filter.c b/filter.c
+index 2cb145c..5ae7bd6 100644
+--- a/filter.c
++++ b/filter.c
+@@ -435,8 +435,10 @@ e_write_file(char *filename, int (*func) (FILE *in, struct db_enumerator e),
+ 	if((out = fopen(filename, "a")) == NULL)
+ 		return 1;
+ 
+-	if(ftell(out))
++	if(ftell(out)) {
++		fclose(out);
+ 		return 1;
++	}
+ 
+ 	ret = (*func) (out, enumerator);
+ 
+-- 
+2.13.5
+

0002-doc-manpage-mention-of-the-f-option-fix-for-bug-8.patch

@@ -0,0 +1,54 @@
+From 02ac0ce311deed36679937a4d7ad882bfce29dfc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rapha=C3=ABl=20Droz?= <raphael.droz+floss@gmail.com>
+Date: Sun, 12 Jun 2016 21:33:00 -0300
+Subject: [PATCH 2/3] doc: manpage mention of the -f option (+ fix for bug #8)
+
+---
+ abook.1   | 8 +-------
+ abookrc.5 | 4 ----
+ 2 files changed, 1 insertion(+), 11 deletions(-)
+
+diff --git a/abook.1 b/abook.1
+index 2628200..96d665d 100644
+--- a/abook.1
++++ b/abook.1
+@@ -6,12 +6,6 @@ abook \- text\-based address book program
+ .B abook
+ [ \fIOPTION\fR ]
+ .SH DESCRIPTION
+-This manual page documents briefly the
+-.B abook
+-program.
+-This manual page was written for the Debian GNU/Linux distribution
+-because the original program does not have a manual page.
+-.PP
+ .B abook 
+ is a text-based address book program. It contains Name, Email, Address 
+ and various Phone fields. It is designed for use with mutt, but can be
+@@ -24,7 +18,7 @@ Show usage.
+ \fB\-C \-\-config\fP \fI<filename>\fR
+ Use an alternative configuration file (default is \fI$HOME/.abook/abookrc\fR).
+ .TP
+-\fB\-\-datafile\fP \fI<filename>\fR
++\fB\-f \-\-datafile\fP \fI<filename>\fR
+ Use an alternative addressbook file (default is \fI$HOME/.abook/addressbook\fR).
+ .TP
+ \fB\-\-mutt\-query\fP \fI<string>\fR [ \fB\-\-outformat\fP \fI<outputformat>\fR ]
+diff --git a/abookrc.5 b/abookrc.5
+index 88e05f6..8fbb10b 100644
+--- a/abookrc.5
++++ b/abookrc.5
+@@ -3,10 +3,6 @@
+ .SH NAME
+ \fB$HOME/.abook/abookrc\fP \- configuration file for abook address book program
+ .SH DESCRIPTION
+-This manual page documents briefly the
+-.B abookrc
+-file.
+-.br
+ .B abookrc
+ is the (optional) configuration file for use with the
+ .B abook(1)
+-- 
+2.13.5
+

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: abook
-# $Id$
-NAME := abook
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

abook-extern-inline.patch

@@ -0,0 +1,12 @@
+diff -up abook-0.6.1/database.h.orig abook-0.6.1/database.h
+--- abook-0.6.1/database.h.orig	2015-10-04 04:38:25.000000000 +0200
++++ abook-0.6.1/database.h	2025-01-09 12:40:15.733159868 +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)

abook-preserve.patch

@@ -0,0 +1,24 @@
+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
+ .IP
+-Default is \fIstandard\fP.
++Default is \fIall\fP.
+ 
+ .TP
+ \fBindex_format\fP=format_string
+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 },
+ 
+ 	{ "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 },
+ 	{ "use_mouse", OT_BOOL, BOOL_USE_MOUSE, FALSE },

abook-wcwidth.patch

@@ -0,0 +1,12 @@
+diff -up abook-0.6.1/configure.ac.orig abook-0.6.1/configure.ac
+--- abook-0.6.1/configure.ac.orig	2015-10-04 04:37:39.000000000 +0200
++++ abook-0.6.1/configure.ac	2025-01-09 12:32:06.449796137 +0100
+@@ -61,7 +61,7 @@ AC_CHECK_HEADER(wchar.h,[
+ 	AC_DEFINE(HAVE_WCHAR_H, 1, [Define if you have the <wchar.h> header file.])],
+ 	[ac_have_wchar_h=no])
+ AC_CHECK_FUNCS(mbtowc wcwidth mbrtowc mbsinit,,ac_widec_funcs=no)
+-AC_CHECK_DECLS(wcwidth)
++AC_CHECK_DECLS([wcwidth], [], [], [[#include <wchar.h>]])
+ AC_CHECK_TYPE(wchar_t,,ac_widec_funcs=no)
+ 
+ if test x$ac_widec_funcs = xyes -a x$ac_have_wchar_h = xyes; then

abook.spec

@@ -1,46 +1,207 @@
 Name: abook
-Version: 0.6.0
-Release: 0.2.pre2%{?dist}
-License: GPLv2+
+Version: 0.6.1
+Release: 31%{?dist}
+# GPL-2.0-or-later, except:
+# getopt.[ch]: LGPL-2.0-or-later
+# getopt1.c: LGPL-2.0-or-later
+License: GPL-2.0-or-later AND LGPL-2.0-or-later
 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
-BuildRequires: gettext
+Source0: http://abook.sourceforge.net/devel/abook-%{version}.tar.gz
+# preserve all fields by default
+Patch0: %{name}-preserve.patch
+# 0618ad6 fixed bug #6 (https://sourceforge.net/p/abook/bugs/6/)
+Patch1: 0001-fixed-bug-6.patch
+# 02ac0ce doc: manpage mention of the -f option + fix for bug #8 (https://sourceforge.net/p/abook/bugs/8/)
+Patch2: 0002-doc-manpage-mention-of-the-f-option-fix-for-bug-8.patch
+# fix compilation when used with GCC -std=gnu99 or -std=gnu11
+Patch3: abook-extern-inline.patch
+# Fix detection of wcwidth()
+Patch4: abook-wcwidth.patch
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: gettext-devel
+BuildRequires: make
 BuildRequires: ncurses-devel
 BuildRequires: readline-devel
+BuildRequires: gcc
 Requires: webclient
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 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
+%autosetup -p1
+autoreconf -vif
 
 %build
 %configure
-%{__make} %{?_smp_mflags}
+%make_build
 
 %install
-rm -rf $RPM_BUILD_ROOT
-%{__make} DESTDIR=$RPM_BUILD_ROOT install
+%make_install
 # generate localized files list
 %find_lang %{name}
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files -f %{name}.lang
-%defattr(0644,root,root,0755)
-%doc AUTHORS BUGS COPYING ChangeLog FAQ README RELEASE_NOTES THANKS TODO sample.abookrc
-%attr(0755,root,root) %{_bindir}/abook
+%license COPYING
+%doc AUTHORS BUGS ChangeLog FAQ README RELEASE_NOTES THANKS TODO sample.abookrc
+%{_bindir}/abook
 %{_mandir}/man1/abook.*
 %{_mandir}/man5/abookrc.*
 
 %changelog
+* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1-31
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+
+* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1-30
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1-29
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Thu Jan 09 2025 Dominik Mierzejewski <dominik@greysector.net> - 0.6.1-28
+- fix FTBFS with GCC15 (resolves: rhbz#2336029)
+- switch to autosetup macro
+- correct license tag
+
+* Thu Jul 25 2024 Miroslav Suchý <msuchy@redhat.com> - 0.6.1-27
+- convert license to SPDX
+
+* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1-26
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1-25
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1-24
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1-23
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1-22
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1-20
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Mon Jan 25 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Mon Dec 14 2020 Dominik Mierzejewski <rpm@greysector.net> 0.6.1-17
+- add explicit BR on make
+- use modern macros
+- mark license text accordingly
+
+* Fri Jul 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1-16
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sun Feb 17 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.6.1-12
+- Rebuild for readline 8.0
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Mon Feb 19 2018 Itamar Reis Peixoto <itamar@ispbrasil.com.br> - 0.6.1-9
+- add gcc into buildrequires
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Tue Sep 19 2017 Dominik Mierzejewski <rpm@greysector.net> 0.6.1-7
+- backport fixes from upstream git repo
+
+* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Thu Jan 12 2017 Igor Gnatenko <ignatenko@redhat.com> - 0.6.1-3
+- Rebuild for readline 7.x
+
+* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Sat Nov 07 2015 Dominik Mierzejewski <rpm@greysector.net> 0.6.1-1
+- update to 0.6.1
+- fix build with automake <> 1.14 by running autoreconf
+
+* Tue Jun 16 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.0-0.17.20141128git6e550af
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* 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
+
+* Fri Jun 06 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.0-0.14.20140116git5840fce
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* 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
+- fix bad date in changelog
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.0-0.11.pre2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.0-0.10.pre2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.0-0.9.pre2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.0-0.8.pre2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.0-0.7.pre2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* 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
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.0-0.4.pre2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 0.6.0-0.3.pre2
+- Autorebuild for GCC 4.3
+
 * Sat Aug 25 2007 Dominik Mierzejewski <rpm@greysector.net> 0.6.0-0.2.pre2
 - rebuild for BuildID
 - update license tag
@@ -106,7 +267,7 @@ rm -rf $RPM_BUILD_ROOT
 - updated spec
 - updated to rpm-4.0.3
 
-* Thu Nov 7 2001 Aleksandr Blohin <sass@altlinux.ru> 0.4.15-alt1
+* Wed Nov 7 2001 Aleksandr Blohin <sass@altlinux.ru> 0.4.15-alt1
 - 0.4.15 final
 - spec cleanup
 

sources

@@ -1 +1 @@
-1e4a7210b3507db7b3d47ee7a2457934  abook-0.6.0pre2.tar.gz
+4bffd4c47ac41b688abd58f65bfe0bfb  abook-0.6.1.tar.gz