From 6e13b9ce63195d66bd0c281b0da4d57c60e63ad9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 12:52:30 +0000 Subject: [PATCH 01/23] - 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 02/23] 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 03/23] - 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 04/23] - 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 05/23] - 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 06/23] - 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 07/23] 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 08/23] - 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 09/23] - 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 10/23] - 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 11/23] - 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 12/23] 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 13/23] 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 14/23] 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 15/23] 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 16/23] 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 17/23] 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 18/23] 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 19/23] 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 20/23] 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 21/23] 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 22/23] 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 23/23] 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