From 3ddb3bedca1b2d39870ab7a222491280bd497ae6 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 19 Feb 2008 20:31:29 +0000 Subject: [PATCH 01/59] - Autorebuild for GCC 4.3 --- abook.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abook.spec b/abook.spec index 126bc64..0b2d7df 100644 --- a/abook.spec +++ b/abook.spec @@ -1,6 +1,6 @@ Name: abook Version: 0.6.0 -Release: 0.2.pre2%{?dist} +Release: 0.3.pre2%{?dist} License: GPLv2+ URL: http://abook.sourceforge.net/ Summary: Text-based addressbook program for mutt @@ -41,6 +41,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man5/abookrc.* %changelog +* Tue Feb 19 2008 Fedora Release Engineering - 0.6.0-0.3.pre2 +- Autorebuild for GCC 4.3 + * Sat Aug 25 2007 Dominik Mierzejewski 0.6.0-0.2.pre2 - rebuild for BuildID - update license tag From ed0f3644fd593c5470b5a30959d8131ed4b8e429 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Mon, 23 Feb 2009 23:56:34 +0000 Subject: [PATCH 02/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- abook.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abook.spec b/abook.spec index 0b2d7df..f8b081f 100644 --- a/abook.spec +++ b/abook.spec @@ -1,6 +1,6 @@ Name: abook Version: 0.6.0 -Release: 0.3.pre2%{?dist} +Release: 0.4.pre2%{?dist} License: GPLv2+ URL: http://abook.sourceforge.net/ Summary: Text-based addressbook program for mutt @@ -41,6 +41,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man5/abookrc.* %changelog +* Mon Feb 23 2009 Fedora Release Engineering - 0.6.0-0.4.pre2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Tue Feb 19 2008 Fedora Release Engineering - 0.6.0-0.3.pre2 - Autorebuild for GCC 4.3 From 29bc77a4dda8778110ec9391c3606ab5a86a4eec Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 24 Jul 2009 16:31:01 +0000 Subject: [PATCH 03/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- abook.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abook.spec b/abook.spec index f8b081f..1af319c 100644 --- a/abook.spec +++ b/abook.spec @@ -1,6 +1,6 @@ Name: abook Version: 0.6.0 -Release: 0.4.pre2%{?dist} +Release: 0.5.pre2%{?dist} License: GPLv2+ URL: http://abook.sourceforge.net/ Summary: Text-based addressbook program for mutt @@ -41,6 +41,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man5/abookrc.* %changelog +* Fri Jul 24 2009 Fedora Release Engineering - 0.6.0-0.5.pre2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Mon Feb 23 2009 Fedora Release Engineering - 0.6.0-0.4.pre2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From 2f65eacba3a1d0bab6e92e035805fd3dc03ef74b Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 29 Sep 2009 08:15:32 +0000 Subject: [PATCH 04/59] Initialize branch F-12 for abook --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..06de2d2 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-12 From 8636ff8c9b234250999c73b59f82aefebe599164 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:38:09 +0000 Subject: [PATCH 05/59] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e9c6aa3..ce6a3fa 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ 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 +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 235300c982cc2d5a648a1e624d0f05b87a6766db Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:24:29 +0000 Subject: [PATCH 06/59] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e9c6aa3..ce6a3fa 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ 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 +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 297f2fa22918119ee366a54f047f1057f8dc6111 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 17 Feb 2010 00:49:52 +0000 Subject: [PATCH 07/59] Initialize branch F-13 for abook --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..baa94ef --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-13 From f3dfb4ba2cae3ad8b63f020edaeb5e931776775a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:33:23 +0000 Subject: [PATCH 08/59] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index ce6a3fa..0000000 --- a/Makefile +++ /dev/null @@ -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 $$d/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) diff --git a/branch b/branch deleted file mode 100644 index baa94ef..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-13 From e2f3b68d5c49a39cc9cf843a8253c3b17f3c5b60 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:33:24 +0000 Subject: [PATCH 09/59] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index ce6a3fa..0000000 --- a/Makefile +++ /dev/null @@ -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 $$d/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) diff --git a/branch b/branch deleted file mode 100644 index 06de2d2..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-12 From 3f8120aac29e201b3d37d08c4713b77262344e16 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:33:25 +0000 Subject: [PATCH 10/59] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index ce6a3fa..0000000 --- a/Makefile +++ /dev/null @@ -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 $$d/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) From 488650cbccec22f0c06ab1a22df8414ea86af5e1 Mon Sep 17 00:00:00 2001 From: Dominik Mierzejewski Date: Sat, 4 Dec 2010 18:07:20 +0100 Subject: [PATCH 11/59] - preserve all fields by default (bug #365701), fix based on patch by Stephen Beahm --- abook-preserve.patch | 24 ++++++++++++++++++++++++ abook.spec | 7 ++++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 abook-preserve.patch diff --git a/abook-preserve.patch b/abook-preserve.patch new file mode 100644 index 0000000..d384b6d --- /dev/null +++ b/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 }, + diff --git a/abook.spec b/abook.spec index 1af319c..eecdc42 100644 --- a/abook.spec +++ b/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 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 - 0.6.0-0.5.pre2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From 0ed0bdb9e1356617bd5334bfb95fbad82f3b02f4 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 18:09:23 -0600 Subject: [PATCH 12/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- abook.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abook.spec b/abook.spec index eecdc42..842a3b5 100644 --- a/abook.spec +++ b/abook.spec @@ -1,6 +1,6 @@ Name: abook Version: 0.6.0 -Release: 0.6.pre2%{?dist} +Release: 0.7.pre2%{?dist} License: GPLv2+ URL: http://abook.sourceforge.net/ Summary: Text-based addressbook program for mutt @@ -43,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man5/abookrc.* %changelog +* Mon Feb 07 2011 Fedora Release Engineering - 0.6.0-0.7.pre2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Sat Dec 04 2010 Dominik Mierzejewski 0.6.0-0.6.pre2 - preserve all fields by default (bug #365701), fix based on patch by Stephen Beahm From 4223be3845b712cfadd523e8fef53adffca6d248 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 12 Jan 2012 14:57:43 -0600 Subject: [PATCH 13/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- abook.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abook.spec b/abook.spec index 842a3b5..d8d0ed9 100644 --- a/abook.spec +++ b/abook.spec @@ -1,6 +1,6 @@ Name: abook Version: 0.6.0 -Release: 0.7.pre2%{?dist} +Release: 0.8.pre2%{?dist} License: GPLv2+ URL: http://abook.sourceforge.net/ Summary: Text-based addressbook program for mutt @@ -43,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man5/abookrc.* %changelog +* Thu Jan 12 2012 Fedora Release Engineering - 0.6.0-0.8.pre2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Mon Feb 07 2011 Fedora Release Engineering - 0.6.0-0.7.pre2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 5598cc75e31bee5195867f0ddf2bb97412d6710e Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 18 Jul 2012 10:28:56 -0500 Subject: [PATCH 14/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- abook.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abook.spec b/abook.spec index d8d0ed9..67b420d 100644 --- a/abook.spec +++ b/abook.spec @@ -1,6 +1,6 @@ Name: abook Version: 0.6.0 -Release: 0.8.pre2%{?dist} +Release: 0.9.pre2%{?dist} License: GPLv2+ URL: http://abook.sourceforge.net/ Summary: Text-based addressbook program for mutt @@ -43,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man5/abookrc.* %changelog +* Wed Jul 18 2012 Fedora Release Engineering - 0.6.0-0.9.pre2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Thu Jan 12 2012 Fedora Release Engineering - 0.6.0-0.8.pre2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 820c414858032a0eb964b099164a45cc29c48ec8 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 13 Feb 2013 10:13:18 -0600 Subject: [PATCH 15/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- abook.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abook.spec b/abook.spec index 67b420d..6b63a88 100644 --- a/abook.spec +++ b/abook.spec @@ -1,6 +1,6 @@ Name: abook Version: 0.6.0 -Release: 0.9.pre2%{?dist} +Release: 0.10.pre2%{?dist} License: GPLv2+ URL: http://abook.sourceforge.net/ Summary: Text-based addressbook program for mutt @@ -43,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man5/abookrc.* %changelog +* Wed Feb 13 2013 Fedora Release Engineering - 0.6.0-0.10.pre2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Wed Jul 18 2012 Fedora Release Engineering - 0.6.0-0.9.pre2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From b1cd88889627e8cad7da420d734bdcad4b0866e6 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 2 Aug 2013 19:08:27 -0500 Subject: [PATCH 16/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- abook.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abook.spec b/abook.spec index 6b63a88..08b026d 100644 --- a/abook.spec +++ b/abook.spec @@ -1,6 +1,6 @@ Name: abook Version: 0.6.0 -Release: 0.10.pre2%{?dist} +Release: 0.11.pre2%{?dist} License: GPLv2+ URL: http://abook.sourceforge.net/ Summary: Text-based addressbook program for mutt @@ -43,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man5/abookrc.* %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 0.6.0-0.11.pre2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Wed Feb 13 2013 Fedora Release Engineering - 0.6.0-0.10.pre2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From a8c053575eff526db21b26843076262aea34a1cc Mon Sep 17 00:00:00 2001 From: Dominik Mierzejewski Date: Thu, 27 Feb 2014 13:03:47 +0100 Subject: [PATCH 17/59] minor fixes - fix build on aarch64 - drop obsolete specfile parts - fix bad date in changelog --- abook-autoconf269.patch | 14 ++++++++++++++ abook.spec | 22 +++++++++++++--------- 2 files changed, 27 insertions(+), 9 deletions(-) create mode 100644 abook-autoconf269.patch diff --git a/abook-autoconf269.patch b/abook-autoconf269.patch new file mode 100644 index 0000000..158ea2c --- /dev/null +++ b/abook-autoconf269.patch @@ -0,0 +1,14 @@ +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.spec b/abook.spec index 08b026d..e9236b1 100644 --- a/abook.spec +++ b/abook.spec @@ -1,18 +1,19 @@ Name: abook Version: 0.6.0 -Release: 0.11.pre2%{?dist} +Release: 0.12.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 +Patch1: %{name}-autoconf269.patch +BuildRequires: gettext-devel +BuildRequires: autoconf +BuildRequires: automake BuildRequires: ncurses-devel BuildRequires: readline-devel Requires: webclient -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description Abook is a small and powerful text-based addressbook program @@ -21,20 +22,18 @@ designed for use with the mutt mail client. %prep %setup -q -n %{name}-%{version}pre2 %patch0 -p1 -b .p +%patch1 -p1 -b .ac269 +autoreconf -vif %build %configure %{__make} %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT %{__make} DESTDIR=$RPM_BUILD_ROOT 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 @@ -43,6 +42,11 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man5/abookrc.* %changelog +* Thu Feb 27 2014 Dominik Mierzejewski 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 - 0.6.0-0.11.pre2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild @@ -135,7 +139,7 @@ rm -rf $RPM_BUILD_ROOT - updated spec - updated to rpm-4.0.3 -* Thu Nov 7 2001 Aleksandr Blohin 0.4.15-alt1 +* Wed Nov 7 2001 Aleksandr Blohin 0.4.15-alt1 - 0.4.15 final - spec cleanup From aaaed7a1d1a1fe00d2bc1c4bdba50eae45a41448 Mon Sep 17 00:00:00 2001 From: Dominik Mierzejewski Date: Thu, 27 Feb 2014 14:24:32 +0100 Subject: [PATCH 18/59] update to the latest git snapshot - drop obsolete patch - add comment explaining the preserve patch - drop some more obsolete specfile parts --- .gitignore | 1 + abook-autoconf269.patch | 14 -------------- abook-preserve.patch | 14 +++++++------- abook.spec | 28 ++++++++++++++++------------ sources | 2 +- 5 files changed, 25 insertions(+), 34 deletions(-) delete mode 100644 abook-autoconf269.patch 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 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 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 From 48371469c9796b00406fca005d86cb11e660e252 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 6 Jun 2014 18:59:05 -0500 Subject: [PATCH 19/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- abook.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abook.spec b/abook.spec index 651da19..f295da6 100644 --- a/abook.spec +++ b/abook.spec @@ -3,7 +3,7 @@ Name: abook Version: 0.6.0 -Release: 0.13.20140116git%{shortcommit}%{?dist} +Release: 0.14.20140116git%{shortcommit}%{?dist} License: GPLv2+ URL: http://abook.sourceforge.net/ Summary: Text-based addressbook program for mutt @@ -40,6 +40,9 @@ designed for use with the mutt mail client. %{_mandir}/man5/abookrc.* %changelog +* Fri Jun 06 2014 Fedora Release Engineering - 0.6.0-0.14.20140116git5840fce +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Thu Feb 27 2014 Dominik Mierzejewski 0.6.0-0.13.20140116git5840fceb - update to the latest git snapshot - drop obsolete patch From 4f6a4ec55bd5ea5101e663377efab98f6af7ea9c Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Fri, 15 Aug 2014 19:53:21 +0000 Subject: [PATCH 20/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- abook.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abook.spec b/abook.spec index f295da6..09fc082 100644 --- a/abook.spec +++ b/abook.spec @@ -3,7 +3,7 @@ Name: abook Version: 0.6.0 -Release: 0.14.20140116git%{shortcommit}%{?dist} +Release: 0.15.20140116git%{shortcommit}%{?dist} License: GPLv2+ URL: http://abook.sourceforge.net/ Summary: Text-based addressbook program for mutt @@ -40,6 +40,9 @@ designed for use with the mutt mail client. %{_mandir}/man5/abookrc.* %changelog +* Fri Aug 15 2014 Fedora Release Engineering - 0.6.0-0.15.20140116git5840fce +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Fri Jun 06 2014 Fedora Release Engineering - 0.6.0-0.14.20140116git5840fce - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 690c9e8153007a0de564b4602f028a13382b2f17 Mon Sep 17 00:00:00 2001 From: Dominik Mierzejewski Date: Wed, 11 Feb 2015 16:07:13 +0100 Subject: [PATCH 21/59] update to the latest git snapshot - fix build with gcc-5.0 --- .gitignore | 1 + abook-gcc5.patch | 24 ++++++++++++++++++++++++ abook.spec | 11 +++++++++-- sources | 2 +- 4 files changed, 35 insertions(+), 3 deletions(-) create mode 100644 abook-gcc5.patch 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 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 - 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 From 7000d3ed35d198d3ca14acd9e03df2ac394608d8 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 16 Jun 2015 23:33:01 +0000 Subject: [PATCH 22/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- abook.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abook.spec b/abook.spec index 798b3b8..8bcae29 100644 --- a/abook.spec +++ b/abook.spec @@ -3,7 +3,7 @@ Name: abook Version: 0.6.0 -Release: 0.16.20141128git%{shortcommit}%{?dist} +Release: 0.17.20141128git%{shortcommit}%{?dist} License: GPLv2+ URL: http://abook.sourceforge.net/ Summary: Text-based addressbook program for mutt @@ -43,6 +43,9 @@ designed for use with the mutt mail client. %{_mandir}/man5/abookrc.* %changelog +* Tue Jun 16 2015 Fedora Release Engineering - 0.6.0-0.17.20141128git6e550af +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Wed Feb 11 2015 Dominik Mierzejewski 0.6.0-0.16.20141128git6e550af - update to the latest git snapshot - fix build with gcc-5.0 From 011c13d6a3ebd94cca9aecef8ee5a598a51a582a Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Sat, 7 Nov 2015 13:03:21 +0100 Subject: [PATCH 23/59] update to 0.6.1 - fix build with automake <> 1.14 by running autoreconf --- .gitignore | 1 + abook.spec | 14 ++++++++++---- sources | 2 +- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index b9d89e8..91908c5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ abook-0.6.0pre2.tar.gz /abook-git-5840fceb1f91b066a4c4361b0599c417aa111386.zip /abook-git-6e550af8a907a680dc845c22a7d6c36d89e900c1.zip +/abook-0.6.1.tar.gz diff --git a/abook.spec b/abook.spec index 8bcae29..dd054bd 100644 --- a/abook.spec +++ b/abook.spec @@ -2,16 +2,17 @@ %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: abook -Version: 0.6.0 -Release: 0.17.20141128git%{shortcommit}%{?dist} +Version: 0.6.1 +Release: 1%{?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 +Source0: http://abook.sourceforge.net/devel/abook-%{version}.tar.gz # preserve all fields by default Patch0: %{name}-preserve.patch # fix build with gcc-5.0 Patch1: %{name}-gcc5.patch +BuildRequires: %{_bindir}/autopoint BuildRequires: gettext BuildRequires: ncurses-devel BuildRequires: readline-devel @@ -22,9 +23,10 @@ Abook is a small and powerful text-based addressbook program designed for use with the mutt mail client. %prep -%setup -q -n %{name}-git-%{commit} +%setup -q %patch0 -p1 -b .p %patch1 -p1 -b .gcc5 +autoreconf -vif %build %configure @@ -43,6 +45,10 @@ designed for use with the mutt mail client. %{_mandir}/man5/abookrc.* %changelog +* Sat Nov 07 2015 Dominik Mierzejewski 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 - 0.6.0-0.17.20141128git6e550af - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index 6f71286..2347819 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e0ce3e70973572c1597ec359be64dbf9 abook-git-6e550af8a907a680dc845c22a7d6c36d89e900c1.zip +4bffd4c47ac41b688abd58f65bfe0bfb abook-0.6.1.tar.gz From 28e660963cbc56707cedb491b504b6fcaf1c4f35 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Sat, 7 Nov 2015 13:30:04 +0100 Subject: [PATCH 24/59] fix build dependencies --- abook.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/abook.spec b/abook.spec index dd054bd..b946ec3 100644 --- a/abook.spec +++ b/abook.spec @@ -12,8 +12,8 @@ Source0: http://abook.sourceforge.net/devel/abook-%{version}.tar.gz Patch0: %{name}-preserve.patch # fix build with gcc-5.0 Patch1: %{name}-gcc5.patch -BuildRequires: %{_bindir}/autopoint -BuildRequires: gettext +BuildRequires: autoconf +BuildRequires: gettext-devel BuildRequires: ncurses-devel BuildRequires: readline-devel Requires: webclient From 207eaaafb96d754bf9fa901514586f10cb2c6d2e Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Sat, 7 Nov 2015 13:34:45 +0100 Subject: [PATCH 25/59] add missing build dependency --- abook.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/abook.spec b/abook.spec index b946ec3..51faf18 100644 --- a/abook.spec +++ b/abook.spec @@ -13,6 +13,7 @@ Patch0: %{name}-preserve.patch # fix build with gcc-5.0 Patch1: %{name}-gcc5.patch BuildRequires: autoconf +BuildRequires: automake BuildRequires: gettext-devel BuildRequires: ncurses-devel BuildRequires: readline-devel From 46a0a375d5092ec85ae0a332e5c8a6d8d689cafb Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 15:56:00 +0000 Subject: [PATCH 26/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- abook.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abook.spec b/abook.spec index 51faf18..29f8267 100644 --- a/abook.spec +++ b/abook.spec @@ -3,7 +3,7 @@ Name: abook Version: 0.6.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: http://abook.sourceforge.net/ Summary: Text-based addressbook program for mutt @@ -46,6 +46,9 @@ autoreconf -vif %{_mandir}/man5/abookrc.* %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 0.6.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Sat Nov 07 2015 Dominik Mierzejewski 0.6.1-1 - update to 0.6.1 - fix build with automake <> 1.14 by running autoreconf From aad0341ae52851f20fd816bf08e3350fb6165b00 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Thu, 12 Jan 2017 17:30:23 +0100 Subject: [PATCH 27/59] Rebuild for readline 7.x Signed-off-by: Igor Gnatenko --- abook.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abook.spec b/abook.spec index 29f8267..f335ce7 100644 --- a/abook.spec +++ b/abook.spec @@ -3,7 +3,7 @@ Name: abook Version: 0.6.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ URL: http://abook.sourceforge.net/ Summary: Text-based addressbook program for mutt @@ -46,6 +46,9 @@ autoreconf -vif %{_mandir}/man5/abookrc.* %changelog +* Thu Jan 12 2017 Igor Gnatenko - 0.6.1-3 +- Rebuild for readline 7.x + * Wed Feb 03 2016 Fedora Release Engineering - 0.6.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From edee3ccb51c9c5e751ee5068e19108a51360cb83 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 05:41:18 +0000 Subject: [PATCH 28/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- abook.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abook.spec b/abook.spec index f335ce7..4e83e96 100644 --- a/abook.spec +++ b/abook.spec @@ -3,7 +3,7 @@ Name: abook Version: 0.6.1 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ URL: http://abook.sourceforge.net/ Summary: Text-based addressbook program for mutt @@ -46,6 +46,9 @@ autoreconf -vif %{_mandir}/man5/abookrc.* %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 0.6.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Thu Jan 12 2017 Igor Gnatenko - 0.6.1-3 - Rebuild for readline 7.x From a9e06323535f96c1e7e993a4f15ccdc9bc27ef91 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 02:31:32 +0000 Subject: [PATCH 29/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- abook.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abook.spec b/abook.spec index 4e83e96..cd17f2d 100644 --- a/abook.spec +++ b/abook.spec @@ -3,7 +3,7 @@ Name: abook Version: 0.6.1 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ URL: http://abook.sourceforge.net/ Summary: Text-based addressbook program for mutt @@ -46,6 +46,9 @@ autoreconf -vif %{_mandir}/man5/abookrc.* %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 0.6.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Feb 10 2017 Fedora Release Engineering - 0.6.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 911b6dce5bb812c49ebdf5ec028004d8c52921af Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 2 Aug 2017 17:21:11 +0000 Subject: [PATCH 30/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- abook.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abook.spec b/abook.spec index cd17f2d..298a4d1 100644 --- a/abook.spec +++ b/abook.spec @@ -3,7 +3,7 @@ Name: abook Version: 0.6.1 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ URL: http://abook.sourceforge.net/ Summary: Text-based addressbook program for mutt @@ -46,6 +46,9 @@ autoreconf -vif %{_mandir}/man5/abookrc.* %changelog +* Wed Aug 02 2017 Fedora Release Engineering - 0.6.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 0.6.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From eb640f2a15308a0d27664675f845ec91f40f82f1 Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Wed, 20 Sep 2017 17:57:11 +0200 Subject: [PATCH 31/59] backport fixes from upstream git repo --- 0001-fixed-bug-6.patch | 28 ++++++++++ ...ention-of-the-f-option-fix-for-bug-8.patch | 54 +++++++++++++++++++ ...ation-when-used-with-GCC-std-gnu99-o.patch | 41 ++++++++++++++ abook-gcc5.patch | 24 --------- abook.spec | 17 ++++-- 5 files changed, 136 insertions(+), 28 deletions(-) create mode 100644 0001-fixed-bug-6.patch create mode 100644 0002-doc-manpage-mention-of-the-f-option-fix-for-bug-8.patch create mode 100644 0003-build-fix-compilation-when-used-with-GCC-std-gnu99-o.patch delete mode 100644 abook-gcc5.patch diff --git a/0001-fixed-bug-6.patch b/0001-fixed-bug-6.patch new file mode 100644 index 0000000..d0b582f --- /dev/null +++ b/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?= +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 + diff --git a/0002-doc-manpage-mention-of-the-f-option-fix-for-bug-8.patch b/0002-doc-manpage-mention-of-the-f-option-fix-for-bug-8.patch new file mode 100644 index 0000000..04a921e --- /dev/null +++ b/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?= +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\fR + Use an alternative configuration file (default is \fI$HOME/.abook/abookrc\fR). + .TP +-\fB\-\-datafile\fP \fI\fR ++\fB\-f \-\-datafile\fP \fI\fR + Use an alternative addressbook file (default is \fI$HOME/.abook/addressbook\fR). + .TP + \fB\-\-mutt\-query\fP \fI\fR [ \fB\-\-outformat\fP \fI\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 + diff --git a/0003-build-fix-compilation-when-used-with-GCC-std-gnu99-o.patch b/0003-build-fix-compilation-when-used-with-GCC-std-gnu99-o.patch new file mode 100644 index 0000000..9562860 --- /dev/null +++ b/0003-build-fix-compilation-when-used-with-GCC-std-gnu99-o.patch @@ -0,0 +1,41 @@ +From 54f8e4ac4e0bdf7622909c4cdf5768bebe72460c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Rapha=C3=ABl=20Droz?= +Date: Sun, 12 Jun 2016 23:14:12 -0300 +Subject: [PATCH 3/3] build: fix compilation when used with GCC -std=gnu99 or + -std=gnu11 (default in GCC 5.0) * derived from patch #6 * fix Debian bug + #777764 + +--- + configure | 2 +- + configure.ac | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure b/configure +index b09897b..86016ed 100755 +--- a/configure ++++ b/configure +@@ -8431,7 +8431,7 @@ if test x$debug = xtrue; then + fi + + if test x$GCC = xyes; then +- CFLAGS="-Wall $CFLAGS" ++ CFLAGS="-Wall -fgnu89-inline $CFLAGS" + fi + + ac_config_files="$ac_config_files Makefile abook.spec po/Makefile.in" +diff --git a/configure.ac b/configure.ac +index 5a9ae3b..bcb0a58 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -175,7 +175,7 @@ if test x$debug = xtrue; then + fi + + if test x$GCC = xyes; then +- CFLAGS="-Wall $CFLAGS" ++ CFLAGS="-Wall -fgnu89-inline $CFLAGS" + fi + + AC_CONFIG_FILES([Makefile abook.spec po/Makefile.in]) +-- +2.13.5 + diff --git a/abook-gcc5.patch b/abook-gcc5.patch deleted file mode 100644 index e742218..0000000 --- a/abook-gcc5.patch +++ /dev/null @@ -1,24 +0,0 @@ -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 51faf18..e7e6c78 100644 --- a/abook.spec +++ b/abook.spec @@ -3,15 +3,19 @@ Name: abook Version: 0.6.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: http://abook.sourceforge.net/ Summary: Text-based addressbook program for mutt Source0: http://abook.sourceforge.net/devel/abook-%{version}.tar.gz # preserve all fields by default Patch0: %{name}-preserve.patch -# fix build with gcc-5.0 -Patch1: %{name}-gcc5.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 +# 54f8e4a build: fix compilation when used with GCC -std=gnu99 or -std=gnu11 +Patch3: 0003-build-fix-compilation-when-used-with-GCC-std-gnu99-o.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: gettext-devel @@ -26,7 +30,9 @@ designed for use with the mutt mail client. %prep %setup -q %patch0 -p1 -b .p -%patch1 -p1 -b .gcc5 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 autoreconf -vif %build @@ -46,6 +52,9 @@ autoreconf -vif %{_mandir}/man5/abookrc.* %changelog +* Tue Sep 19 2017 Dominik Mierzejewski 0.6.1-2 +- backport fixes from upstream git repo + * Sat Nov 07 2015 Dominik Mierzejewski 0.6.1-1 - update to 0.6.1 - fix build with automake <> 1.14 by running autoreconf From c1268d89b779f52eba25b3eba32555abb463b23f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 01:45:22 +0000 Subject: [PATCH 32/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- abook.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abook.spec b/abook.spec index d57a9f3..ff22fdc 100644 --- a/abook.spec +++ b/abook.spec @@ -3,7 +3,7 @@ Name: abook Version: 0.6.1 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2+ URL: http://abook.sourceforge.net/ Summary: Text-based addressbook program for mutt @@ -52,6 +52,9 @@ autoreconf -vif %{_mandir}/man5/abookrc.* %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 0.6.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Tue Sep 19 2017 Dominik Mierzejewski 0.6.1-7 - backport fixes from upstream git repo From 0452f180d24a2b04a3de57c33b747b2ef8354e21 Mon Sep 17 00:00:00 2001 From: Itamar Reis Peixoto Date: Mon, 19 Feb 2018 11:59:19 -0300 Subject: [PATCH 33/59] add gcc into buildrequires --- abook.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/abook.spec b/abook.spec index ff22fdc..2d8f832 100644 --- a/abook.spec +++ b/abook.spec @@ -3,7 +3,7 @@ Name: abook Version: 0.6.1 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv2+ URL: http://abook.sourceforge.net/ Summary: Text-based addressbook program for mutt @@ -21,6 +21,7 @@ BuildRequires: automake BuildRequires: gettext-devel BuildRequires: ncurses-devel BuildRequires: readline-devel +BuildRequires: gcc Requires: webclient %description @@ -52,6 +53,9 @@ autoreconf -vif %{_mandir}/man5/abookrc.* %changelog +* Mon Feb 19 2018 itamar - 0.6.1-9 +- add gcc into buildrequires + * Wed Feb 07 2018 Fedora Release Engineering - 0.6.1-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From eaf3a70a5ad9f9d976ac03e04ee78e5edaedede4 Mon Sep 17 00:00:00 2001 From: Itamar Reis Peixoto Date: Mon, 19 Feb 2018 12:02:02 -0300 Subject: [PATCH 34/59] fix changelog --- abook.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/abook.spec b/abook.spec index 2d8f832..c8da182 100644 --- a/abook.spec +++ b/abook.spec @@ -53,7 +53,7 @@ autoreconf -vif %{_mandir}/man5/abookrc.* %changelog -* Mon Feb 19 2018 itamar - 0.6.1-9 +* Mon Feb 19 2018 Itamar Reis Peixoto - 0.6.1-9 - add gcc into buildrequires * Wed Feb 07 2018 Fedora Release Engineering - 0.6.1-8 From 115ae79ec2b00705bb262d5815066bb5e683d367 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Tue, 10 Jul 2018 00:09:04 -0500 Subject: [PATCH 35/59] Remove needless use of %defattr --- abook.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/abook.spec b/abook.spec index c8da182..3dd46ed 100644 --- a/abook.spec +++ b/abook.spec @@ -46,7 +46,6 @@ autoreconf -vif %find_lang %{name} %files -f %{name}.lang -%defattr(-,root,root,-) %doc AUTHORS BUGS COPYING ChangeLog FAQ README RELEASE_NOTES THANKS TODO sample.abookrc %{_bindir}/abook %{_mandir}/man1/abook.* From d9326fe7f8926706574be85617e7d8fe05e0ac04 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 12 Jul 2018 19:56:01 +0000 Subject: [PATCH 36/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- abook.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abook.spec b/abook.spec index 3dd46ed..82b1618 100644 --- a/abook.spec +++ b/abook.spec @@ -3,7 +3,7 @@ Name: abook Version: 0.6.1 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv2+ URL: http://abook.sourceforge.net/ Summary: Text-based addressbook program for mutt @@ -52,6 +52,9 @@ autoreconf -vif %{_mandir}/man5/abookrc.* %changelog +* Thu Jul 12 2018 Fedora Release Engineering - 0.6.1-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Mon Feb 19 2018 Itamar Reis Peixoto - 0.6.1-9 - add gcc into buildrequires From 6e13b9ce63195d66bd0c281b0da4d57c60e63ad9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 12:52:30 +0000 Subject: [PATCH 37/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- abook.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abook.spec b/abook.spec index 82b1618..2c5f65d 100644 --- a/abook.spec +++ b/abook.spec @@ -3,7 +3,7 @@ Name: abook Version: 0.6.1 -Release: 10%{?dist} +Release: 11%{?dist} License: GPLv2+ URL: http://abook.sourceforge.net/ Summary: Text-based addressbook program for mutt @@ -52,6 +52,9 @@ autoreconf -vif %{_mandir}/man5/abookrc.* %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 0.6.1-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Thu Jul 12 2018 Fedora Release Engineering - 0.6.1-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 42ea5cfb8ce6352d93ec35a3fd885bfbba211e74 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sun, 17 Feb 2019 09:30:49 +0100 Subject: [PATCH 38/59] Rebuild for readline 8.0 --- abook.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abook.spec b/abook.spec index 2c5f65d..a745635 100644 --- a/abook.spec +++ b/abook.spec @@ -3,7 +3,7 @@ Name: abook Version: 0.6.1 -Release: 11%{?dist} +Release: 12%{?dist} License: GPLv2+ URL: http://abook.sourceforge.net/ Summary: Text-based addressbook program for mutt @@ -52,6 +52,9 @@ autoreconf -vif %{_mandir}/man5/abookrc.* %changelog +* Sun Feb 17 2019 Igor Gnatenko - 0.6.1-12 +- Rebuild for readline 8.0 + * Thu Jan 31 2019 Fedora Release Engineering - 0.6.1-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From c9176f9f211d49d62dee6fd24f68289f80ad089c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 17:27:26 +0000 Subject: [PATCH 39/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- abook.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abook.spec b/abook.spec index a745635..1ce0eeb 100644 --- a/abook.spec +++ b/abook.spec @@ -3,7 +3,7 @@ Name: abook Version: 0.6.1 -Release: 12%{?dist} +Release: 13%{?dist} License: GPLv2+ URL: http://abook.sourceforge.net/ Summary: Text-based addressbook program for mutt @@ -52,6 +52,9 @@ autoreconf -vif %{_mandir}/man5/abookrc.* %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 0.6.1-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 17 2019 Igor Gnatenko - 0.6.1-12 - Rebuild for readline 8.0 From b85da7c29ea28d67b08f6ab72bffddc7aca51b66 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 11:07:41 +0000 Subject: [PATCH 40/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- abook.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abook.spec b/abook.spec index 1ce0eeb..d578b1d 100644 --- a/abook.spec +++ b/abook.spec @@ -3,7 +3,7 @@ Name: abook Version: 0.6.1 -Release: 13%{?dist} +Release: 14%{?dist} License: GPLv2+ URL: http://abook.sourceforge.net/ Summary: Text-based addressbook program for mutt @@ -52,6 +52,9 @@ autoreconf -vif %{_mandir}/man5/abookrc.* %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 0.6.1-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Wed Jul 24 2019 Fedora Release Engineering - 0.6.1-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 87b140fcef75256c1608639d1cba69511433ec80 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 11:40:15 +0000 Subject: [PATCH 41/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- abook.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abook.spec b/abook.spec index d578b1d..fc751f3 100644 --- a/abook.spec +++ b/abook.spec @@ -3,7 +3,7 @@ Name: abook Version: 0.6.1 -Release: 14%{?dist} +Release: 15%{?dist} License: GPLv2+ URL: http://abook.sourceforge.net/ Summary: Text-based addressbook program for mutt @@ -52,6 +52,9 @@ autoreconf -vif %{_mandir}/man5/abookrc.* %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 0.6.1-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jan 28 2020 Fedora Release Engineering - 0.6.1-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 6bf8a49a122f0a22fd0343638f14a34eae76a215 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jul 2020 23:47:12 +0000 Subject: [PATCH 42/59] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- abook.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/abook.spec b/abook.spec index fc751f3..323ce5f 100644 --- a/abook.spec +++ b/abook.spec @@ -3,7 +3,7 @@ Name: abook Version: 0.6.1 -Release: 15%{?dist} +Release: 16%{?dist} License: GPLv2+ URL: http://abook.sourceforge.net/ Summary: Text-based addressbook program for mutt @@ -52,6 +52,10 @@ autoreconf -vif %{_mandir}/man5/abookrc.* %changelog +* Fri Jul 31 2020 Fedora Release Engineering - 0.6.1-16 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 0.6.1-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 7a097df6c6ba32b88a729a4c27885da595a7f40b Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Mon, 14 Dec 2020 10:52:17 +0100 Subject: [PATCH 43/59] add explicit BR on make use modern macros mark license text accordingly --- abook.spec | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/abook.spec b/abook.spec index 323ce5f..493b453 100644 --- a/abook.spec +++ b/abook.spec @@ -1,9 +1,6 @@ -%global commit 6e550af8a907a680dc845c22a7d6c36d89e900c1 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) - Name: abook Version: 0.6.1 -Release: 16%{?dist} +Release: 17%{?dist} License: GPLv2+ URL: http://abook.sourceforge.net/ Summary: Text-based addressbook program for mutt @@ -19,6 +16,7 @@ Patch3: 0003-build-fix-compilation-when-used-with-GCC-std-gnu99-o.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: gettext-devel +BuildRequires: make BuildRequires: ncurses-devel BuildRequires: readline-devel BuildRequires: gcc @@ -38,20 +36,26 @@ autoreconf -vif %build %configure -%{__make} %{?_smp_mflags} +%make_build %install -%{__make} DESTDIR=$RPM_BUILD_ROOT install +%make_install # generate localized files list %find_lang %{name} %files -f %{name}.lang -%doc AUTHORS BUGS COPYING ChangeLog FAQ README RELEASE_NOTES THANKS TODO sample.abookrc +%license COPYING +%doc AUTHORS BUGS ChangeLog FAQ README RELEASE_NOTES THANKS TODO sample.abookrc %{_bindir}/abook %{_mandir}/man1/abook.* %{_mandir}/man5/abookrc.* %changelog +* Mon Dec 14 2020 Dominik Mierzejewski 0.6.1-17 +- add explicit BR on make +- use modern macros +- mark license text accordingly + * Fri Jul 31 2020 Fedora Release Engineering - 0.6.1-16 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From c4fff311c7c2a882716bc3890631284548150710 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 25 Jan 2021 23:44:03 +0000 Subject: [PATCH 44/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- abook.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abook.spec b/abook.spec index 493b453..3c18395 100644 --- a/abook.spec +++ b/abook.spec @@ -1,6 +1,6 @@ Name: abook Version: 0.6.1 -Release: 17%{?dist} +Release: 18%{?dist} License: GPLv2+ URL: http://abook.sourceforge.net/ Summary: Text-based addressbook program for mutt @@ -51,6 +51,9 @@ autoreconf -vif %{_mandir}/man5/abookrc.* %changelog +* Mon Jan 25 2021 Fedora Release Engineering - 0.6.1-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Dec 14 2020 Dominik Mierzejewski 0.6.1-17 - add explicit BR on make - use modern macros From 84d2387adb80bd43107f4c75a86c7b65011c237b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 12:16:00 +0000 Subject: [PATCH 45/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From ef62d77c15a473fd2ffa3e6baa0cbbc1324fa5c6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 17:11:06 +0000 Subject: [PATCH 46/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- abook.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abook.spec b/abook.spec index 3c18395..f9f57e4 100644 --- a/abook.spec +++ b/abook.spec @@ -1,6 +1,6 @@ Name: abook Version: 0.6.1 -Release: 18%{?dist} +Release: 19%{?dist} License: GPLv2+ URL: http://abook.sourceforge.net/ Summary: Text-based addressbook program for mutt @@ -51,6 +51,9 @@ autoreconf -vif %{_mandir}/man5/abookrc.* %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 0.6.1-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Mon Jan 25 2021 Fedora Release Engineering - 0.6.1-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 04eaffe66c7ac26d034fca748938c7219b1f11af Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 20:50:59 +0000 Subject: [PATCH 47/59] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- abook.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abook.spec b/abook.spec index f9f57e4..d81a259 100644 --- a/abook.spec +++ b/abook.spec @@ -1,6 +1,6 @@ Name: abook Version: 0.6.1 -Release: 19%{?dist} +Release: 20%{?dist} License: GPLv2+ URL: http://abook.sourceforge.net/ Summary: Text-based addressbook program for mutt @@ -51,6 +51,9 @@ autoreconf -vif %{_mandir}/man5/abookrc.* %changelog +* Wed Jan 19 2022 Fedora Release Engineering - 0.6.1-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Jul 21 2021 Fedora Release Engineering - 0.6.1-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From d3e7580ad6e5c3f3d571c16b89fb732a625d8fe9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 20:21:42 +0000 Subject: [PATCH 48/59] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- abook.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abook.spec b/abook.spec index d81a259..36afca4 100644 --- a/abook.spec +++ b/abook.spec @@ -1,6 +1,6 @@ Name: abook Version: 0.6.1 -Release: 20%{?dist} +Release: 21%{?dist} License: GPLv2+ URL: http://abook.sourceforge.net/ Summary: Text-based addressbook program for mutt @@ -51,6 +51,9 @@ autoreconf -vif %{_mandir}/man5/abookrc.* %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 0.6.1-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed Jan 19 2022 Fedora Release Engineering - 0.6.1-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 64a5cafcfe75c38574572365f46eeb7bc3055c82 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 21:19:20 +0000 Subject: [PATCH 49/59] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- abook.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abook.spec b/abook.spec index 36afca4..5764614 100644 --- a/abook.spec +++ b/abook.spec @@ -1,6 +1,6 @@ Name: abook Version: 0.6.1 -Release: 21%{?dist} +Release: 22%{?dist} License: GPLv2+ URL: http://abook.sourceforge.net/ Summary: Text-based addressbook program for mutt @@ -51,6 +51,9 @@ autoreconf -vif %{_mandir}/man5/abookrc.* %changelog +* Wed Jan 18 2023 Fedora Release Engineering - 0.6.1-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Jul 20 2022 Fedora Release Engineering - 0.6.1-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From eb1c73e0d24937adcb80e904f719a7b96f6163bc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 12:49:19 +0000 Subject: [PATCH 50/59] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- abook.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abook.spec b/abook.spec index 5764614..5986b4f 100644 --- a/abook.spec +++ b/abook.spec @@ -1,6 +1,6 @@ Name: abook Version: 0.6.1 -Release: 22%{?dist} +Release: 23%{?dist} License: GPLv2+ URL: http://abook.sourceforge.net/ Summary: Text-based addressbook program for mutt @@ -51,6 +51,9 @@ autoreconf -vif %{_mandir}/man5/abookrc.* %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 0.6.1-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed Jan 18 2023 Fedora Release Engineering - 0.6.1-22 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 431f1818fac75ad20dd9f3d271ec0549829a3a04 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 12:02:12 +0000 Subject: [PATCH 51/59] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- abook.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abook.spec b/abook.spec index 5986b4f..a876530 100644 --- a/abook.spec +++ b/abook.spec @@ -1,6 +1,6 @@ Name: abook Version: 0.6.1 -Release: 23%{?dist} +Release: 24%{?dist} License: GPLv2+ URL: http://abook.sourceforge.net/ Summary: Text-based addressbook program for mutt @@ -51,6 +51,9 @@ autoreconf -vif %{_mandir}/man5/abookrc.* %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 0.6.1-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jul 19 2023 Fedora Release Engineering - 0.6.1-23 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From b439195d0c97fbfa6f14dad6a911ba8f0a2bdafe Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 22:34:24 +0000 Subject: [PATCH 52/59] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- abook.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abook.spec b/abook.spec index a876530..435eb33 100644 --- a/abook.spec +++ b/abook.spec @@ -1,6 +1,6 @@ Name: abook Version: 0.6.1 -Release: 24%{?dist} +Release: 25%{?dist} License: GPLv2+ URL: http://abook.sourceforge.net/ Summary: Text-based addressbook program for mutt @@ -51,6 +51,9 @@ autoreconf -vif %{_mandir}/man5/abookrc.* %changelog +* Mon Jan 22 2024 Fedora Release Engineering - 0.6.1-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 0.6.1-24 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 72fff85e12b27de6abc050ca0d23299987e04df4 Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:46 +0200 Subject: [PATCH 53/59] Eliminate use of obsolete %patchN syntax (#2283636) --- abook.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/abook.spec b/abook.spec index 435eb33..798f3cf 100644 --- a/abook.spec +++ b/abook.spec @@ -28,10 +28,10 @@ designed for use with the mutt mail client. %prep %setup -q -%patch0 -p1 -b .p -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 +%patch -P0 -p1 -b .p +%patch -P1 -p1 +%patch -P2 -p1 +%patch -P3 -p1 autoreconf -vif %build From 4bb145e7eac63555ef8945b2cc1d948780aff760 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 16:30:45 +0000 Subject: [PATCH 54/59] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- abook.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abook.spec b/abook.spec index 798f3cf..9cd4478 100644 --- a/abook.spec +++ b/abook.spec @@ -1,6 +1,6 @@ Name: abook Version: 0.6.1 -Release: 25%{?dist} +Release: 26%{?dist} License: GPLv2+ URL: http://abook.sourceforge.net/ Summary: Text-based addressbook program for mutt @@ -51,6 +51,9 @@ autoreconf -vif %{_mandir}/man5/abookrc.* %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 0.6.1-26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Mon Jan 22 2024 Fedora Release Engineering - 0.6.1-25 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 6e8f83dd8093c4bebf8dd21e300e71febe8999d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Thu, 25 Jul 2024 22:51:58 +0200 Subject: [PATCH 55/59] convert GPLv2+ license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- abook.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/abook.spec b/abook.spec index 9cd4478..a48801b 100644 --- a/abook.spec +++ b/abook.spec @@ -1,7 +1,8 @@ Name: abook Version: 0.6.1 -Release: 26%{?dist} -License: GPLv2+ +Release: 27%{?dist} +# Automatically converted from old format: GPLv2+ - review is highly recommended. +License: GPL-2.0-or-later URL: http://abook.sourceforge.net/ Summary: Text-based addressbook program for mutt Source0: http://abook.sourceforge.net/devel/abook-%{version}.tar.gz @@ -51,6 +52,9 @@ autoreconf -vif %{_mandir}/man5/abookrc.* %changelog +* Thu Jul 25 2024 Miroslav Suchý - 0.6.1-27 +- convert license to SPDX + * Wed Jul 17 2024 Fedora Release Engineering - 0.6.1-26 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 74fa7efb5dd27e484c070befd213d50828db6216 Mon Sep 17 00:00:00 2001 From: Dominik Mierzejewski Date: Thu, 9 Jan 2025 13:03:58 +0100 Subject: [PATCH 56/59] fix FTBFS with GCC15 (resolves: rhbz#2336029) - switch to autosetup macro - correct license tag --- ...ation-when-used-with-GCC-std-gnu99-o.patch | 41 ------------------- abook-extern-inline.patch | 12 ++++++ abook-wcwidth.patch | 12 ++++++ abook.spec | 25 ++++++----- 4 files changed, 39 insertions(+), 51 deletions(-) delete mode 100644 0003-build-fix-compilation-when-used-with-GCC-std-gnu99-o.patch create mode 100644 abook-extern-inline.patch create mode 100644 abook-wcwidth.patch diff --git a/0003-build-fix-compilation-when-used-with-GCC-std-gnu99-o.patch b/0003-build-fix-compilation-when-used-with-GCC-std-gnu99-o.patch deleted file mode 100644 index 9562860..0000000 --- a/0003-build-fix-compilation-when-used-with-GCC-std-gnu99-o.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 54f8e4ac4e0bdf7622909c4cdf5768bebe72460c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Rapha=C3=ABl=20Droz?= -Date: Sun, 12 Jun 2016 23:14:12 -0300 -Subject: [PATCH 3/3] build: fix compilation when used with GCC -std=gnu99 or - -std=gnu11 (default in GCC 5.0) * derived from patch #6 * fix Debian bug - #777764 - ---- - configure | 2 +- - configure.ac | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure b/configure -index b09897b..86016ed 100755 ---- a/configure -+++ b/configure -@@ -8431,7 +8431,7 @@ if test x$debug = xtrue; then - fi - - if test x$GCC = xyes; then -- CFLAGS="-Wall $CFLAGS" -+ CFLAGS="-Wall -fgnu89-inline $CFLAGS" - fi - - ac_config_files="$ac_config_files Makefile abook.spec po/Makefile.in" -diff --git a/configure.ac b/configure.ac -index 5a9ae3b..bcb0a58 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -175,7 +175,7 @@ if test x$debug = xtrue; then - fi - - if test x$GCC = xyes; then -- CFLAGS="-Wall $CFLAGS" -+ CFLAGS="-Wall -fgnu89-inline $CFLAGS" - fi - - AC_CONFIG_FILES([Makefile abook.spec po/Makefile.in]) --- -2.13.5 - diff --git a/abook-extern-inline.patch b/abook-extern-inline.patch new file mode 100644 index 0000000..734e7ce --- /dev/null +++ b/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) diff --git a/abook-wcwidth.patch b/abook-wcwidth.patch new file mode 100644 index 0000000..7e2089b --- /dev/null +++ b/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 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 ]]) + AC_CHECK_TYPE(wchar_t,,ac_widec_funcs=no) + + if test x$ac_widec_funcs = xyes -a x$ac_have_wchar_h = xyes; then diff --git a/abook.spec b/abook.spec index a48801b..b2f65e7 100644 --- a/abook.spec +++ b/abook.spec @@ -1,8 +1,10 @@ Name: abook Version: 0.6.1 -Release: 27%{?dist} -# Automatically converted from old format: GPLv2+ - review is highly recommended. -License: GPL-2.0-or-later +Release: 28%{?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 Source0: http://abook.sourceforge.net/devel/abook-%{version}.tar.gz @@ -12,8 +14,10 @@ Patch0: %{name}-preserve.patch 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 -# 54f8e4a build: fix compilation when used with GCC -std=gnu99 or -std=gnu11 -Patch3: 0003-build-fix-compilation-when-used-with-GCC-std-gnu99-o.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 @@ -28,11 +32,7 @@ Abook is a small and powerful text-based addressbook program designed for use with the mutt mail client. %prep -%setup -q -%patch -P0 -p1 -b .p -%patch -P1 -p1 -%patch -P2 -p1 -%patch -P3 -p1 +%autosetup -p1 autoreconf -vif %build @@ -52,6 +52,11 @@ autoreconf -vif %{_mandir}/man5/abookrc.* %changelog +* Thu Jan 09 2025 Dominik Mierzejewski - 0.6.1-28 +- fix FTBFS with GCC15 (resolves: rhbz#2336029) +- switch to autosetup macro +- correct license tag + * Thu Jul 25 2024 Miroslav Suchý - 0.6.1-27 - convert license to SPDX From 9ce9c11623104ad24ee7cf0ba3071cbfa59f58cc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 10:28:50 +0000 Subject: [PATCH 57/59] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- abook.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abook.spec b/abook.spec index b2f65e7..35b4162 100644 --- a/abook.spec +++ b/abook.spec @@ -1,6 +1,6 @@ Name: abook Version: 0.6.1 -Release: 28%{?dist} +Release: 29%{?dist} # GPL-2.0-or-later, except: # getopt.[ch]: LGPL-2.0-or-later # getopt1.c: LGPL-2.0-or-later @@ -52,6 +52,9 @@ autoreconf -vif %{_mandir}/man5/abookrc.* %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 0.6.1-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Jan 09 2025 Dominik Mierzejewski - 0.6.1-28 - fix FTBFS with GCC15 (resolves: rhbz#2336029) - switch to autosetup macro From d17a9e741d212365ed5714ee02feb9cca642ef11 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 16:42:24 +0000 Subject: [PATCH 58/59] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- abook.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abook.spec b/abook.spec index 35b4162..a8ce609 100644 --- a/abook.spec +++ b/abook.spec @@ -1,6 +1,6 @@ Name: abook Version: 0.6.1 -Release: 29%{?dist} +Release: 30%{?dist} # GPL-2.0-or-later, except: # getopt.[ch]: LGPL-2.0-or-later # getopt1.c: LGPL-2.0-or-later @@ -52,6 +52,9 @@ autoreconf -vif %{_mandir}/man5/abookrc.* %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 0.6.1-30 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Jan 16 2025 Fedora Release Engineering - 0.6.1-29 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 85e708d8f964a419955b86b05d50b58559c8bd18 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 03:23:45 +0000 Subject: [PATCH 59/59] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- abook.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/abook.spec b/abook.spec index a8ce609..2fd272b 100644 --- a/abook.spec +++ b/abook.spec @@ -1,6 +1,6 @@ Name: abook Version: 0.6.1 -Release: 30%{?dist} +Release: 31%{?dist} # GPL-2.0-or-later, except: # getopt.[ch]: LGPL-2.0-or-later # getopt1.c: LGPL-2.0-or-later @@ -52,6 +52,9 @@ autoreconf -vif %{_mandir}/man5/abookrc.* %changelog +* Fri Jan 16 2026 Fedora Release Engineering - 0.6.1-31 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Wed Jul 23 2025 Fedora Release Engineering - 0.6.1-30 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild