From 3265d00ec0157a47f7eaa3c94eec99d50bdd22f5 Mon Sep 17 00:00:00 2001 From: Lucian Langa Date: Tue, 6 Aug 2013 16:13:42 +0200 Subject: [PATCH 01/53] sync with latest upstream --- .gitignore | 1 + sources | 2 +- xlog.spec | 11 ++++++----- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 0e9a66d..fa1f72c 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ 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 diff --git a/sources b/sources index 7b9a00d..961cc4c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b7adadd8feade9fc716bb7dbfed66f7f xlog-2.0.6.tar.gz +23af1268cd385c7747f5f5de6095a22f xlog-2.0.11.tar.gz diff --git a/xlog.spec b/xlog.spec index 804df9c..f20d901 100644 --- a/xlog.spec +++ b/xlog.spec @@ -1,13 +1,12 @@ Name: xlog -Version: 2.0.6 -Release: 3%{?dist} +Version: 2.0.11 +Release: 1%{?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 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel BuildRequires: libgnomeprint22-devel BuildRequires: hamlib-devel @@ -35,7 +34,6 @@ make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" rm -f $RPM_BUILD_ROOT%{_datadir}/applications/mimeinfo.cache @@ -59,7 +57,6 @@ rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang -%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} @@ -74,6 +71,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jan 24 2014 Lucian Langa - 2.0.11-1 +- update to latest upstream +- specfile cleanup + * Tue Aug 06 2013 Lucian Langa - 2.0.6-3 - use unversioned doc directory From 831abe76d545ef12a9abc4991e98678db0b90c57 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 8 Jun 2014 01:01:03 -0500 Subject: [PATCH 02/53] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- xlog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xlog.spec b/xlog.spec index f20d901..c98b3cd 100644 --- a/xlog.spec +++ b/xlog.spec @@ -1,6 +1,6 @@ Name: xlog Version: 2.0.11 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Logging program for Hamradio Operators Group: Applications/Communications @@ -71,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Jun 08 2014 Fedora Release Engineering - 2.0.11-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Fri Jan 24 2014 Lucian Langa - 2.0.11-1 - update to latest upstream - specfile cleanup From 6ea40927149389fc967bd4cbb1ceafa1412b6022 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 18 Aug 2014 10:11:12 +0000 Subject: [PATCH 03/53] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- xlog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xlog.spec b/xlog.spec index c98b3cd..cb1f698 100644 --- a/xlog.spec +++ b/xlog.spec @@ -1,6 +1,6 @@ Name: xlog Version: 2.0.11 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Logging program for Hamradio Operators Group: Applications/Communications @@ -71,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Aug 18 2014 Fedora Release Engineering - 2.0.11-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Sun Jun 08 2014 Fedora Release Engineering - 2.0.11-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 80a0fc2b1969aafe6cee306171742d3f0aeab65e Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 2 Oct 2014 17:58:05 -0500 Subject: [PATCH 04/53] update mime scriptlets --- xlog.spec | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/xlog.spec b/xlog.spec index cb1f698..7141897 100644 --- a/xlog.spec +++ b/xlog.spec @@ -1,6 +1,6 @@ Name: xlog Version: 2.0.11 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Logging program for Hamradio Operators Group: Applications/Communications @@ -44,11 +44,16 @@ desktop-file-install \ $RPM_BUILD_ROOT%{_datadir}/applications/xlog.desktop %post -update-mime-database %{_datadir}/mime &> /dev/null || : +touch --no-create %{_datadir}/mime/packages &> /dev/null || : %postun -update-mime-database %{_datadir}/mime &> /dev/null || : +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 @@ -66,11 +71,14 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/icons/gnome-mime-text-x-%{name}.png %{_datadir}/icons/%{name}-icon.png %{_datadir}/applications/*.desktop -%{_datadir}/mime/packages/* +%{_datadir}/mime/packages/*.xml %{_mandir}/man?/* %changelog +* Thu Oct 02 2014 Rex Dieter 2.0.11-4 +- update mime scriptlets + * Mon Aug 18 2014 Fedora Release Engineering - 2.0.11-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From 375413bc7631ae0d734dbff369a2465afb870bd9 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 04:06:15 +0000 Subject: [PATCH 05/53] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- xlog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xlog.spec b/xlog.spec index 7141897..6380e90 100644 --- a/xlog.spec +++ b/xlog.spec @@ -1,6 +1,6 @@ Name: xlog Version: 2.0.11 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Logging program for Hamradio Operators Group: Applications/Communications @@ -76,6 +76,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 2.0.11-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Thu Oct 02 2014 Rex Dieter 2.0.11-4 - update mime scriptlets From 8b234edb0ef5e0c2afbc793f9aee1c1023698ba1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 03:34:04 +0000 Subject: [PATCH 06/53] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- xlog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xlog.spec b/xlog.spec index 6380e90..b0736c4 100644 --- a/xlog.spec +++ b/xlog.spec @@ -1,6 +1,6 @@ Name: xlog Version: 2.0.11 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Logging program for Hamradio Operators Group: Applications/Communications @@ -76,6 +76,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 2.0.11-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Fri Jun 19 2015 Fedora Release Engineering - 2.0.11-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 68824a24338f20f4fb7e969aee3213d26235d9ee Mon Sep 17 00:00:00 2001 From: Lucian Langa Date: Tue, 16 Feb 2016 16:39:31 +0100 Subject: [PATCH 07/53] update to latest upstream --- .gitignore | 1 + sources | 2 +- xlog-2.0.13-no-error.patch | 15 +++++++++++++++ xlog.spec | 21 +++++++++++++++------ 4 files changed, 32 insertions(+), 7 deletions(-) create mode 100644 xlog-2.0.13-no-error.patch diff --git a/.gitignore b/.gitignore index fa1f72c..40359d3 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ xlog-2.0.3.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 diff --git a/sources b/sources index 961cc4c..7e4e39b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -23af1268cd385c7747f5f5de6095a22f xlog-2.0.11.tar.gz +ddbffe1065918b43b32996fd4ba165f7 xlog-2.0.13.tar.gz diff --git a/xlog-2.0.13-no-error.patch b/xlog-2.0.13-no-error.patch new file mode 100644 index 0000000..b91d859 --- /dev/null +++ b/xlog-2.0.13-no-error.patch @@ -0,0 +1,15 @@ +--- 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.spec b/xlog.spec index b0736c4..c920ff9 100644 --- a/xlog.spec +++ b/xlog.spec @@ -1,14 +1,16 @@ Name: xlog -Version: 2.0.11 -Release: 6%{?dist} +Version: 2.0.13 +Release: 1%{?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 +BuildRequires: autoconf +BuildRequires: automake BuildRequires: gtk2-devel -BuildRequires: libgnomeprint22-devel BuildRequires: hamlib-devel BuildRequires: shared-mime-info BuildRequires: gettext-devel @@ -23,13 +25,14 @@ xlog supports trlog, adif, cabrillo, edit, twlog and editest files. %prep %setup -q +%patch0 -p1 -b .no-error #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 -%configure --enable-hamlib --docdir=%{_docdir}/%{name} +autoreconf -vif +%configure CFLAGS="%{optflags} -lm" --enable-hamlib --docdir=%{_docdir}/%{name} make %{?_smp_mflags} @@ -62,7 +65,7 @@ rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang -%doc AUTHORS data/doc/BUGS ChangeLog COPYING NEWS README data/doc/TODO data/doc/manual data/glabels/qsllabels.glabels +%doc AUTHORS data/doc/BUGS ChangeLog COPYING NEWS README data/doc/TODO data/doc/manual data/doc/KEYS data/glabels %{_bindir}/%{name} %dir %{_datadir}/%{name} %{_datadir}/%{name}/dxcc @@ -76,6 +79,12 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Feb 15 2016 Lucian Langa - 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 - 2.0.11-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From cbb9a9fa1db6453e65404e65b3fdaac91ad11e9c Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Thu, 5 Jan 2017 11:02:39 -0600 Subject: [PATCH 08/53] Rebuild for hamlib 3.1. --- xlog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xlog.spec b/xlog.spec index c920ff9..066f9cf 100644 --- a/xlog.spec +++ b/xlog.spec @@ -1,6 +1,6 @@ Name: xlog Version: 2.0.13 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Logging program for Hamradio Operators Group: Applications/Communications @@ -79,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Jan 05 2017 Richard Shaw - 2.0.13-2 +- Rebuild for hamlib 3.1. + * Mon Feb 15 2016 Lucian Langa - 2.0.13-1 - cadd patch to deactivate Werror - doc files packaging fixes From f1869f4b114eefde7dccf7a9b8fbd8882d4cd557 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 17:55:28 +0000 Subject: [PATCH 09/53] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- xlog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xlog.spec b/xlog.spec index 066f9cf..1b0df88 100644 --- a/xlog.spec +++ b/xlog.spec @@ -1,6 +1,6 @@ Name: xlog Version: 2.0.13 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Logging program for Hamradio Operators Group: Applications/Communications @@ -79,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 2.0.13-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Thu Jan 05 2017 Richard Shaw - 2.0.13-2 - Rebuild for hamlib 3.1. From fd205ae6e1b75f0f22d669e5785a6c96c3df21f3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 22:11:23 +0000 Subject: [PATCH 10/53] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- xlog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xlog.spec b/xlog.spec index 1b0df88..2bdd8d6 100644 --- a/xlog.spec +++ b/xlog.spec @@ -1,6 +1,6 @@ Name: xlog Version: 2.0.13 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Logging program for Hamradio Operators Group: Applications/Communications @@ -79,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 2.0.13-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sat Feb 11 2017 Fedora Release Engineering - 2.0.13-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 849a5f3e12a5da199b44e124b00147f5f7c37348 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 10:46:04 +0000 Subject: [PATCH 11/53] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- xlog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xlog.spec b/xlog.spec index 2bdd8d6..35f0247 100644 --- a/xlog.spec +++ b/xlog.spec @@ -1,6 +1,6 @@ Name: xlog Version: 2.0.13 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Logging program for Hamradio Operators Group: Applications/Communications @@ -79,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 2.0.13-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 2.0.13-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From a476aa94c80ad0bc8eae2373b31b8ead108907a1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 21:44:22 +0000 Subject: [PATCH 12/53] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xlog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xlog.spec b/xlog.spec index 35f0247..c3bebb5 100644 --- a/xlog.spec +++ b/xlog.spec @@ -1,6 +1,6 @@ Name: xlog Version: 2.0.13 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Logging program for Hamradio Operators Group: Applications/Communications @@ -79,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* 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 From 7ca9c313119b200eed0ed4a62fbbae070d8ea488 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 09:01:47 +0100 Subject: [PATCH 13/53] Remove %clean section None of currently supported distributions need that. Last one was EL5 which is EOL for a while. Signed-off-by: Igor Gnatenko --- xlog.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/xlog.spec b/xlog.spec index c3bebb5..c62a22b 100644 --- a/xlog.spec +++ b/xlog.spec @@ -59,9 +59,6 @@ fi update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : -%clean -rm -rf $RPM_BUILD_ROOT - %files -f %{name}.lang From 6b62b6c77b149866425a9f656484558ce81d6a41 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 9 Jul 2018 19:06:54 +0200 Subject: [PATCH 14/53] add BuildRequires: gcc Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- xlog.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xlog.spec b/xlog.spec index c62a22b..1bb0b75 100644 --- a/xlog.spec +++ b/xlog.spec @@ -8,6 +8,7 @@ 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 +BuildRequires: gcc BuildRequires: autoconf BuildRequires: automake BuildRequires: gtk2-devel From 5fc02b7022844a3c14df310591792d0b151dd580 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 09:21:43 +0000 Subject: [PATCH 15/53] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xlog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xlog.spec b/xlog.spec index 1bb0b75..6bc8b68 100644 --- a/xlog.spec +++ b/xlog.spec @@ -1,6 +1,6 @@ Name: xlog Version: 2.0.13 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Logging program for Hamradio Operators Group: Applications/Communications @@ -77,6 +77,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %changelog +* 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 From 7a28aecff0d415f9081945f4abb8df43c19773d8 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:31 +0100 Subject: [PATCH 16/53] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- xlog.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/xlog.spec b/xlog.spec index 6bc8b68..a162254 100644 --- a/xlog.spec +++ b/xlog.spec @@ -3,7 +3,6 @@ Version: 2.0.13 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 From 5195066bdbc2738833e01cfbfc5c35a7dccbdbb5 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 29 Jan 2019 06:05:41 +0100 Subject: [PATCH 17/53] Remove obsolete scriptlets References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets Signed-off-by: Igor Gnatenko --- xlog.spec | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/xlog.spec b/xlog.spec index a162254..2e2573c 100644 --- a/xlog.spec +++ b/xlog.spec @@ -46,21 +46,6 @@ desktop-file-install \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ $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 || : - - - - %files -f %{name}.lang %doc AUTHORS data/doc/BUGS ChangeLog COPYING NEWS README data/doc/TODO data/doc/manual data/doc/KEYS data/glabels %{_bindir}/%{name} From d9ea42bb65a4827fe7919f13f701cfa8e0eb9524 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 12:30:26 +0000 Subject: [PATCH 18/53] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xlog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xlog.spec b/xlog.spec index 2e2573c..ff66337 100644 --- a/xlog.spec +++ b/xlog.spec @@ -1,6 +1,6 @@ Name: xlog Version: 2.0.13 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Logging program for Hamradio Operators License: GPLv3 @@ -61,6 +61,9 @@ desktop-file-install \ %changelog +* 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 From 3403c0a2aeb63796120e2333355777bafe80cb2f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 04:18:11 +0000 Subject: [PATCH 19/53] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xlog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xlog.spec b/xlog.spec index ff66337..4f9fd41 100644 --- a/xlog.spec +++ b/xlog.spec @@ -1,6 +1,6 @@ Name: xlog Version: 2.0.13 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Logging program for Hamradio Operators License: GPLv3 @@ -61,6 +61,9 @@ desktop-file-install \ %changelog +* 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 From 55b5bbe5b5ae1c670fd7c57131217f22a6db605e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 04:33:56 +0000 Subject: [PATCH 20/53] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xlog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xlog.spec b/xlog.spec index 4f9fd41..0123668 100644 --- a/xlog.spec +++ b/xlog.spec @@ -1,6 +1,6 @@ Name: xlog Version: 2.0.13 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Logging program for Hamradio Operators License: GPLv3 @@ -61,6 +61,9 @@ desktop-file-install \ %changelog +* 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 From cdb6363b4c317ac2e6563d8ddbceb206c8b68b1f Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Tue, 31 Mar 2020 14:55:09 -0500 Subject: [PATCH 21/53] Rebuild for hamlib 4. --- xlog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xlog.spec b/xlog.spec index 0123668..7954e39 100644 --- a/xlog.spec +++ b/xlog.spec @@ -1,6 +1,6 @@ Name: xlog Version: 2.0.13 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Logging program for Hamradio Operators License: GPLv3 @@ -61,6 +61,9 @@ desktop-file-install \ %changelog +* 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 From 1d99d12873092edd61509ed6aa277c3e5faf9880 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 14 May 2020 16:43:19 +0200 Subject: [PATCH 22/53] New version Resolves: rhbz#1834548 --- .gitignore | 1 + sources | 2 +- ...-error.patch => xlog-2.0.19-no-error.patch | 4 ++-- xlog.spec | 22 +++++++++++-------- 4 files changed, 17 insertions(+), 12 deletions(-) rename xlog-2.0.13-no-error.patch => xlog-2.0.19-no-error.patch (68%) diff --git a/.gitignore b/.gitignore index 40359d3..e4ab51f 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ xlog-2.0.3.tar.gz /xlog-2.0.6.tar.gz /xlog-2.0.11.tar.gz /xlog-2.0.13.tar.gz +/xlog-2.0.19.tar.gz diff --git a/sources b/sources index 7e4e39b..14f987e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ddbffe1065918b43b32996fd4ba165f7 xlog-2.0.13.tar.gz +SHA512 (xlog-2.0.19.tar.gz) = b69e592f97fbfbd989378a2b74036f4a169be3ca1f5b7ba8715e3a5293f1efbdbc431b0c09a305c2ca0190953777010a9d9a9b53caea8eb26609111b4f7da40b diff --git a/xlog-2.0.13-no-error.patch b/xlog-2.0.19-no-error.patch similarity index 68% rename from xlog-2.0.13-no-error.patch rename to xlog-2.0.19-no-error.patch index b91d859..ad1b5b5 100644 --- a/xlog-2.0.13-no-error.patch +++ b/xlog-2.0.19-no-error.patch @@ -5,10 +5,10 @@ AC_CHECK_FUNCS(strchr index) -if test "${ac_cv_c_compiler_gnu}" = "yes"; then -- CFLAGS="${CFLAGS} -Wall -Wno-unused-but-set-variable -Werror" +- CFLAGS="${CFLAGS} -Wall -Wno-stringop-truncation -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 CFLAGS="${CFLAGS} -Wall -Wno-stringop-truncation -Wno-unused-but-set-variable -Werror" +dnl fi PKG_CHECK_MODULES(GLIB, glib-2.0) diff --git a/xlog.spec b/xlog.spec index 7954e39..604c855 100644 --- a/xlog.spec +++ b/xlog.spec @@ -1,13 +1,13 @@ -Name: xlog -Version: 2.0.13 -Release: 11%{?dist} -Summary: Logging program for Hamradio Operators +Name: xlog +Version: 2.0.19 +Release: 1%{?dist} +Summary: Logging program for Hamradio Operators -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 -BuildRequires: gcc +License: GPLv3 +URL: http://www.nongnu.org/xlog/ +Source0: http://download.savannah.gnu.org/releases/%{name}/%{name}-%{version}.tar.gz +Patch0: %{name}-2.0.19-no-error.patch +BuildRequires: gcc BuildRequires: autoconf BuildRequires: automake BuildRequires: gtk2-devel @@ -61,6 +61,10 @@ desktop-file-install \ %changelog +* 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. From b34b6fd97dc130baee772690a170681d7ce4a70c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 14 May 2020 16:59:51 +0200 Subject: [PATCH 23/53] Fixed gitignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- .gitignore | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index e4ab51f..e887672 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +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-2.0.19.tar.gz +xlog-*.tar.gz From 8ae406323f8eb64c30fecace3776cc91c52f0c81 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 14:48:33 +0000 Subject: [PATCH 24/53] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xlog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xlog.spec b/xlog.spec index 604c855..994c49a 100644 --- a/xlog.spec +++ b/xlog.spec @@ -1,6 +1,6 @@ Name: xlog Version: 2.0.19 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Logging program for Hamradio Operators License: GPLv3 @@ -61,6 +61,9 @@ desktop-file-install \ %changelog +* 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 From 5b8aef1339608340679f4fe06a8634ace12a492d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 09:45:21 +0000 Subject: [PATCH 25/53] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xlog.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/xlog.spec b/xlog.spec index 994c49a..c43c6e3 100644 --- a/xlog.spec +++ b/xlog.spec @@ -1,6 +1,6 @@ Name: xlog Version: 2.0.19 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Logging program for Hamradio Operators License: GPLv3 @@ -61,6 +61,10 @@ desktop-file-install \ %changelog +* 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 From 08f0fa1f52b89aed661f60773b2a26b43a8c2bc0 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 9 Jan 2021 01:30:09 +0000 Subject: [PATCH 26/53] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- xlog.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xlog.spec b/xlog.spec index c43c6e3..e8ea9ed 100644 --- a/xlog.spec +++ b/xlog.spec @@ -7,6 +7,7 @@ License: GPLv3 URL: http://www.nongnu.org/xlog/ Source0: http://download.savannah.gnu.org/releases/%{name}/%{name}-%{version}.tar.gz Patch0: %{name}-2.0.19-no-error.patch +BuildRequires: make BuildRequires: gcc BuildRequires: autoconf BuildRequires: automake From 52e0f1d818ca7b0477679d12ee9073ef885334b9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 28 Jan 2021 00:07:59 +0000 Subject: [PATCH 27/53] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xlog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xlog.spec b/xlog.spec index e8ea9ed..34fa706 100644 --- a/xlog.spec +++ b/xlog.spec @@ -1,6 +1,6 @@ Name: xlog Version: 2.0.19 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Logging program for Hamradio Operators License: GPLv3 @@ -62,6 +62,9 @@ desktop-file-install \ %changelog +* 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 From 8dc1cf931be59b8081622e2016b86f9055b6e868 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Tue, 2 Feb 2021 07:48:30 -0600 Subject: [PATCH 28/53] Rebuild for hamlib 4.1. --- xlog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xlog.spec b/xlog.spec index 34fa706..167565c 100644 --- a/xlog.spec +++ b/xlog.spec @@ -1,6 +1,6 @@ Name: xlog Version: 2.0.19 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Logging program for Hamradio Operators License: GPLv3 @@ -62,6 +62,9 @@ desktop-file-install \ %changelog +* 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 From 5e302aaa84acb460a9548e61528d5980495fda25 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Mon, 10 May 2021 07:01:46 -0500 Subject: [PATCH 29/53] Update to 2.0.22. --- sources | 2 +- xlog-2.0.19-no-error.patch | 32 +++++++++++++++++++------------- xlog.spec | 12 ++++++++---- 3 files changed, 28 insertions(+), 18 deletions(-) diff --git a/sources b/sources index 14f987e..5faab41 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xlog-2.0.19.tar.gz) = b69e592f97fbfbd989378a2b74036f4a169be3ca1f5b7ba8715e3a5293f1efbdbc431b0c09a305c2ca0190953777010a9d9a9b53caea8eb26609111b4f7da40b +SHA512 (xlog-2.0.22.tar.gz) = a261f8e28b75aed9380c29b3da69c7615b0d32346eaf84a0ace5cf77c53407372c4985c599078dba5ed92f77bd8052a74c7dca40028b99bca49cc3164d4ec490 diff --git a/xlog-2.0.19-no-error.patch b/xlog-2.0.19-no-error.patch index ad1b5b5..f7b0d5c 100644 --- a/xlog-2.0.19-no-error.patch +++ b/xlog-2.0.19-no-error.patch @@ -1,15 +1,21 @@ ---- 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) +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 --if test "${ac_cv_c_compiler_gnu}" = "yes"; then -- CFLAGS="${CFLAGS} -Wall -Wno-stringop-truncation -Wno-unused-but-set-variable -Werror" --fi -+dnl if test "${ac_cv_c_compiler_gnu}" = "yes"; then -+dnl CFLAGS="${CFLAGS} -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 - PKG_CHECK_MODULES(GLIB, glib-2.0) - PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.18.0) diff --git a/xlog.spec b/xlog.spec index 167565c..050a608 100644 --- a/xlog.spec +++ b/xlog.spec @@ -1,12 +1,14 @@ Name: xlog -Version: 2.0.19 -Release: 5%{?dist} +Version: 2.0.22 +Release: 1%{?dist} Summary: Logging program for Hamradio Operators License: GPLv3 URL: http://www.nongnu.org/xlog/ Source0: http://download.savannah.gnu.org/releases/%{name}/%{name}-%{version}.tar.gz + Patch0: %{name}-2.0.19-no-error.patch + BuildRequires: make BuildRequires: gcc BuildRequires: autoconf @@ -25,8 +27,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 @@ -62,6 +63,9 @@ desktop-file-install \ %changelog +* 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. From 59f65b2839ed737250ad750fc744cb4958385347 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Sun, 30 May 2021 08:48:27 -0500 Subject: [PATCH 30/53] Rebuild for hamlib 4.2. --- xlog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xlog.spec b/xlog.spec index 050a608..b7e4d31 100644 --- a/xlog.spec +++ b/xlog.spec @@ -1,6 +1,6 @@ Name: xlog Version: 2.0.22 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Logging program for Hamradio Operators License: GPLv3 @@ -63,6 +63,9 @@ desktop-file-install \ %changelog +* 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. From 51194bae7a6362d1f37dba342eaf1ea7dc02f5cc Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Sun, 30 May 2021 15:02:02 -0500 Subject: [PATCH 31/53] Add patch for hamlib 4.2. --- xlog-hamlib42.patch | 24 ++++++++++++++++++++++++ xlog.spec | 1 + 2 files changed, 25 insertions(+) create mode 100644 xlog-hamlib42.patch diff --git a/xlog-hamlib42.patch b/xlog-hamlib42.patch new file mode 100644 index 0000000..774b96c --- /dev/null +++ b/xlog-hamlib42.patch @@ -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) + { diff --git a/xlog.spec b/xlog.spec index b7e4d31..851f312 100644 --- a/xlog.spec +++ b/xlog.spec @@ -8,6 +8,7 @@ URL: http://www.nongnu.org/xlog/ Source0: http://download.savannah.gnu.org/releases/%{name}/%{name}-%{version}.tar.gz Patch0: %{name}-2.0.19-no-error.patch +Patch1: xlog-hamlib42.patch BuildRequires: make BuildRequires: gcc From 664cd96bbd9eead3390342f30c4413b3ba77433f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 21:40:32 +0000 Subject: [PATCH 32/53] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xlog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xlog.spec b/xlog.spec index 851f312..a9e6051 100644 --- a/xlog.spec +++ b/xlog.spec @@ -1,6 +1,6 @@ Name: xlog Version: 2.0.22 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Logging program for Hamradio Operators License: GPLv3 @@ -64,6 +64,9 @@ desktop-file-install \ %changelog +* 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. From e5b6bc2a4fa623942147af306ef3ca163440ee66 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Mon, 11 Oct 2021 20:30:19 -0500 Subject: [PATCH 33/53] Rebuild for hamlib 4.3.1. --- xlog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xlog.spec b/xlog.spec index a9e6051..3bc3bd3 100644 --- a/xlog.spec +++ b/xlog.spec @@ -1,6 +1,6 @@ Name: xlog Version: 2.0.22 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Logging program for Hamradio Operators License: GPLv3 @@ -64,6 +64,9 @@ desktop-file-install \ %changelog +* 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 From d236d8a5fffcb2c0a224e551654122fd86aae58c Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Thu, 23 Dec 2021 12:41:41 -0600 Subject: [PATCH 34/53] 36-build-side-49086 --- xlog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xlog.spec b/xlog.spec index 3bc3bd3..6bedfbb 100644 --- a/xlog.spec +++ b/xlog.spec @@ -1,6 +1,6 @@ Name: xlog Version: 2.0.22 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Logging program for Hamradio Operators License: GPLv3 @@ -64,6 +64,9 @@ desktop-file-install \ %changelog +* 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. From fba8c1833b52139431bfd435ee0736c20050c62b Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Thu, 23 Dec 2021 16:46:04 -0600 Subject: [PATCH 35/53] Rebuild for hamlib 4.4. --- xlog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xlog.spec b/xlog.spec index 6bedfbb..c60e78a 100644 --- a/xlog.spec +++ b/xlog.spec @@ -1,6 +1,6 @@ Name: xlog Version: 2.0.22 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Logging program for Hamradio Operators License: GPLv3 @@ -64,6 +64,9 @@ desktop-file-install \ %changelog +* 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 From 545e7ca0d54609691d9bc269bfebea78124a4c32 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 05:12:49 +0000 Subject: [PATCH 36/53] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xlog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xlog.spec b/xlog.spec index c60e78a..a33a416 100644 --- a/xlog.spec +++ b/xlog.spec @@ -1,6 +1,6 @@ Name: xlog Version: 2.0.22 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Logging program for Hamradio Operators License: GPLv3 @@ -64,6 +64,9 @@ desktop-file-install \ %changelog +* 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. From a58135f2ed3e032e6235b88b8fdea0d75b32c75b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 13:14:39 +0000 Subject: [PATCH 37/53] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xlog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xlog.spec b/xlog.spec index a33a416..2c659b1 100644 --- a/xlog.spec +++ b/xlog.spec @@ -1,6 +1,6 @@ Name: xlog Version: 2.0.22 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Logging program for Hamradio Operators License: GPLv3 @@ -64,6 +64,9 @@ desktop-file-install \ %changelog +* 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 From e7ca747bfe78e7740f02912c1d13ca16b913020b Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Mon, 7 Nov 2022 19:38:44 -0600 Subject: [PATCH 38/53] Rebuild for updated hamlib 4.5. --- xlog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xlog.spec b/xlog.spec index 2c659b1..f05852d 100644 --- a/xlog.spec +++ b/xlog.spec @@ -1,6 +1,6 @@ Name: xlog Version: 2.0.22 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Logging program for Hamradio Operators License: GPLv3 @@ -64,6 +64,9 @@ desktop-file-install \ %changelog +* 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 From 315f47de29d618a2d458d6da4383408dba7bb07a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 07:34:45 +0000 Subject: [PATCH 39/53] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xlog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xlog.spec b/xlog.spec index f05852d..2586054 100644 --- a/xlog.spec +++ b/xlog.spec @@ -1,6 +1,6 @@ Name: xlog Version: 2.0.22 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Logging program for Hamradio Operators License: GPLv3 @@ -64,6 +64,9 @@ desktop-file-install \ %changelog +* 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. From 91149fab97d0d0d572e586a8b2fec9aa3e81d8a5 Mon Sep 17 00:00:00 2001 From: AsciiWolf Date: Thu, 29 Jun 2023 17:47:43 +0200 Subject: [PATCH 40/53] Add AppStream metainfo, svg icon Resolves: rhbz#1792728 --- org.nongnu.Xlog.metainfo.xml | 30 ++++++++++++++++++++++++++++++ xlog.spec | 19 ++++++++++++++++++- 2 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 org.nongnu.Xlog.metainfo.xml 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/xlog.spec b/xlog.spec index 2586054..98ef0f1 100644 --- a/xlog.spec +++ b/xlog.spec @@ -1,11 +1,12 @@ Name: xlog Version: 2.0.22 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Logging program for Hamradio Operators 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-hamlib42.patch @@ -20,6 +21,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 @@ -45,9 +48,17 @@ 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 + +# 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 @@ -58,12 +69,18 @@ desktop-file-install \ %{_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 +* 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 From f0d42d310c2f88e76c516c88d1e5f2a2f35c4edf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 18:58:31 +0000 Subject: [PATCH 41/53] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xlog.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xlog.spec b/xlog.spec index 98ef0f1..2b2b453 100644 --- a/xlog.spec +++ b/xlog.spec @@ -1,6 +1,6 @@ Name: xlog Version: 2.0.22 -Release: 11%{?dist} +Release: 12%{?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 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 From 5e784818907ecf7394a52ca46da285a3b5094e37 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 09:49:39 +0000 Subject: [PATCH 42/53] 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 43/53] 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 44/53] 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 45/53] - 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 46/53] 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 47/53] 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 48/53] 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 49/53] 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 50/53] 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 51/53] 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 52/53] 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 53/53] 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