Compare commits

..

No commits in common. "rawhide" and "f20" have entirely different histories.

7 changed files with 39 additions and 264 deletions

5
.gitignore vendored
View file

@ -1 +1,4 @@
xlog-*.tar.gz
xlog-2.0.3.tar.gz
/xlog-2.0.4.tar.gz
/xlog-2.0.5.tar.gz
/xlog-2.0.6.tar.gz

View file

@ -1,30 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<component type="desktop-application">
<id>org.nongnu.Xlog</id>
<launchable type="desktop-id">xlog.desktop</launchable>
<metadata_license>CC0-1.0</metadata_license>
<project_license>GPL-3.0-or-later</project_license>
<provides>
<binary>xlog</binary>
</provides>
<name>Xlog</name>
<summary>Logging program for Amateur Radio Operators</summary>
<description>
<p>
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.
</p>
<p>
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.
</p>
</description>
<screenshots>
<screenshot type="default">
<image type="source">https://xlog.nongnu.org/xlog.jpg</image>
</screenshot>
</screenshots>
<url type="homepage">https://xlog.nongnu.org</url>
<url type="bugtracker">https://savannah.nongnu.org/bugs/?group=xlog</url>
<content_rating type="oars-1.1"/>
</component>

View file

@ -1 +1 @@
SHA512 (xlog-2.0.25.tar.gz) = 3ce5b27a0529885862a8c5256162068504e05cbbca6e0fc6cf492bfabbb2aa84b82a54502319646ee49e78aac6cd2b685877ec3687fb962c59c8648e0be4e121
b7adadd8feade9fc716bb7dbfed66f7f xlog-2.0.6.tar.gz

View file

@ -1,21 +0,0 @@
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

View file

@ -1,12 +0,0 @@
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

View file

@ -1,22 +0,0 @@
--- 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)

209
xlog.spec
View file

@ -1,32 +1,20 @@
Name: xlog
Version: 2.0.25
Release: 7%{?dist}
Summary: Logging program for Hamradio Operators
Name: xlog
Version: 2.0.6
Release: 3%{?dist}
Summary: Logging program for Hamradio Operators
# 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
Group: Applications/Communications
License: GPLv3
URL: http://www.nongnu.org/xlog/
Source0: http://download.savannah.gnu.org/releases/%{name}/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtk2-devel
BuildRequires: libgnomeprint22-devel
BuildRequires: hamlib-devel
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
@ -35,188 +23,57 @@ and bearings and distance is calculated, both short and long path.
xlog supports trlog, adif, cabrillo, edit, twlog and editest files.
%prep
%autosetup -p1
%setup -q
#fix bogus .desktop file
sed -i -e "s/ApplicationHamRadio/Application/g" $RPM_BUILD_DIR/%{name}-%{version}/data/desktop/xlog.desktop
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
%build
autoreconf -vif
%configure CFLAGS="%{optflags} -lm" --enable-hamlib --docdir=%{_docdir}/%{name}
%make_build
%configure --enable-hamlib --docdir=%{_docdir}/%{name}
make %{?_smp_mflags}
%install
%make_install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
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
# Install svg icon
install -D -p -m644 data/pixmaps/xlog.svg $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
%post
update-mime-database %{_datadir}/mime &> /dev/null || :
%postun
update-mime-database %{_datadir}/mime &> /dev/null || :
%clean
rm -rf $RPM_BUILD_ROOT
# 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
%defattr(-,root,root,-)
%doc AUTHORS data/doc/BUGS ChangeLog COPYING NEWS README data/doc/TODO data/doc/manual data/glabels/qsllabels.glabels
%{_bindir}/%{name}
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/dxcc
%{_datadir}/%{name}/maps
%{_datadir}/pixmaps/*
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
%{_datadir}/icons/gnome-mime-text-x-%{name}.png
%{_datadir}/icons/%{name}-icon.png
%{_datadir}/applications/*.desktop
%{_metainfodir}/org.nongnu.Xlog.metainfo.xml
%{_datadir}/mime/packages/*.xml
%{_datadir}/mime/packages/*
%{_mandir}/man?/*
%changelog
* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.25-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.25-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.25-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Thu Feb 06 2025 Richard Shaw <hobbes1069@gmail.com> - 2.0.25-4
- Rebuild for hamlib 4.6.
* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.25-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Tue Dec 31 2024 Richard Shaw <hobbes1069@gmail.com> - 2.0.25-2
- Rebuild for Hamlib 4.6.
* Wed Dec 25 2024 Filipe Rosset <rosset.filipe@gmail.com> - 2.0.25-1
- Updated to 2.0.25 fixes rhbz#1947630
* Mon Jul 29 2024 Miroslav Suchý <msuchy@redhat.com> - 2.0.22-15
- convert license to SPDX
* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.22-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.22-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.22-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Thu Jun 29 2023 Daniel Rusek <mail@asciiwolf.com> - 2.0.22-11
- Add AppStream metadata, svg icon
Resolves: rhbz#1792728
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.22-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Tue Nov 08 2022 Richard Shaw <hobbes1069@gmail.com> - 2.0.22-9
- Rebuild for updated hamlib 4.5.
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.22-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.22-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Thu Dec 23 2021 Richard Shaw <hobbes1069@gmail.com> - 2.0.22-6
- Rebuild for hamlib 4.4.
* Thu Dec 23 2021 Richard Shaw <hobbes1069@gmail.com> - 2.0.22-5
- 36-build-side-49086
* Tue Oct 12 2021 Richard Shaw <hobbes1069@gmail.com> - 2.0.22-4
- Rebuild for hamlib 4.3.1.
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.22-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Sun May 30 2021 Richard Shaw <hobbes1069@gmail.com> - 2.0.22-2
- Rebuild for hamlib 4.2.
* Mon May 10 2021 Richard Shaw <hobbes1069@gmail.com> - 2.0.22-1
- Update to 2.0.22.
* Tue Feb 02 2021 Richard Shaw <hobbes1069@gmail.com> - 2.0.19-5
- Rebuild for hamlib 4.1.
* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.19-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.19-3
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.19-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Thu May 14 2020 Jaroslav Škarvada <jskarvad@redhat.com> - 2.0.19-1
- New version
Resolves: rhbz#1834548
* Tue Mar 31 2020 Richard Shaw <hobbes1069@gmail.com> - 2.0.13-11
- Rebuild for hamlib 4.
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.13-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.13-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.13-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.13-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.13-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.13-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.13-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.13-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Thu Jan 05 2017 Richard Shaw <hobbes1069@gmail.com> - 2.0.13-2
- Rebuild for hamlib 3.1.
* Mon Feb 15 2016 Lucian Langa <lucilanga@gnome.eu.org> - 2.0.13-1
- cadd patch to deactivate Werror
- doc files packaging fixes
- drop gnomeprint BR
- update to latest upstream
* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.11-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.11-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Thu Oct 02 2014 Rex Dieter <rdieter@fedoraproject.org> 2.0.11-4
- update mime scriptlets
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.11-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.11-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Fri Jan 24 2014 Lucian Langa <cooly@gnome.eu.org> - 2.0.11-1
- update to latest upstream
- specfile cleanup
* Tue Aug 06 2013 Lucian Langa <cooly@gnome.eu.org> - 2.0.6-3
- use unversioned doc directory