From 5e784818907ecf7394a52ca46da285a3b5094e37 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 09:49:39 +0000 Subject: [PATCH 01/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- xlog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xlog.spec b/xlog.spec index 2b2b453..6258962 100644 --- a/xlog.spec +++ b/xlog.spec @@ -1,6 +1,6 @@ Name: xlog Version: 2.0.22 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Logging program for Hamradio Operators License: GPLv3 @@ -77,6 +77,9 @@ install -D -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_metainfodir}/org.nongnu.Xlog.me %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 2.0.22-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 2.0.22-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 1f63d78ef07b34270c82209250aebce6be8b57f3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 10:10:37 +0000 Subject: [PATCH 02/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- xlog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xlog.spec b/xlog.spec index 6258962..4287cab 100644 --- a/xlog.spec +++ b/xlog.spec @@ -1,6 +1,6 @@ Name: xlog Version: 2.0.22 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Logging program for Hamradio Operators License: GPLv3 @@ -77,6 +77,9 @@ install -D -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_metainfodir}/org.nongnu.Xlog.me %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 2.0.22-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 2.0.22-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 0c4858fdbd2baf624284dcb3921c345ec2ce9e23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Mon, 29 Jul 2024 14:47:24 +0200 Subject: [PATCH 03/12] convert GPLv3 license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- xlog.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/xlog.spec b/xlog.spec index 4287cab..8948b72 100644 --- a/xlog.spec +++ b/xlog.spec @@ -1,9 +1,10 @@ Name: xlog Version: 2.0.22 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Logging program for Hamradio Operators -License: GPLv3 +# Automatically converted from old format: GPLv3 - review is highly recommended. +License: GPL-3.0-only URL: http://www.nongnu.org/xlog/ Source0: http://download.savannah.gnu.org/releases/%{name}/%{name}-%{version}.tar.gz Source1: org.nongnu.Xlog.metainfo.xml @@ -77,6 +78,9 @@ install -D -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_metainfodir}/org.nongnu.Xlog.me %changelog +* Mon Jul 29 2024 Miroslav Suchý - 2.0.22-15 +- convert license to SPDX + * Sat Jul 20 2024 Fedora Release Engineering - 2.0.22-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From ac62a1ce1344dcc36a2301faa37b2ac7fa91b7aa Mon Sep 17 00:00:00 2001 From: Filipe Rosset Date: Wed, 25 Dec 2024 19:29:47 -0300 Subject: [PATCH 04/12] - Updated to 2.0.25 fixes rhbz#1947630 --- sources | 2 +- xlog-2.0.25-hamlib42.patch | 22 ++++++++++++++++++++++ xlog-hamlib42.patch | 24 ------------------------ xlog.spec | 16 ++++++++-------- 4 files changed, 31 insertions(+), 33 deletions(-) create mode 100644 xlog-2.0.25-hamlib42.patch delete mode 100644 xlog-hamlib42.patch diff --git a/sources b/sources index 5faab41..b4dc174 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xlog-2.0.22.tar.gz) = a261f8e28b75aed9380c29b3da69c7615b0d32346eaf84a0ace5cf77c53407372c4985c599078dba5ed92f77bd8052a74c7dca40028b99bca49cc3164d4ec490 +SHA512 (xlog-2.0.25.tar.gz) = 3ce5b27a0529885862a8c5256162068504e05cbbca6e0fc6cf492bfabbb2aa84b82a54502319646ee49e78aac6cd2b685877ec3687fb962c59c8648e0be4e121 diff --git a/xlog-2.0.25-hamlib42.patch b/xlog-2.0.25-hamlib42.patch new file mode 100644 index 0000000..bd0081c --- /dev/null +++ b/xlog-2.0.25-hamlib42.patch @@ -0,0 +1,22 @@ +--- xlog-2.0.25.orig/src/hamlib-utils.c 2021-10-03 14:38:22.000000000 -0300 ++++ xlog-2.0.25/src/hamlib-utils.c 2024-12-25 19:12:18.209526859 -0300 +@@ -49,6 +49,10 @@ + #define FILPATHLEN 150 + #endif + ++#ifndef HAMLIB_FILPATHLEN ++#define HAMLIB_FILPATHLEN FILEPATHLEN ++#endif ++ + struct rig_id { + const gint modelnr; + const gchar *modelname; +@@ -173,7 +177,7 @@ + } + } + +- strncpy (myrig->state.rigport.pathname, device, FILPATHLEN); ++ strncpy (myrig->state.rigport.pathname, device, HAMLIB_FILPATHLEN); + retcode = rig_open (myrig); + + if (retcode != RIG_OK) diff --git a/xlog-hamlib42.patch b/xlog-hamlib42.patch deleted file mode 100644 index 774b96c..0000000 --- a/xlog-hamlib42.patch +++ /dev/null @@ -1,24 +0,0 @@ -Index: xlog-2.0.22/src/hamlib-utils.c -=================================================================== ---- xlog-2.0.22.orig/src/hamlib-utils.c -+++ xlog-2.0.22/src/hamlib-utils.c -@@ -45,6 +45,10 @@ - #include "../data/pixmaps/s8.xpm" - #include "../data/pixmaps/s9.xpm" - -+#ifndef HAMLIB_FILPATHLEN -+#define HAMLIB_FILPATHLEN FILEPATHLEN -+#endif -+ - struct rig_id { - const gint modelnr; - const gchar *modelname; -@@ -168,7 +172,7 @@ start_hamlib (gint rigid, gchar *device, - update_statusbar (temp); - } - } -- strncpy (myrig->state.rigport.pathname, device, FILPATHLEN); -+ strncpy (myrig->state.rigport.pathname, device, HAMLIB_FILPATHLEN); - retcode = rig_open (myrig); - if (retcode != RIG_OK) - { diff --git a/xlog.spec b/xlog.spec index 8948b72..7b7571a 100644 --- a/xlog.spec +++ b/xlog.spec @@ -1,6 +1,6 @@ Name: xlog -Version: 2.0.22 -Release: 15%{?dist} +Version: 2.0.25 +Release: 1%{?dist} Summary: Logging program for Hamradio Operators # Automatically converted from old format: GPLv3 - review is highly recommended. @@ -10,7 +10,7 @@ Source0: http://download.savannah.gnu.org/releases/%{name}/%{name}-%{versi Source1: org.nongnu.Xlog.metainfo.xml Patch0: %{name}-2.0.19-no-error.patch -Patch1: xlog-hamlib42.patch +Patch1: xlog-%{version}-hamlib42.patch BuildRequires: make BuildRequires: gcc @@ -40,11 +40,10 @@ sed -i -e "s/.png//g" $RPM_BUILD_DIR/%{name}-%{version}/data/desktop/xlog.deskto %build autoreconf -vif %configure CFLAGS="%{optflags} -lm" --enable-hamlib --docdir=%{_docdir}/%{name} -make %{?_smp_mflags} - +%make_build %install -make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" +%make_install rm -f $RPM_BUILD_ROOT%{_datadir}/applications/mimeinfo.cache %find_lang %{name} @@ -68,8 +67,6 @@ install -D -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_metainfodir}/org.nongnu.Xlog.me %{_datadir}/%{name}/dxcc %{_datadir}/%{name}/maps %{_datadir}/pixmaps/* -%{_datadir}/icons/gnome-mime-text-x-%{name}.png -%{_datadir}/icons/%{name}-icon.png %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg %{_datadir}/applications/*.desktop %{_metainfodir}/org.nongnu.Xlog.metainfo.xml @@ -78,6 +75,9 @@ install -D -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_metainfodir}/org.nongnu.Xlog.me %changelog +* Wed Dec 25 2024 Filipe Rosset - 2.0.25-1 +- Updated to 2.0.25 fixes rhbz#1947630 + * Mon Jul 29 2024 Miroslav Suchý - 2.0.22-15 - convert license to SPDX From fedd6ce4b6e9b9b73c8c31b2395a5059b72e4b8f Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Tue, 31 Dec 2024 10:27:22 -0600 Subject: [PATCH 05/12] Rebuild for Hamlib 4.6. --- xlog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xlog.spec b/xlog.spec index 7b7571a..1e8e0a7 100644 --- a/xlog.spec +++ b/xlog.spec @@ -1,6 +1,6 @@ Name: xlog Version: 2.0.25 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Logging program for Hamradio Operators # Automatically converted from old format: GPLv3 - review is highly recommended. @@ -75,6 +75,9 @@ install -D -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_metainfodir}/org.nongnu.Xlog.me %changelog +* Tue Dec 31 2024 Richard Shaw - 2.0.25-2 +- Rebuild for Hamlib 4.6. + * Wed Dec 25 2024 Filipe Rosset - 2.0.25-1 - Updated to 2.0.25 fixes rhbz#1947630 From d338df0b5150813bd1ce5956b9d69546d2bc96af Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Tue, 31 Dec 2024 10:51:43 -0600 Subject: [PATCH 06/12] Hamlib no longer builds for i686. --- xlog.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xlog.spec b/xlog.spec index 1e8e0a7..c464baa 100644 --- a/xlog.spec +++ b/xlog.spec @@ -12,6 +12,8 @@ Source1: org.nongnu.Xlog.metainfo.xml Patch0: %{name}-2.0.19-no-error.patch Patch1: xlog-%{version}-hamlib42.patch +ExcludeArch: i686 + BuildRequires: make BuildRequires: gcc BuildRequires: autoconf From 929cbe911d8e019e638bf67117abca988b7f0c46 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 15:57:44 +0000 Subject: [PATCH 07/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- xlog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xlog.spec b/xlog.spec index c464baa..25f3e61 100644 --- a/xlog.spec +++ b/xlog.spec @@ -1,6 +1,6 @@ Name: xlog Version: 2.0.25 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Logging program for Hamradio Operators # Automatically converted from old format: GPLv3 - review is highly recommended. @@ -77,6 +77,9 @@ install -D -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_metainfodir}/org.nongnu.Xlog.me %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 2.0.25-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Tue Dec 31 2024 Richard Shaw - 2.0.25-2 - Rebuild for Hamlib 4.6. From 77e3c26541df8614de67eb3cd3f07357fcd42e82 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Wed, 5 Feb 2025 20:56:38 -0600 Subject: [PATCH 08/12] Rebuild for hamlib 4.6. --- xlog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xlog.spec b/xlog.spec index 25f3e61..b103cd7 100644 --- a/xlog.spec +++ b/xlog.spec @@ -1,6 +1,6 @@ Name: xlog Version: 2.0.25 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Logging program for Hamradio Operators # Automatically converted from old format: GPLv3 - review is highly recommended. @@ -77,6 +77,9 @@ install -D -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_metainfodir}/org.nongnu.Xlog.me %changelog +* Thu Feb 06 2025 Richard Shaw - 2.0.25-4 +- Rebuild for hamlib 4.6. + * Sun Jan 19 2025 Fedora Release Engineering - 2.0.25-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From b6e91440afca092b0de02033f5cdee54c904e2c0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:54:18 +0000 Subject: [PATCH 09/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- xlog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xlog.spec b/xlog.spec index b103cd7..c237d7d 100644 --- a/xlog.spec +++ b/xlog.spec @@ -1,6 +1,6 @@ Name: xlog Version: 2.0.25 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Logging program for Hamradio Operators # Automatically converted from old format: GPLv3 - review is highly recommended. @@ -77,6 +77,9 @@ install -D -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_metainfodir}/org.nongnu.Xlog.me %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 2.0.25-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Thu Feb 06 2025 Richard Shaw - 2.0.25-4 - Rebuild for hamlib 4.6. From 940d973c11bbc3c6a49478b1aba30fdf2b389002 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Sun, 19 Oct 2025 01:15:46 -0400 Subject: [PATCH 10/12] Fix build with gettext-0.25 While previous versions of gettext installed its macros into /usr/share/aclocal where they were always discoverable, as of gettext 0.25, they are installed into a package-specific directory. The autoreconf -i command is now trying to install them into the former due to ACLOCAL_AMFLAGS; using a writable directory for that is necessary. --- xlog-2.0.25-aclocal.patch | 12 ++++++++++++ xlog.spec | 1 + 2 files changed, 13 insertions(+) create mode 100644 xlog-2.0.25-aclocal.patch diff --git a/xlog-2.0.25-aclocal.patch b/xlog-2.0.25-aclocal.patch new file mode 100644 index 0000000..49288cf --- /dev/null +++ b/xlog-2.0.25-aclocal.patch @@ -0,0 +1,12 @@ +diff -up a/Makefile.am b/Makefile.am +--- a/Makefile.am 2021-02-15 20:37:54.000000000 -0500 ++++ b/Makefile.am 2025-10-19 01:05:33.816651640 -0400 +@@ -6,7 +6,7 @@ EXTRA_DIST = config.rpath mkinstalldirs + + CLEANFILES = *~ + +-ACLOCAL_AMFLAGS = -I /usr/share/aclocal ++ACLOCAL_AMFLAGS = -I m4 + + dist-hook: + rm -f AUTHORS ChangeLog diff --git a/xlog.spec b/xlog.spec index c237d7d..c49456e 100644 --- a/xlog.spec +++ b/xlog.spec @@ -11,6 +11,7 @@ Source1: org.nongnu.Xlog.metainfo.xml Patch0: %{name}-2.0.19-no-error.patch Patch1: xlog-%{version}-hamlib42.patch +Patch2: %{name}-2.0.25-aclocal.patch ExcludeArch: i686 From 532dcd989a4172cb10fbc0d7696dd5cef249dfba Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:43:57 +0000 Subject: [PATCH 11/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- xlog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xlog.spec b/xlog.spec index c49456e..49c6015 100644 --- a/xlog.spec +++ b/xlog.spec @@ -1,6 +1,6 @@ Name: xlog Version: 2.0.25 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Logging program for Hamradio Operators # Automatically converted from old format: GPLv3 - review is highly recommended. @@ -78,6 +78,9 @@ install -D -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_metainfodir}/org.nongnu.Xlog.me %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 2.0.25-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Fri Jul 25 2025 Fedora Release Engineering - 2.0.25-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From a70537ddb6d941b3e5baeeecfe9e73ca8479c2dc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 09:16:48 +0000 Subject: [PATCH 12/12] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- xlog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xlog.spec b/xlog.spec index 49c6015..6faec9a 100644 --- a/xlog.spec +++ b/xlog.spec @@ -1,6 +1,6 @@ Name: xlog Version: 2.0.25 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Logging program for Hamradio Operators # Automatically converted from old format: GPLv3 - review is highly recommended. @@ -78,6 +78,9 @@ install -D -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_metainfodir}/org.nongnu.Xlog.me %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 2.0.25-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Sat Jan 17 2026 Fedora Release Engineering - 2.0.25-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild