From 431f1818fac75ad20dd9f3d271ec0549829a3a04 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 12:02:12 +0000 Subject: [PATCH 1/9] 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 2/9] 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 3/9] 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 4/9] 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 5/9] 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 6/9] 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 7/9] 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 8/9] 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 9/9] 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