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-extern-inline.patch b/abook-extern-inline.patch deleted file mode 100644 index 734e7ce..0000000 --- a/abook-extern-inline.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 deleted file mode 100644 index 7e2089b..0000000 --- a/abook-wcwidth.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 2fd272b..82b1618 100644 --- a/abook.spec +++ b/abook.spec @@ -1,10 +1,10 @@ +%global commit 6e550af8a907a680dc845c22a7d6c36d89e900c1 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) + Name: abook Version: 0.6.1 -Release: 31%{?dist} -# GPL-2.0-or-later, except: -# getopt.[ch]: LGPL-2.0-or-later -# getopt1.c: LGPL-2.0-or-later -License: GPL-2.0-or-later AND LGPL-2.0-or-later +Release: 10%{?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 @@ -14,14 +14,11 @@ 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 -# fix compilation when used with GCC -std=gnu99 or -std=gnu11 -Patch3: abook-extern-inline.patch -# Fix detection of wcwidth() -Patch4: abook-wcwidth.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 -BuildRequires: make BuildRequires: ncurses-devel BuildRequires: readline-devel BuildRequires: gcc @@ -32,94 +29,29 @@ Abook is a small and powerful text-based addressbook program designed for use with the mutt mail client. %prep -%autosetup -p1 +%setup -q +%patch0 -p1 -b .p +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 autoreconf -vif %build %configure -%make_build +%{__make} %{?_smp_mflags} %install -%make_install +%{__make} DESTDIR=$RPM_BUILD_ROOT install # generate localized files list %find_lang %{name} %files -f %{name}.lang -%license COPYING -%doc AUTHORS BUGS ChangeLog FAQ README RELEASE_NOTES THANKS TODO sample.abookrc +%doc AUTHORS BUGS COPYING ChangeLog FAQ README RELEASE_NOTES THANKS TODO sample.abookrc %{_bindir}/abook %{_mandir}/man1/abook.* %{_mandir}/man5/abookrc.* %changelog -* Fri Jan 16 2026 Fedora Release Engineering - 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 - -* 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 -- correct license tag - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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