From 1ae9a26dee6719c5ca25b5ca6a81955ee4a5193a Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:30 +0100 Subject: [PATCH 01/35] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- xastir.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/xastir.spec b/xastir.spec index 8269dae..6912d59 100644 --- a/xastir.spec +++ b/xastir.spec @@ -4,7 +4,6 @@ Epoch: 1 Version: 2.0.8 Release: 9%{?dist} License: GPLv2+ -Group: Applications/Internet Source0: http://downloads.sourceforge.net/xastir/xastir-%{version}.tar.gz Source1: %{name}.desktop Source2: %{name}.png From 67d2a448686fc7073c46f85aeafd3481fbb377c7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 12:06:01 +0000 Subject: [PATCH 02/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xastir.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xastir.spec b/xastir.spec index 6912d59..74dc106 100644 --- a/xastir.spec +++ b/xastir.spec @@ -2,7 +2,7 @@ Summary: Amateur Station Tracking and Reporting system for amateur radio Name: xastir Epoch: 1 Version: 2.0.8 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv2+ Source0: http://downloads.sourceforge.net/xastir/xastir-%{version}.tar.gz Source1: %{name}.desktop @@ -73,6 +73,9 @@ desktop-file-install \ %doc README.MAPS README.win32 UPGRADE %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 1:2.0.8-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Jul 14 2018 Fedora Release Engineering - 1:2.0.8-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From fada04b60681fa1221bdb23c0a7e2bcdf1a79fea Mon Sep 17 00:00:00 2001 From: Lucian Langa Date: Wed, 13 Mar 2019 09:55:20 +0100 Subject: [PATCH 03/35] sync with latest upstream release --- .gitignore | 1 + sources | 2 +- xastir.spec | 17 +++++++++++------ 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 58d79f4..19068af 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ xastir-1.9.8.tar.gz /xastir-2.0.4.tar.gz /xastir-2.0.6.tar.gz /xastir-2.0.8.tar.gz +/Release-2.1.0.tar.gz diff --git a/sources b/sources index f3edb4b..a0117cf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2a1101b6cb73e18fae98c2827a0c6217 xastir-2.0.8.tar.gz +SHA512 (Release-2.1.0.tar.gz) = 32c1297d6399c34078158853beba32a4d018d060088b014be004b0837a887c6360e417e1d59ed7865ea1caa3c07f59d7bb4ee3cf9c035e2aabf6ba4783e3d288 diff --git a/xastir.spec b/xastir.spec index 74dc106..c626e3c 100644 --- a/xastir.spec +++ b/xastir.spec @@ -1,10 +1,10 @@ Summary: Amateur Station Tracking and Reporting system for amateur radio Name: xastir Epoch: 1 -Version: 2.0.8 -Release: 10%{?dist} +Version: 2.1.0 +Release: 1%{?dist} License: GPLv2+ -Source0: http://downloads.sourceforge.net/xastir/xastir-%{version}.tar.gz +Source0: https://github.com/Xastir/Xastir/archive/Release-%{version}.tar.gz Source1: %{name}.desktop Source2: %{name}.png URL: http://www.xastir.org @@ -28,7 +28,7 @@ Install XASTIR if you are interested in APRS(tm) and HAM radio software. %prep -%setup -q -n %{name}-%{version} +%setup -q -n Xastir-Release-%{version} %build #./bootstrap.sh @@ -41,6 +41,7 @@ for f in README ChangeLog ; do rm -f $f.iso88591 done dos2unix -k scripts/toporama250k.pl +sed -i -e "s@#!/usr/bin/env python@#!/usr/bin/env python3@" scripts/Xastir_tigerpoly.py %install rm -rf %{buildroot} @@ -69,10 +70,14 @@ desktop-file-install \ %{_datadir}/pixmaps/%{name}.png %{_datadir}/applications/%{name}.desktop %doc AUTHORS ChangeLog COPYING DEBUG_LEVELS FAQ LICENSE -%doc README README.Contributing README.CVS README.Getting-Started -%doc README.MAPS README.win32 UPGRADE +%doc README README.Getting-Started +%doc README.MAPS UPGRADE %changelog +* Wed Mar 13 2019 Lucian Langa - 1:2.1.0-1 +- update to latest upstream release +- explicitly pass python3 shebang to tigerpoly script (#1676226) + * Sun Feb 03 2019 Fedora Release Engineering - 1:2.0.8-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 1fc835763f514fe21d815a1d25ddd81b4127f77a Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Sun, 17 Mar 2019 21:52:51 -0600 Subject: [PATCH 04/35] Rebuild for hdf5 1.10.5 --- xastir.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xastir.spec b/xastir.spec index c626e3c..2308223 100644 --- a/xastir.spec +++ b/xastir.spec @@ -2,7 +2,7 @@ Summary: Amateur Station Tracking and Reporting system for amateur radio Name: xastir Epoch: 1 Version: 2.1.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Source0: https://github.com/Xastir/Xastir/archive/Release-%{version}.tar.gz Source1: %{name}.desktop @@ -74,6 +74,9 @@ desktop-file-install \ %doc README.MAPS UPGRADE %changelog +* Mon Mar 18 2019 Orion Poplawski - 1:2.1.0-2 +- Rebuild for hdf5 1.10.5 + * Wed Mar 13 2019 Lucian Langa - 1:2.1.0-1 - update to latest upstream release - explicitly pass python3 shebang to tigerpoly script (#1676226) From 2a51df928be5c25d46f52f41b25e9e4344e4a7f7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 03:52:06 +0000 Subject: [PATCH 05/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xastir.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xastir.spec b/xastir.spec index 2308223..f7e3ab7 100644 --- a/xastir.spec +++ b/xastir.spec @@ -2,7 +2,7 @@ Summary: Amateur Station Tracking and Reporting system for amateur radio Name: xastir Epoch: 1 Version: 2.1.0 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Source0: https://github.com/Xastir/Xastir/archive/Release-%{version}.tar.gz Source1: %{name}.desktop @@ -74,6 +74,9 @@ desktop-file-install \ %doc README.MAPS UPGRADE %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 1:2.1.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Mon Mar 18 2019 Orion Poplawski - 1:2.1.0-2 - Rebuild for hdf5 1.10.5 From 44f449561c34e90d63b94d4d5f191182ef4a117f Mon Sep 17 00:00:00 2001 From: Lucian Langa Date: Sun, 22 Sep 2019 15:37:52 +0200 Subject: [PATCH 06/35] sync with latest upstream release --- xastir.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xastir.spec b/xastir.spec index f7e3ab7..f058cdb 100644 --- a/xastir.spec +++ b/xastir.spec @@ -1,7 +1,7 @@ Summary: Amateur Station Tracking and Reporting system for amateur radio Name: xastir -Epoch: 1 -Version: 2.1.0 +Epoch: 0 +Version: 2.1.4 Release: 3%{?dist} License: GPLv2+ Source0: https://github.com/Xastir/Xastir/archive/Release-%{version}.tar.gz @@ -10,7 +10,7 @@ Source2: %{name}.png URL: http://www.xastir.org Requires: wget BuildRequires: perl-generators -BuildRequires: wget, libXt-devel, festival, GraphicsMagick-devel +BuildRequires: wget, libXt-devel, GraphicsMagick-devel %if 0%{?fedora} >= 24 BuildRequires: motif-devel %else From c421c53cb20cc6f6f4bdb4f81dc70331e9a748c4 Mon Sep 17 00:00:00 2001 From: Lucian Langa Date: Sun, 22 Sep 2019 15:43:08 +0200 Subject: [PATCH 07/35] sync with latest upstream release --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 19068af..05704c8 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ xastir-1.9.8.tar.gz /xastir-2.0.6.tar.gz /xastir-2.0.8.tar.gz /Release-2.1.0.tar.gz +/Release-2.1.4.tar.gz diff --git a/sources b/sources index a0117cf..3f2aac0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Release-2.1.0.tar.gz) = 32c1297d6399c34078158853beba32a4d018d060088b014be004b0837a887c6360e417e1d59ed7865ea1caa3c07f59d7bb4ee3cf9c035e2aabf6ba4783e3d288 +SHA512 (Release-2.1.4.tar.gz) = e96f9de52499615cfe88708656d111d417e0d0e08f798b2d97f6a270db3e639c4fb5219767f8fd399fe75f51f02391ace87ae7175ae9a44cb5a4056ab7b573b1 From eb398d2817eadf9add7d00e6ce6d48aaa34fc4f4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 04:05:40 +0000 Subject: [PATCH 08/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xastir.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xastir.spec b/xastir.spec index f058cdb..306822c 100644 --- a/xastir.spec +++ b/xastir.spec @@ -2,7 +2,7 @@ Summary: Amateur Station Tracking and Reporting system for amateur radio Name: xastir Epoch: 0 Version: 2.1.4 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Source0: https://github.com/Xastir/Xastir/archive/Release-%{version}.tar.gz Source1: %{name}.desktop @@ -74,6 +74,9 @@ desktop-file-install \ %doc README.MAPS UPGRADE %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 0:2.1.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sat Jul 27 2019 Fedora Release Engineering - 1:2.1.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 75bebdb22dbf072abbff21e69e90314c6ab03120 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 3 Mar 2020 17:28:37 +0100 Subject: [PATCH 09/35] Rebuild (gdal) --- xastir.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xastir.spec b/xastir.spec index 306822c..1c4dedf 100644 --- a/xastir.spec +++ b/xastir.spec @@ -2,7 +2,7 @@ Summary: Amateur Station Tracking and Reporting system for amateur radio Name: xastir Epoch: 0 Version: 2.1.4 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ Source0: https://github.com/Xastir/Xastir/archive/Release-%{version}.tar.gz Source1: %{name}.desktop @@ -74,6 +74,9 @@ desktop-file-install \ %doc README.MAPS UPGRADE %changelog +* Tue Mar 03 2020 Sandro Mani - 0:2.1.4-5 +- Rebuild (gdal) + * Fri Jan 31 2020 Fedora Release Engineering - 0:2.1.4-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From bacca2a38c410bf04c18335cb3572941a6ed9282 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 3 Mar 2020 18:54:24 +0100 Subject: [PATCH 10/35] Fix GCC10 FTBFS --- xastir.spec | 3 +++ xastir_gcc10.patch | 45 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 xastir_gcc10.patch diff --git a/xastir.spec b/xastir.spec index 1c4dedf..9c58293 100644 --- a/xastir.spec +++ b/xastir.spec @@ -7,6 +7,8 @@ License: GPLv2+ Source0: https://github.com/Xastir/Xastir/archive/Release-%{version}.tar.gz Source1: %{name}.desktop Source2: %{name}.png +# Fix GCC10 FTBFS +Patch0: xastir_gcc10.patch URL: http://www.xastir.org Requires: wget BuildRequires: perl-generators @@ -29,6 +31,7 @@ software. %prep %setup -q -n Xastir-Release-%{version} +%patch0 -p1 %build #./bootstrap.sh diff --git a/xastir_gcc10.patch b/xastir_gcc10.patch new file mode 100644 index 0000000..aa40b6f --- /dev/null +++ b/xastir_gcc10.patch @@ -0,0 +1,45 @@ +diff -rupN Xastir-Release-2.1.4/src/main.c Xastir-Release-2.1.4-new/src/main.c +--- Xastir-Release-2.1.4/src/main.c 2019-07-15 00:30:31.000000000 +0200 ++++ Xastir-Release-2.1.4-new/src/main.c 2020-03-03 18:49:45.912293773 +0100 +@@ -266,6 +266,8 @@ uid_t euid; + gid_t egid; + + ++char xa_config_dir[1000]; ++ + int my_argc; + char **my_argv; + char **my_envp; +diff -rupN Xastir-Release-2.1.4/src/objects.h Xastir-Release-2.1.4-new/src/objects.h +--- Xastir-Release-2.1.4/src/objects.h 2019-07-15 00:30:31.000000000 +0200 ++++ Xastir-Release-2.1.4-new/src/objects.h 2020-03-03 18:41:57.644094783 +0100 +@@ -95,7 +95,7 @@ if (debug_level & 4) { fprintf(stderr, " + // + // number_of_predefined_objects holds the actual number of predefined + // objects available to display on the Create/Move popup menu. +-int number_of_predefined_objects; ++extern int number_of_predefined_objects; + // File name of ~/.xastir/config file containing definitions for + // a predefined object menu. + extern char predefined_object_definition_filename[256]; +diff -rupN Xastir-Release-2.1.4/src/xa_config.h Xastir-Release-2.1.4-new/src/xa_config.h +--- Xastir-Release-2.1.4/src/xa_config.h 2019-07-15 00:30:31.000000000 +0200 ++++ Xastir-Release-2.1.4-new/src/xa_config.h 2020-03-03 18:37:18.923499568 +0100 +@@ -31,4 +31,4 @@ char *get_data_base_dir(char *dir); + void save_data(void); + void load_data_or_default(void); + +-char xa_config_dir[1000]; /* cmdline option user config dir */ ++extern char xa_config_dir[1000]; /* cmdline option user config dir */ +diff -rupN Xastir-Release-2.1.4/src/x_spider.h Xastir-Release-2.1.4-new/src/x_spider.h +--- Xastir-Release-2.1.4/src/x_spider.h 2019-07-15 00:30:31.000000000 +0200 ++++ Xastir-Release-2.1.4-new/src/x_spider.h 2020-03-03 18:41:33.166133201 +0100 +@@ -31,7 +31,7 @@ + #define SERV_UDP_PORT 2023 + + +-char *pname; ++extern char *pname; + extern int pipe_xastir_to_tcp_server; + extern int pipe_tcp_server_to_xastir; + extern int pipe_xastir_to_udp_server; From 73e5576bc703373533dc554932b956299e339135 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Thu, 26 Mar 2020 20:26:15 +0000 Subject: [PATCH 11/35] Fix epoch, can't be decremented --- xastir.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xastir.spec b/xastir.spec index 9c58293..ab07d3a 100644 --- a/xastir.spec +++ b/xastir.spec @@ -1,8 +1,8 @@ Summary: Amateur Station Tracking and Reporting system for amateur radio Name: xastir -Epoch: 0 +Epoch: 1 Version: 2.1.4 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ Source0: https://github.com/Xastir/Xastir/archive/Release-%{version}.tar.gz Source1: %{name}.desktop @@ -77,6 +77,9 @@ desktop-file-install \ %doc README.MAPS UPGRADE %changelog +* Thu Mar 26 2020 Peter Robinson - 1:2.1.4-6 +- Fix epoch, can't be decremented + * Tue Mar 03 2020 Sandro Mani - 0:2.1.4-5 - Rebuild (gdal) From 92be48ff149c9cd7e485548fb3b3a299e21afb68 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 28 Jul 2020 12:17:09 -0400 Subject: [PATCH 12/35] BuildRequire xfontsel not xorg-x11-apps --- xastir.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xastir.spec b/xastir.spec index ab07d3a..e168487 100644 --- a/xastir.spec +++ b/xastir.spec @@ -2,7 +2,7 @@ Summary: Amateur Station Tracking and Reporting system for amateur radio Name: xastir Epoch: 1 Version: 2.1.4 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2+ Source0: https://github.com/Xastir/Xastir/archive/Release-%{version}.tar.gz Source1: %{name}.desktop @@ -20,7 +20,7 @@ BuildRequires: lesstif-devel %endif BuildRequires: dos2unix, libax25-devel, curl-devel, pcre-devel, proj-devel BuildRequires: python2-devel, gpsman, gdal-devel, db4-devel -BuildRequires: desktop-file-utils, xorg-x11-apps, hdf5-devel +BuildRequires: desktop-file-utils, xfontsel, hdf5-devel %description Xastir is a graphical application that interfaces HAM radio @@ -77,6 +77,9 @@ desktop-file-install \ %doc README.MAPS UPGRADE %changelog +* Tue Jul 28 2020 Adam Jackson - 2.1.4-7 +- BuildRequire xfontsel not xorg-x11-apps + * Thu Mar 26 2020 Peter Robinson - 1:2.1.4-6 - Fix epoch, can't be decremented From 05466513a90c22497e50933950f8dfb646ee5a9f Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Mon, 21 Sep 2020 16:05:43 -0600 Subject: [PATCH 13/35] Depend on libdb-devel rather than db4-devel --- xastir.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xastir.spec b/xastir.spec index e168487..d72398c 100644 --- a/xastir.spec +++ b/xastir.spec @@ -2,7 +2,7 @@ Summary: Amateur Station Tracking and Reporting system for amateur radio Name: xastir Epoch: 1 Version: 2.1.4 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2+ Source0: https://github.com/Xastir/Xastir/archive/Release-%{version}.tar.gz Source1: %{name}.desktop @@ -19,7 +19,7 @@ BuildRequires: motif-devel BuildRequires: lesstif-devel %endif BuildRequires: dos2unix, libax25-devel, curl-devel, pcre-devel, proj-devel -BuildRequires: python2-devel, gpsman, gdal-devel, db4-devel +BuildRequires: python2-devel, gpsman, gdal-devel, libdb-devel BuildRequires: desktop-file-utils, xfontsel, hdf5-devel %description @@ -77,6 +77,9 @@ desktop-file-install \ %doc README.MAPS UPGRADE %changelog +* Mon Sep 21 2020 Jeff Law - 2.1.4-8 +- Depend on libdb-devel rather than db4-devel + * Tue Jul 28 2020 Adam Jackson - 2.1.4-7 - BuildRequire xfontsel not xorg-x11-apps From dbf2b316486dc3d1a238ae8d0f50896150fb2423 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Tue, 12 Jan 2021 01:44:33 +0000 Subject: [PATCH 14/35] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- xastir.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xastir.spec b/xastir.spec index d72398c..4a04ac3 100644 --- a/xastir.spec +++ b/xastir.spec @@ -11,6 +11,7 @@ Source2: %{name}.png Patch0: xastir_gcc10.patch URL: http://www.xastir.org Requires: wget +BuildRequires: make BuildRequires: perl-generators BuildRequires: wget, libXt-devel, GraphicsMagick-devel %if 0%{?fedora} >= 24 From f4b71c6258b4cca4cc6413936897dd094915b5b0 Mon Sep 17 00:00:00 2001 From: Petr Viktorin Date: Wed, 12 Feb 2020 16:19:15 +0100 Subject: [PATCH 15/35] Switch BuildRequires to python3 --- xastir.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xastir.spec b/xastir.spec index 4a04ac3..baa040d 100644 --- a/xastir.spec +++ b/xastir.spec @@ -2,7 +2,7 @@ Summary: Amateur Station Tracking and Reporting system for amateur radio Name: xastir Epoch: 1 Version: 2.1.4 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv2+ Source0: https://github.com/Xastir/Xastir/archive/Release-%{version}.tar.gz Source1: %{name}.desktop @@ -20,7 +20,7 @@ BuildRequires: motif-devel BuildRequires: lesstif-devel %endif BuildRequires: dos2unix, libax25-devel, curl-devel, pcre-devel, proj-devel -BuildRequires: python2-devel, gpsman, gdal-devel, libdb-devel +BuildRequires: python3-devel, gpsman, gdal-devel, libdb-devel BuildRequires: desktop-file-utils, xfontsel, hdf5-devel %description @@ -78,6 +78,9 @@ desktop-file-install \ %doc README.MAPS UPGRADE %changelog +* Wed Jan 13 2021 Petr Viktorin - 2.1.4-9 +- Switch BuildRequires to python3 + * Mon Sep 21 2020 Jeff Law - 2.1.4-8 - Depend on libdb-devel rather than db4-devel From ca03bdb69256903a6b41824a4883c67fafa23fc0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 23:47:25 +0000 Subject: [PATCH 16/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xastir.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xastir.spec b/xastir.spec index baa040d..d4d7814 100644 --- a/xastir.spec +++ b/xastir.spec @@ -2,7 +2,7 @@ Summary: Amateur Station Tracking and Reporting system for amateur radio Name: xastir Epoch: 1 Version: 2.1.4 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv2+ Source0: https://github.com/Xastir/Xastir/archive/Release-%{version}.tar.gz Source1: %{name}.desktop @@ -78,6 +78,9 @@ desktop-file-install \ %doc README.MAPS UPGRADE %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 1:2.1.4-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jan 13 2021 Petr Viktorin - 2.1.4-9 - Switch BuildRequires to python3 From 220f4c4ec676245d8c49c8fd6de4138417363907 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 21:16:31 +0000 Subject: [PATCH 17/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xastir.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xastir.spec b/xastir.spec index d4d7814..83aae39 100644 --- a/xastir.spec +++ b/xastir.spec @@ -2,7 +2,7 @@ Summary: Amateur Station Tracking and Reporting system for amateur radio Name: xastir Epoch: 1 Version: 2.1.4 -Release: 10%{?dist} +Release: 11%{?dist} License: GPLv2+ Source0: https://github.com/Xastir/Xastir/archive/Release-%{version}.tar.gz Source1: %{name}.desktop @@ -78,6 +78,9 @@ desktop-file-install \ %doc README.MAPS UPGRADE %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 1:2.1.4-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Jan 27 2021 Fedora Release Engineering - 1:2.1.4-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From dd7e875f9329f445324a1d825bd9054f6e746d2e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 04:48:08 +0000 Subject: [PATCH 18/35] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xastir.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xastir.spec b/xastir.spec index 83aae39..b4d0818 100644 --- a/xastir.spec +++ b/xastir.spec @@ -2,7 +2,7 @@ Summary: Amateur Station Tracking and Reporting system for amateur radio Name: xastir Epoch: 1 Version: 2.1.4 -Release: 11%{?dist} +Release: 12%{?dist} License: GPLv2+ Source0: https://github.com/Xastir/Xastir/archive/Release-%{version}.tar.gz Source1: %{name}.desktop @@ -78,6 +78,9 @@ desktop-file-install \ %doc README.MAPS UPGRADE %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 1:2.1.4-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 1:2.1.4-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 01553589e71b18aa067d3c07683a81f2f5736b7c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 12:46:50 +0000 Subject: [PATCH 19/35] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xastir.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xastir.spec b/xastir.spec index b4d0818..1453e32 100644 --- a/xastir.spec +++ b/xastir.spec @@ -2,7 +2,7 @@ Summary: Amateur Station Tracking and Reporting system for amateur radio Name: xastir Epoch: 1 Version: 2.1.4 -Release: 12%{?dist} +Release: 13%{?dist} License: GPLv2+ Source0: https://github.com/Xastir/Xastir/archive/Release-%{version}.tar.gz Source1: %{name}.desktop @@ -78,6 +78,9 @@ desktop-file-install \ %doc README.MAPS UPGRADE %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 1:2.1.4-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jan 22 2022 Fedora Release Engineering - 1:2.1.4-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From e8e7c399182ca7746de49eba604f40737017f8b6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 07:08:37 +0000 Subject: [PATCH 20/35] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xastir.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xastir.spec b/xastir.spec index 1453e32..0e02ebd 100644 --- a/xastir.spec +++ b/xastir.spec @@ -2,7 +2,7 @@ Summary: Amateur Station Tracking and Reporting system for amateur radio Name: xastir Epoch: 1 Version: 2.1.4 -Release: 13%{?dist} +Release: 14%{?dist} License: GPLv2+ Source0: https://github.com/Xastir/Xastir/archive/Release-%{version}.tar.gz Source1: %{name}.desktop @@ -78,6 +78,9 @@ desktop-file-install \ %doc README.MAPS UPGRADE %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 1:2.1.4-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Jul 23 2022 Fedora Release Engineering - 1:2.1.4-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From d6519828ef8f3be6a051bf03a095bb41308e46d6 Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Tue, 25 Apr 2023 17:53:36 -0400 Subject: [PATCH 21/35] Fix C99 compatibility issue Related to: Upstream PR: https://github.com/Xastir/Xastir/pull/204 --- xastir-fedora-c99-1.patch | 39 +++++++++++++++++++++++++++++++++++++++ xastir-fedora-c99-2.patch | 39 +++++++++++++++++++++++++++++++++++++++ xastir.spec | 10 +++++++++- 3 files changed, 87 insertions(+), 1 deletion(-) create mode 100644 xastir-fedora-c99-1.patch create mode 100644 xastir-fedora-c99-2.patch diff --git a/xastir-fedora-c99-1.patch b/xastir-fedora-c99-1.patch new file mode 100644 index 0000000..1d78ba5 --- /dev/null +++ b/xastir-fedora-c99-1.patch @@ -0,0 +1,39 @@ +From 54447a68547fe3ea78668bbf290c5e19e2bc282f Mon Sep 17 00:00:00 2001 +From: Tom Russo +Date: Mon, 1 Feb 2021 10:23:00 -0700 +Subject: Fix autoconf probe for motif library + +The code for probing Motif tried to link a small test program that +uses XmGetDestination. This was done with no prologue including any +Motif headers, nor with all the correct arguments for +XmGetDestination. + +If a user is compiling Xastir using any CFLAG that includes "-Werror", +or if the compiler is excessively strict, this fails. + +This commit adds the prologue needed to get the correct prototype for +XmGetDestination, then calls it with the correct prototype in the test +program. + +This eliminates the warning on my system and should eliminate the +failure on systems where -Werror has somehow been forced into the +CFLAGS or otherwise enabled. It seems to be that way for at least one +Mac user after a recent upgrade. + +diff --git a/acinclude.m4 b/acinclude.m4 +index 8f026710..18b2530c 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -845,7 +845,11 @@ AC_PREPROC_IFELSE( + # Don't add to $LIBS permanently. + ac_save_LIBS="$LIBS" + LIBS="-l$xm_direct_test_library $LIBS" +-AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[${xm_direct_test_function}()]])], ++AC_LINK_IFELSE([AC_LANG_PROGRAM([ ++ [#include <$xm_direct_test_include> ++ #include ++ ]], ++ [[Display *foobar; ${xm_direct_test_function}(foobar)]])], + [ + LIBS="$ac_save_LIBS" + # We can link Motif programs with no special library path. diff --git a/xastir-fedora-c99-2.patch b/xastir-fedora-c99-2.patch new file mode 100644 index 0000000..146b5f8 --- /dev/null +++ b/xastir-fedora-c99-2.patch @@ -0,0 +1,39 @@ +diff -rup a/configure.ac b/configure.ac +--- a/configure.ac 2019-07-14 18:30:31.000000000 -0400 ++++ b/configure.ac 2023-04-25 16:42:30.079301542 -0400 +@@ -647,7 +647,7 @@ save_LDFLAGS="$LDFLAGS" + LDFLAGS="-Wl,--no-keep-memory $LDFLAGS" + AC_TRY_LINK([#include ], + [/* Stupid useless test for linker flags */ +- exit(0);], ++ return(0);], + xa_cv_no_keep_memory=yes, + xa_cv_no_keep_memory=no) + if test "${xa_cv_no_keep_memory}" = "no"; then +diff -rup a/configure b/configure +--- a/configure 2019-07-14 18:30:31.000000000 -0400 ++++ b/configure 2023-04-26 00:06:26.217336733 -0400 +@@ -8762,11 +8762,12 @@ $as_echo_n "checking for Motif libraries + LIBS="-l$xm_direct_test_library $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ +- ++#include <$xm_direct_test_include> ++#include + int + main () + { +-${xm_direct_test_function}() ++Display *foobar; ${xm_direct_test_function}(foobar) + ; + return 0; + } +@@ -12818,7 +12819,7 @@ int + main () + { + /* Stupid useless test for linker flags */ +- exit(0); ++ return(0); + ; + return 0; + } diff --git a/xastir.spec b/xastir.spec index 0e02ebd..7920fe5 100644 --- a/xastir.spec +++ b/xastir.spec @@ -2,13 +2,15 @@ Summary: Amateur Station Tracking and Reporting system for amateur radio Name: xastir Epoch: 1 Version: 2.1.4 -Release: 14%{?dist} +Release: 15%{?dist} License: GPLv2+ Source0: https://github.com/Xastir/Xastir/archive/Release-%{version}.tar.gz Source1: %{name}.desktop Source2: %{name}.png # Fix GCC10 FTBFS Patch0: xastir_gcc10.patch +Patch1: xastir-fedora-c99-1.patch +Patch2: xastir-fedora-c99-2.patch URL: http://www.xastir.org Requires: wget BuildRequires: make @@ -33,6 +35,9 @@ software. %prep %setup -q -n Xastir-Release-%{version} %patch0 -p1 +%patch1 -p1 +%patch2 -p1 +touch -r configure.ac aclocal.m4 Makefile.in config.h.in %build #./bootstrap.sh @@ -78,6 +83,9 @@ desktop-file-install \ %doc README.MAPS UPGRADE %changelog +* Tue Apr 25 2023 DJ Delorie - 1:2.1.4-15 +- Fix C99 compatibility issue + * Sat Jan 21 2023 Fedora Release Engineering - 1:2.1.4-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 1c844186a7c0a26828cfe1b1a3292a6bbb7231f4 Mon Sep 17 00:00:00 2001 From: AsciiWolf Date: Fri, 30 Jun 2023 21:48:51 +0000 Subject: [PATCH 22/35] Added AppStream metadata, better icon Resolves: rhbz#2218927 --- org.xastir.Xastir.metainfo.xml | 33 ++++++++++++++++ xastir.spec | 16 ++++++-- xastir.svg | 69 ++++++++++++++++++++++++++++++++++ 3 files changed, 115 insertions(+), 3 deletions(-) create mode 100644 org.xastir.Xastir.metainfo.xml create mode 100644 xastir.svg diff --git a/org.xastir.Xastir.metainfo.xml b/org.xastir.Xastir.metainfo.xml new file mode 100644 index 0000000..a94c70b --- /dev/null +++ b/org.xastir.Xastir.metainfo.xml @@ -0,0 +1,33 @@ + + + org.xastir.Xastir + CC0-1.0 + GPL-2.0 + + Xastir + APRS client + +

+ Xastir is a graphical application that interfaces HAM radio and internet access to realtime mapping software. +

+ +

+ Automatic Packet Reporting System (APRS) is an amateur radio based digital communication system for real-time exchange + of digital information to users on the network. +

+ + + xastir.desktop + + + + Main window + https://xastir.org/images/51875.jpg + + + + https://xastir.org + https://github.com/Xastir/Xastir/issues + + + diff --git a/xastir.spec b/xastir.spec index 7920fe5..88e8f8b 100644 --- a/xastir.spec +++ b/xastir.spec @@ -2,17 +2,20 @@ Summary: Amateur Station Tracking and Reporting system for amateur radio Name: xastir Epoch: 1 Version: 2.1.4 -Release: 15%{?dist} +Release: 16%{?dist} License: GPLv2+ Source0: https://github.com/Xastir/Xastir/archive/Release-%{version}.tar.gz Source1: %{name}.desktop Source2: %{name}.png +Source3: %{name}.svg +Source4: org.xastir.Xastir.metainfo.xml # Fix GCC10 FTBFS Patch0: xastir_gcc10.patch Patch1: xastir-fedora-c99-1.patch Patch2: xastir-fedora-c99-2.patch URL: http://www.xastir.org Requires: wget +Requires: hicolor-icon-theme BuildRequires: make BuildRequires: perl-generators BuildRequires: wget, libXt-devel, GraphicsMagick-devel @@ -62,10 +65,11 @@ rm -rf %{buildroot}/usr/share/doc rm %{buildroot}/usr/share/xastir/scripts/gpx2shape #strip exec bit from .pm files find %{buildroot} -type f -name '*.pm' -exec chmod -x {} 2>/dev/null ';' -mkdir -p %{buildroot}/usr/share/pixmaps/ -cp %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/%{name}.png +install -D -p -m644 %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/%{name}.png +install -D -p -m644 %{SOURCE3} %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg desktop-file-install \ --dir=%{buildroot}%{_datadir}/applications %{SOURCE1} +install -D -p -m644 %{SOURCE4} %{buildroot}%{_metainfodir}/org.xastir.Xastir.metainfo.xml %files %{_bindir}/xastir @@ -77,12 +81,18 @@ desktop-file-install \ %{_mandir}/man1/testdbfawk.* %{_datadir}/xastir %{_datadir}/pixmaps/%{name}.png +%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg %{_datadir}/applications/%{name}.desktop +%{_metainfodir}/org.xastir.Xastir.metainfo.xml %doc AUTHORS ChangeLog COPYING DEBUG_LEVELS FAQ LICENSE %doc README README.Getting-Started %doc README.MAPS UPGRADE %changelog +* Fri Jun 30 2023 Daniel Rusek - 1:2.1.4-16 +- Added AppStream metadata, better icon + Resolves: rhbz#2218927 + * Tue Apr 25 2023 DJ Delorie - 1:2.1.4-15 - Fix C99 compatibility issue diff --git a/xastir.svg b/xastir.svg new file mode 100644 index 0000000..8bc6429 --- /dev/null +++ b/xastir.svg @@ -0,0 +1,69 @@ + + + + + +Created by potrace 1.16, written by Peter Selinger 2001-2019 + + + + + + + + + + From 066469483cf4b95abaf8dab5c57dfed418696895 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 18:30:55 +0000 Subject: [PATCH 23/35] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xastir.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xastir.spec b/xastir.spec index 88e8f8b..e022a34 100644 --- a/xastir.spec +++ b/xastir.spec @@ -2,7 +2,7 @@ Summary: Amateur Station Tracking and Reporting system for amateur radio Name: xastir Epoch: 1 Version: 2.1.4 -Release: 16%{?dist} +Release: 17%{?dist} License: GPLv2+ Source0: https://github.com/Xastir/Xastir/archive/Release-%{version}.tar.gz Source1: %{name}.desktop @@ -89,6 +89,9 @@ install -D -p -m644 %{SOURCE4} %{buildroot}%{_metainfodir}/org.xastir.Xastir.met %doc README.MAPS UPGRADE %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 1:2.1.4-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Fri Jun 30 2023 Daniel Rusek - 1:2.1.4-16 - Added AppStream metadata, better icon Resolves: rhbz#2218927 From 5c5a6458d4da32221f294d5853f472ac7d65b6c4 Mon Sep 17 00:00:00 2001 From: Lucian Langa Date: Mon, 13 Nov 2023 21:26:02 +0100 Subject: [PATCH 24/35] update to latest upstream --- .gitignore | 1 + sources | 2 +- xastir-fedora-c99-1.patch | 39 --------------------------------- xastir-fedora-c99-2.patch | 39 --------------------------------- xastir.spec | 25 +++++++++++----------- xastir_gcc10.patch | 45 --------------------------------------- 6 files changed, 14 insertions(+), 137 deletions(-) delete mode 100644 xastir-fedora-c99-1.patch delete mode 100644 xastir-fedora-c99-2.patch delete mode 100644 xastir_gcc10.patch diff --git a/.gitignore b/.gitignore index 05704c8..8573b93 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ xastir-1.9.8.tar.gz /xastir-2.0.8.tar.gz /Release-2.1.0.tar.gz /Release-2.1.4.tar.gz +/Release-2.2.0.tar.gz diff --git a/sources b/sources index 3f2aac0..0eb8d81 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Release-2.1.4.tar.gz) = e96f9de52499615cfe88708656d111d417e0d0e08f798b2d97f6a270db3e639c4fb5219767f8fd399fe75f51f02391ace87ae7175ae9a44cb5a4056ab7b573b1 +SHA512 (Release-2.2.0.tar.gz) = d420118e9118ff837d72f17e78563c7e9d39cfcaf05fe12cbf51b50ed36b9307e4b33b0e8a0d056c504a280683c6eb97637e9c4fec3bf1f0d920cb46f6e2cc0b diff --git a/xastir-fedora-c99-1.patch b/xastir-fedora-c99-1.patch deleted file mode 100644 index 1d78ba5..0000000 --- a/xastir-fedora-c99-1.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 54447a68547fe3ea78668bbf290c5e19e2bc282f Mon Sep 17 00:00:00 2001 -From: Tom Russo -Date: Mon, 1 Feb 2021 10:23:00 -0700 -Subject: Fix autoconf probe for motif library - -The code for probing Motif tried to link a small test program that -uses XmGetDestination. This was done with no prologue including any -Motif headers, nor with all the correct arguments for -XmGetDestination. - -If a user is compiling Xastir using any CFLAG that includes "-Werror", -or if the compiler is excessively strict, this fails. - -This commit adds the prologue needed to get the correct prototype for -XmGetDestination, then calls it with the correct prototype in the test -program. - -This eliminates the warning on my system and should eliminate the -failure on systems where -Werror has somehow been forced into the -CFLAGS or otherwise enabled. It seems to be that way for at least one -Mac user after a recent upgrade. - -diff --git a/acinclude.m4 b/acinclude.m4 -index 8f026710..18b2530c 100644 ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -845,7 +845,11 @@ AC_PREPROC_IFELSE( - # Don't add to $LIBS permanently. - ac_save_LIBS="$LIBS" - LIBS="-l$xm_direct_test_library $LIBS" --AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[${xm_direct_test_function}()]])], -+AC_LINK_IFELSE([AC_LANG_PROGRAM([ -+ [#include <$xm_direct_test_include> -+ #include -+ ]], -+ [[Display *foobar; ${xm_direct_test_function}(foobar)]])], - [ - LIBS="$ac_save_LIBS" - # We can link Motif programs with no special library path. diff --git a/xastir-fedora-c99-2.patch b/xastir-fedora-c99-2.patch deleted file mode 100644 index 146b5f8..0000000 --- a/xastir-fedora-c99-2.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -rup a/configure.ac b/configure.ac ---- a/configure.ac 2019-07-14 18:30:31.000000000 -0400 -+++ b/configure.ac 2023-04-25 16:42:30.079301542 -0400 -@@ -647,7 +647,7 @@ save_LDFLAGS="$LDFLAGS" - LDFLAGS="-Wl,--no-keep-memory $LDFLAGS" - AC_TRY_LINK([#include ], - [/* Stupid useless test for linker flags */ -- exit(0);], -+ return(0);], - xa_cv_no_keep_memory=yes, - xa_cv_no_keep_memory=no) - if test "${xa_cv_no_keep_memory}" = "no"; then -diff -rup a/configure b/configure ---- a/configure 2019-07-14 18:30:31.000000000 -0400 -+++ b/configure 2023-04-26 00:06:26.217336733 -0400 -@@ -8762,11 +8762,12 @@ $as_echo_n "checking for Motif libraries - LIBS="-l$xm_direct_test_library $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ -- -+#include <$xm_direct_test_include> -+#include - int - main () - { --${xm_direct_test_function}() -+Display *foobar; ${xm_direct_test_function}(foobar) - ; - return 0; - } -@@ -12818,7 +12819,7 @@ int - main () - { - /* Stupid useless test for linker flags */ -- exit(0); -+ return(0); - ; - return 0; - } diff --git a/xastir.spec b/xastir.spec index e022a34..d16177d 100644 --- a/xastir.spec +++ b/xastir.spec @@ -1,18 +1,14 @@ Summary: Amateur Station Tracking and Reporting system for amateur radio Name: xastir Epoch: 1 -Version: 2.1.4 -Release: 17%{?dist} +Version: 2.2.0 +Release: 1%{?dist} License: GPLv2+ Source0: https://github.com/Xastir/Xastir/archive/Release-%{version}.tar.gz Source1: %{name}.desktop Source2: %{name}.png Source3: %{name}.svg Source4: org.xastir.Xastir.metainfo.xml -# Fix GCC10 FTBFS -Patch0: xastir_gcc10.patch -Patch1: xastir-fedora-c99-1.patch -Patch2: xastir-fedora-c99-2.patch URL: http://www.xastir.org Requires: wget Requires: hicolor-icon-theme @@ -24,9 +20,10 @@ BuildRequires: motif-devel %else BuildRequires: lesstif-devel %endif -BuildRequires: dos2unix, libax25-devel, curl-devel, pcre-devel, proj-devel +BuildRequires: dos2unix, libax25-devel, curl-devel, proj-devel, libXpm-devel BuildRequires: python3-devel, gpsman, gdal-devel, libdb-devel BuildRequires: desktop-file-utils, xfontsel, hdf5-devel +BuildRequires: autoconf, automake, shapelib-devel %description Xastir is a graphical application that interfaces HAM radio @@ -37,13 +34,10 @@ software. %prep %setup -q -n Xastir-Release-%{version} -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 touch -r configure.ac aclocal.m4 Makefile.in config.h.in %build -#./bootstrap.sh +./bootstrap.sh %configure --with-geotiff=/usr/include/libgeotiff make %{?_smp_mflags} for f in README ChangeLog ; do @@ -53,7 +47,6 @@ for f in README ChangeLog ; do rm -f $f.iso88591 done dos2unix -k scripts/toporama250k.pl -sed -i -e "s@#!/usr/bin/env python@#!/usr/bin/env python3@" scripts/Xastir_tigerpoly.py %install rm -rf %{buildroot} @@ -85,10 +78,16 @@ install -D -p -m644 %{SOURCE4} %{buildroot}%{_metainfodir}/org.xastir.Xastir.met %{_datadir}/applications/%{name}.desktop %{_metainfodir}/org.xastir.Xastir.metainfo.xml %doc AUTHORS ChangeLog COPYING DEBUG_LEVELS FAQ LICENSE -%doc README README.Getting-Started +%doc README %doc README.MAPS UPGRADE %changelog +* Wed Nov 01 2023 Lucian Langa - 1:2.2.0-1 +- drop pcre +- re-add shapelib depdency - interal shapelib dropped upstream +- drop all patches - fixed upstream +- upgrade to latest upstream + * Sat Jul 22 2023 Fedora Release Engineering - 1:2.1.4-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/xastir_gcc10.patch b/xastir_gcc10.patch deleted file mode 100644 index aa40b6f..0000000 --- a/xastir_gcc10.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -rupN Xastir-Release-2.1.4/src/main.c Xastir-Release-2.1.4-new/src/main.c ---- Xastir-Release-2.1.4/src/main.c 2019-07-15 00:30:31.000000000 +0200 -+++ Xastir-Release-2.1.4-new/src/main.c 2020-03-03 18:49:45.912293773 +0100 -@@ -266,6 +266,8 @@ uid_t euid; - gid_t egid; - - -+char xa_config_dir[1000]; -+ - int my_argc; - char **my_argv; - char **my_envp; -diff -rupN Xastir-Release-2.1.4/src/objects.h Xastir-Release-2.1.4-new/src/objects.h ---- Xastir-Release-2.1.4/src/objects.h 2019-07-15 00:30:31.000000000 +0200 -+++ Xastir-Release-2.1.4-new/src/objects.h 2020-03-03 18:41:57.644094783 +0100 -@@ -95,7 +95,7 @@ if (debug_level & 4) { fprintf(stderr, " - // - // number_of_predefined_objects holds the actual number of predefined - // objects available to display on the Create/Move popup menu. --int number_of_predefined_objects; -+extern int number_of_predefined_objects; - // File name of ~/.xastir/config file containing definitions for - // a predefined object menu. - extern char predefined_object_definition_filename[256]; -diff -rupN Xastir-Release-2.1.4/src/xa_config.h Xastir-Release-2.1.4-new/src/xa_config.h ---- Xastir-Release-2.1.4/src/xa_config.h 2019-07-15 00:30:31.000000000 +0200 -+++ Xastir-Release-2.1.4-new/src/xa_config.h 2020-03-03 18:37:18.923499568 +0100 -@@ -31,4 +31,4 @@ char *get_data_base_dir(char *dir); - void save_data(void); - void load_data_or_default(void); - --char xa_config_dir[1000]; /* cmdline option user config dir */ -+extern char xa_config_dir[1000]; /* cmdline option user config dir */ -diff -rupN Xastir-Release-2.1.4/src/x_spider.h Xastir-Release-2.1.4-new/src/x_spider.h ---- Xastir-Release-2.1.4/src/x_spider.h 2019-07-15 00:30:31.000000000 +0200 -+++ Xastir-Release-2.1.4-new/src/x_spider.h 2020-03-03 18:41:33.166133201 +0100 -@@ -31,7 +31,7 @@ - #define SERV_UDP_PORT 2023 - - --char *pname; -+extern char *pname; - extern int pipe_xastir_to_tcp_server; - extern int pipe_tcp_server_to_xastir; - extern int pipe_xastir_to_udp_server; From 8b6db8ac7afcc0d619e83e2e9045bfa1e7495127 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sun, 24 Dec 2023 11:00:03 +0100 Subject: [PATCH 25/35] Rebuild (shapelib) --- xastir.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xastir.spec b/xastir.spec index d16177d..62f8320 100644 --- a/xastir.spec +++ b/xastir.spec @@ -2,7 +2,7 @@ Summary: Amateur Station Tracking and Reporting system for amateur radio Name: xastir Epoch: 1 Version: 2.2.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Source0: https://github.com/Xastir/Xastir/archive/Release-%{version}.tar.gz Source1: %{name}.desktop @@ -82,6 +82,9 @@ install -D -p -m644 %{SOURCE4} %{buildroot}%{_metainfodir}/org.xastir.Xastir.met %doc README.MAPS UPGRADE %changelog +* Sun Dec 24 2023 Sandro Mani - 1:2.2.0-2 +- Rebuild (shapelib) + * Wed Nov 01 2023 Lucian Langa - 1:2.2.0-1 - drop pcre - re-add shapelib depdency - interal shapelib dropped upstream From ee6b7cef2cbb3885254127e839b72d2c7cae0dc2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 09:19:25 +0000 Subject: [PATCH 26/35] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- xastir.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xastir.spec b/xastir.spec index 62f8320..a3f5303 100644 --- a/xastir.spec +++ b/xastir.spec @@ -2,7 +2,7 @@ Summary: Amateur Station Tracking and Reporting system for amateur radio Name: xastir Epoch: 1 Version: 2.2.0 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Source0: https://github.com/Xastir/Xastir/archive/Release-%{version}.tar.gz Source1: %{name}.desktop @@ -82,6 +82,9 @@ install -D -p -m644 %{SOURCE4} %{buildroot}%{_metainfodir}/org.xastir.Xastir.met %doc README.MAPS UPGRADE %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 1:2.2.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Dec 24 2023 Sandro Mani - 1:2.2.0-2 - Rebuild (shapelib) From 9fe5116c4b587995775c702fc4902b20acd6d923 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 09:42:21 +0000 Subject: [PATCH 27/35] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- xastir.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xastir.spec b/xastir.spec index a3f5303..b83e14c 100644 --- a/xastir.spec +++ b/xastir.spec @@ -2,7 +2,7 @@ Summary: Amateur Station Tracking and Reporting system for amateur radio Name: xastir Epoch: 1 Version: 2.2.0 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Source0: https://github.com/Xastir/Xastir/archive/Release-%{version}.tar.gz Source1: %{name}.desktop @@ -82,6 +82,9 @@ install -D -p -m644 %{SOURCE4} %{buildroot}%{_metainfodir}/org.xastir.Xastir.met %doc README.MAPS UPGRADE %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 1:2.2.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 1:2.2.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 7c05b50c5e18ca88adfe2e88a046ad47d0abfd48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Fri, 26 Jul 2024 03:44:35 +0200 Subject: [PATCH 28/35] convert GPLv2+ license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- xastir.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/xastir.spec b/xastir.spec index b83e14c..cec914c 100644 --- a/xastir.spec +++ b/xastir.spec @@ -2,8 +2,9 @@ Summary: Amateur Station Tracking and Reporting system for amateur radio Name: xastir Epoch: 1 Version: 2.2.0 -Release: 4%{?dist} -License: GPLv2+ +Release: 5%{?dist} +# Automatically converted from old format: GPLv2+ - review is highly recommended. +License: GPL-2.0-or-later Source0: https://github.com/Xastir/Xastir/archive/Release-%{version}.tar.gz Source1: %{name}.desktop Source2: %{name}.png @@ -82,6 +83,9 @@ install -D -p -m644 %{SOURCE4} %{buildroot}%{_metainfodir}/org.xastir.Xastir.met %doc README.MAPS UPGRADE %changelog +* Fri Jul 26 2024 Miroslav Suchý - 1:2.2.0-5 +- convert license to SPDX + * Sat Jul 20 2024 Fedora Release Engineering - 1:2.2.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From d55506fb0793ced9b3671ede0c8ef23400542de1 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 25 Oct 2024 17:33:42 -0600 Subject: [PATCH 29/35] Rebuild for hdf5 1.14.5 --- xastir.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xastir.spec b/xastir.spec index cec914c..5ce3831 100644 --- a/xastir.spec +++ b/xastir.spec @@ -2,7 +2,7 @@ Summary: Amateur Station Tracking and Reporting system for amateur radio Name: xastir Epoch: 1 Version: 2.2.0 -Release: 5%{?dist} +Release: 6%{?dist} # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later Source0: https://github.com/Xastir/Xastir/archive/Release-%{version}.tar.gz @@ -83,6 +83,9 @@ install -D -p -m644 %{SOURCE4} %{buildroot}%{_metainfodir}/org.xastir.Xastir.met %doc README.MAPS UPGRADE %changelog +* Fri Oct 25 2024 Orion Poplawski - 1:2.2.0-6 +- Rebuild for hdf5 1.14.5 + * Fri Jul 26 2024 Miroslav Suchý - 1:2.2.0-5 - convert license to SPDX From d48b17b6f721568a0f74fe94ad660a4c4e2571b7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 15:25:14 +0000 Subject: [PATCH 30/35] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- xastir.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xastir.spec b/xastir.spec index 5ce3831..2295c64 100644 --- a/xastir.spec +++ b/xastir.spec @@ -2,7 +2,7 @@ Summary: Amateur Station Tracking and Reporting system for amateur radio Name: xastir Epoch: 1 Version: 2.2.0 -Release: 6%{?dist} +Release: 7%{?dist} # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later Source0: https://github.com/Xastir/Xastir/archive/Release-%{version}.tar.gz @@ -83,6 +83,9 @@ install -D -p -m644 %{SOURCE4} %{buildroot}%{_metainfodir}/org.xastir.Xastir.met %doc README.MAPS UPGRADE %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 1:2.2.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Oct 25 2024 Orion Poplawski - 1:2.2.0-6 - Rebuild for hdf5 1.14.5 From 2d30c2fa91b788c4cf661f57cb79ef1f1a792e0f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:37:30 +0000 Subject: [PATCH 31/35] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- xastir.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xastir.spec b/xastir.spec index 2295c64..9e30378 100644 --- a/xastir.spec +++ b/xastir.spec @@ -2,7 +2,7 @@ Summary: Amateur Station Tracking and Reporting system for amateur radio Name: xastir Epoch: 1 Version: 2.2.0 -Release: 7%{?dist} +Release: 8%{?dist} # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later Source0: https://github.com/Xastir/Xastir/archive/Release-%{version}.tar.gz @@ -83,6 +83,9 @@ install -D -p -m644 %{SOURCE4} %{buildroot}%{_metainfodir}/org.xastir.Xastir.met %doc README.MAPS UPGRADE %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 1:2.2.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sun Jan 19 2025 Fedora Release Engineering - 1:2.2.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 04755224af6228e4014ec28fa75c2be7097ada2a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:27:20 +0000 Subject: [PATCH 32/35] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- xastir.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xastir.spec b/xastir.spec index 9e30378..54ddc0d 100644 --- a/xastir.spec +++ b/xastir.spec @@ -2,7 +2,7 @@ Summary: Amateur Station Tracking and Reporting system for amateur radio Name: xastir Epoch: 1 Version: 2.2.0 -Release: 8%{?dist} +Release: 9%{?dist} # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later Source0: https://github.com/Xastir/Xastir/archive/Release-%{version}.tar.gz @@ -83,6 +83,9 @@ install -D -p -m644 %{SOURCE4} %{buildroot}%{_metainfodir}/org.xastir.Xastir.met %doc README.MAPS UPGRADE %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 1:2.2.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Fri Jul 25 2025 Fedora Release Engineering - 1:2.2.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 5bc2218b2d3d8a81b31fce69925bbd54fba2ea20 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Fri, 27 Feb 2026 08:04:12 -0700 Subject: [PATCH 33/35] Drop BR on gpsman --- xastir.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xastir.spec b/xastir.spec index 54ddc0d..8d33190 100644 --- a/xastir.spec +++ b/xastir.spec @@ -22,7 +22,7 @@ BuildRequires: motif-devel BuildRequires: lesstif-devel %endif BuildRequires: dos2unix, libax25-devel, curl-devel, proj-devel, libXpm-devel -BuildRequires: python3-devel, gpsman, gdal-devel, libdb-devel +BuildRequires: python3-devel, gdal-devel, libdb-devel BuildRequires: desktop-file-utils, xfontsel, hdf5-devel BuildRequires: autoconf, automake, shapelib-devel From 3e6017fe3652ba65bb8ac990fd5e2c67f1929bff Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 16 Apr 2026 19:30:55 -0600 Subject: [PATCH 34/35] Rebuild for hdf5 2.1 --- xastir.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xastir.spec b/xastir.spec index 8d33190..ec023c3 100644 --- a/xastir.spec +++ b/xastir.spec @@ -2,7 +2,7 @@ Summary: Amateur Station Tracking and Reporting system for amateur radio Name: xastir Epoch: 1 Version: 2.2.0 -Release: 9%{?dist} +Release: 10%{?dist} # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later Source0: https://github.com/Xastir/Xastir/archive/Release-%{version}.tar.gz @@ -83,6 +83,9 @@ install -D -p -m644 %{SOURCE4} %{buildroot}%{_metainfodir}/org.xastir.Xastir.met %doc README.MAPS UPGRADE %changelog +* Fri Apr 17 2026 Orion Poplawski - 1:2.2.0-10 +- Rebuild for hdf5 2.1 + * Sat Jan 17 2026 Fedora Release Engineering - 1:2.2.0-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From 9a2cbd0a3b5ba9a1d8c283458c2db7ad0c01ea4f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 09:00:45 +0000 Subject: [PATCH 35/35] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- xastir.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xastir.spec b/xastir.spec index ec023c3..f7c9c6d 100644 --- a/xastir.spec +++ b/xastir.spec @@ -2,7 +2,7 @@ Summary: Amateur Station Tracking and Reporting system for amateur radio Name: xastir Epoch: 1 Version: 2.2.0 -Release: 10%{?dist} +Release: 11%{?dist} # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later Source0: https://github.com/Xastir/Xastir/archive/Release-%{version}.tar.gz @@ -83,6 +83,9 @@ install -D -p -m644 %{SOURCE4} %{buildroot}%{_metainfodir}/org.xastir.Xastir.met %doc README.MAPS UPGRADE %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 1:2.2.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Fri Apr 17 2026 Orion Poplawski - 1:2.2.0-10 - Rebuild for hdf5 2.1