diff --git a/.gitignore b/.gitignore index 40359d3..e887672 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1 @@ -xlog-2.0.3.tar.gz -/xlog-2.0.4.tar.gz -/xlog-2.0.5.tar.gz -/xlog-2.0.6.tar.gz -/xlog-2.0.11.tar.gz -/xlog-2.0.13.tar.gz +xlog-*.tar.gz diff --git a/org.nongnu.Xlog.metainfo.xml b/org.nongnu.Xlog.metainfo.xml new file mode 100644 index 0000000..44f7c3f --- /dev/null +++ b/org.nongnu.Xlog.metainfo.xml @@ -0,0 +1,30 @@ + + + org.nongnu.Xlog + xlog.desktop + CC0-1.0 + GPL-3.0-or-later + + xlog + + Xlog + Logging program for Amateur Radio Operators + +

+ Xlog is a logging program for Amateur Radio Operators which can be used for daily logging and contest. Logs are stored into a text file. + You can open, close and create logs as you need them. Xlog supports cabrillo, ADIF, trlog, and EDI and can import twlog, editest and OH1AA logbook files. +

+

+ QSO's are presented in a list. Items in the list can be added, deleted or updated. For each contact, DXCC information is displayed and bearings and distance is calculated, both short and long path. + When hamlib is enabled through the menu, you can retrieve frequency, mode and signal-strength from your rig over the serial port. +

+ + + + https://xlog.nongnu.org/xlog.jpg + + + https://xlog.nongnu.org + https://savannah.nongnu.org/bugs/?group=xlog + + diff --git a/sources b/sources index 7e4e39b..b4dc174 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ddbffe1065918b43b32996fd4ba165f7 xlog-2.0.13.tar.gz +SHA512 (xlog-2.0.25.tar.gz) = 3ce5b27a0529885862a8c5256162068504e05cbbca6e0fc6cf492bfabbb2aa84b82a54502319646ee49e78aac6cd2b685877ec3687fb962c59c8648e0be4e121 diff --git a/xlog-2.0.13-no-error.patch b/xlog-2.0.13-no-error.patch deleted file mode 100644 index b91d859..0000000 --- a/xlog-2.0.13-no-error.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- xlog-2.0.13-mod/configure.ac 2015-04-21 22:37:12.000000000 +0200 -+++ xlog-2.0.13/configure.ac 2016-02-16 12:06:50.684089981 +0100 -@@ -16,9 +16,9 @@ - AC_FUNC_STRPTIME - AC_CHECK_FUNCS(strchr index) - --if test "${ac_cv_c_compiler_gnu}" = "yes"; then -- CFLAGS="${CFLAGS} -Wall -Wno-unused-but-set-variable -Werror" --fi -+dnl if test "${ac_cv_c_compiler_gnu}" = "yes"; then -+dnl CFLAGS="${CFLAGS} -Wall -Wno-unused-but-set-variable -Werror" -+dnl fi - - PKG_CHECK_MODULES(GLIB, glib-2.0) - PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.18.0) diff --git a/xlog-2.0.19-no-error.patch b/xlog-2.0.19-no-error.patch new file mode 100644 index 0000000..f7b0d5c --- /dev/null +++ b/xlog-2.0.19-no-error.patch @@ -0,0 +1,21 @@ +Index: xlog-2.0.22/configure.ac +=================================================================== +--- xlog-2.0.22.orig/configure.ac ++++ xlog-2.0.22/configure.ac +@@ -22,11 +22,11 @@ dnl if test "${ac_cv_c_compiler_gnu}" = + dnl CFLAGS="${CFLAGS} -Wno-deprecated-declarations -Wall -Wno-stringop-truncation -Wno-unused-but-set-variable -Werror" + dnl fi + +-AX_CHECK_COMPILE_FLAG([-Werror], [CFLAGS="$CFLAGS -Werror"], [], []) +-AX_CHECK_COMPILE_FLAG([-Wno-deprecated-declarations], [CFLAGS="$CFLAGS -Wno-deprecated-declarations"], [], []) +-AX_CHECK_COMPILE_FLAG([-Wall], [CFLAGS="$CFLAGS -Wall"], [], []) +-AX_CHECK_COMPILE_FLAG([-Wno-stringop-truncation], [CFLAGS="$CFLAGS -Wno-stringop-truncation"], [], []) +-AX_CHECK_COMPILE_FLAG([-Wno-unused-but-set-variable], [CFLAGS="$CFLAGS -Wno-unused-but-set-variable"], [], []) ++dnl AX_CHECK_COMPILE_FLAG([-Werror], [CFLAGS="$CFLAGS -Werror"], [], []) ++dnl AX_CHECK_COMPILE_FLAG([-Wno-deprecated-declarations], [CFLAGS="$CFLAGS -Wno-deprecated-declarations"], [], []) ++dnl AX_CHECK_COMPILE_FLAG([-Wall], [CFLAGS="$CFLAGS -Wall"], [], []) ++dnl AX_CHECK_COMPILE_FLAG([-Wno-stringop-truncation], [CFLAGS="$CFLAGS -Wno-stringop-truncation"], [], []) ++dnl AX_CHECK_COMPILE_FLAG([-Wno-unused-but-set-variable], [CFLAGS="$CFLAGS -Wno-unused-but-set-variable"], [], []) + + dnl end - see xlog bug #60003 - AndyS 15-Feb-2021 + 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-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.spec b/xlog.spec index 35f0247..6faec9a 100644 --- a/xlog.spec +++ b/xlog.spec @@ -1,13 +1,22 @@ -Name: xlog -Version: 2.0.13 -Release: 5%{?dist} -Summary: Logging program for Hamradio Operators +Name: xlog +Version: 2.0.25 +Release: 7%{?dist} +Summary: Logging program for Hamradio Operators -Group: Applications/Communications -License: GPLv3 -URL: http://www.nongnu.org/xlog/ -Source0: http://download.savannah.gnu.org/releases/%{name}/%{name}-%{version}.tar.gz -Patch0: %{name}-2.0.13-no-error.patch +# 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 + +Patch0: %{name}-2.0.19-no-error.patch +Patch1: xlog-%{version}-hamlib42.patch +Patch2: %{name}-2.0.25-aclocal.patch + +ExcludeArch: i686 + +BuildRequires: make +BuildRequires: gcc BuildRequires: autoconf BuildRequires: automake BuildRequires: gtk2-devel @@ -16,6 +25,8 @@ BuildRequires: shared-mime-info BuildRequires: gettext-devel BuildRequires: desktop-file-utils +Requires: hicolor-icon-theme + %description xlog is a logging program for amateur radio operators. The log is stored into a text file. QSO's are presented in a list. Items in the list can be @@ -24,8 +35,7 @@ and bearings and distance is calculated, both short and long path. xlog supports trlog, adif, cabrillo, edit, twlog and editest files. %prep -%setup -q -%patch0 -p1 -b .no-error +%autosetup -p1 #fix bogus .desktop file sed -i -e "s/Utility;Database;HamRadio;GTK/Network;HamRadio;GTK/g" $RPM_BUILD_DIR/%{name}-%{version}/data/desktop/xlog.desktop sed -i -e "s/.png//g" $RPM_BUILD_DIR/%{name}-%{version}/data/desktop/xlog.desktop @@ -33,36 +43,25 @@ 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} +# Install desktop file desktop-file-install \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ $RPM_BUILD_ROOT%{_datadir}/applications/xlog.desktop +desktop-file-edit --set-key=Icon --set-value=%{name} $RPM_BUILD_ROOT%{_datadir}/applications/xlog.desktop -%post -touch --no-create %{_datadir}/mime/packages &> /dev/null || : - -%postun -if [ $1 -eq 0 ]; then -touch --no-create %{_datadir}/mime/packages &> /dev/null || : -update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : -fi - -%posttrans -update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : - - -%clean -rm -rf $RPM_BUILD_ROOT - +# Install svg icon +install -D -p -m644 data/pixmaps/xlog.svg $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg +# Install AppStream metainfo file +install -D -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_metainfodir}/org.nongnu.Xlog.metainfo.xml %files -f %{name}.lang %doc AUTHORS data/doc/BUGS ChangeLog COPYING NEWS README data/doc/TODO data/doc/manual data/doc/KEYS data/glabels @@ -71,14 +70,116 @@ rm -rf $RPM_BUILD_ROOT %{_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 %{_datadir}/mime/packages/*.xml %{_mandir}/man?/* %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 + +* 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. + +* 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. + +* 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 + +* 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 + +* Sat Jul 22 2023 Fedora Release Engineering - 2.0.22-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jun 29 2023 Daniel Rusek - 2.0.22-11 +- Add AppStream metadata, svg icon + Resolves: rhbz#1792728 + +* Sat Jan 21 2023 Fedora Release Engineering - 2.0.22-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Tue Nov 08 2022 Richard Shaw - 2.0.22-9 +- Rebuild for updated hamlib 4.5. + +* Sat Jul 23 2022 Fedora Release Engineering - 2.0.22-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 2.0.22-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Dec 23 2021 Richard Shaw - 2.0.22-6 +- Rebuild for hamlib 4.4. + +* Thu Dec 23 2021 Richard Shaw - 2.0.22-5 +- 36-build-side-49086 + +* Tue Oct 12 2021 Richard Shaw - 2.0.22-4 +- Rebuild for hamlib 4.3.1. + +* Fri Jul 23 2021 Fedora Release Engineering - 2.0.22-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Sun May 30 2021 Richard Shaw - 2.0.22-2 +- Rebuild for hamlib 4.2. + +* Mon May 10 2021 Richard Shaw - 2.0.22-1 +- Update to 2.0.22. + +* Tue Feb 02 2021 Richard Shaw - 2.0.19-5 +- Rebuild for hamlib 4.1. + +* Thu Jan 28 2021 Fedora Release Engineering - 2.0.19-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Sat Aug 01 2020 Fedora Release Engineering - 2.0.19-3 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 2.0.19-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Thu May 14 2020 Jaroslav Škarvada - 2.0.19-1 +- New version + Resolves: rhbz#1834548 + +* Tue Mar 31 2020 Richard Shaw - 2.0.13-11 +- Rebuild for hamlib 4. + +* Fri Jan 31 2020 Fedora Release Engineering - 2.0.13-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Jul 27 2019 Fedora Release Engineering - 2.0.13-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Feb 03 2019 Fedora Release Engineering - 2.0.13-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 2.0.13-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Feb 09 2018 Fedora Release Engineering - 2.0.13-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Aug 03 2017 Fedora Release Engineering - 2.0.13-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild