Compare commits

..

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

5 changed files with 34 additions and 75 deletions

View file

@ -1 +1 @@
SHA512 (xlog-2.0.25.tar.gz) = 3ce5b27a0529885862a8c5256162068504e05cbbca6e0fc6cf492bfabbb2aa84b82a54502319646ee49e78aac6cd2b685877ec3687fb962c59c8648e0be4e121
SHA512 (xlog-2.0.22.tar.gz) = a261f8e28b75aed9380c29b3da69c7615b0d32346eaf84a0ace5cf77c53407372c4985c599078dba5ed92f77bd8052a74c7dca40028b99bca49cc3164d4ec490

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)

24
xlog-hamlib42.patch Normal file
View file

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

View file

@ -1,19 +1,15 @@
Name: xlog
Version: 2.0.25
Release: 7%{?dist}
Version: 2.0.22
Release: 12%{?dist}
Summary: Logging program for Hamradio Operators
# Automatically converted from old format: GPLv3 - review is highly recommended.
License: GPL-3.0-only
License: GPLv3
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
Patch1: xlog-hamlib42.patch
BuildRequires: make
BuildRequires: gcc
@ -43,10 +39,11 @@ 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_build
make %{?_smp_mflags}
%install
%make_install
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
rm -f $RPM_BUILD_ROOT%{_datadir}/applications/mimeinfo.cache
%find_lang %{name}
@ -70,6 +67,8 @@ 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,36 +77,6 @@ install -D -p -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_metainfodir}/org.nongnu.Xlog.me
%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