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/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/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.spec b/xastir.spec index ab07d3a..f7c9c6d 100644 --- a/xastir.spec +++ b/xastir.spec @@ -1,16 +1,19 @@ Summary: Amateur Station Tracking and Reporting system for amateur radio Name: xastir Epoch: 1 -Version: 2.1.4 -Release: 6%{?dist} -License: GPLv2+ +Version: 2.2.0 +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 Source1: %{name}.desktop Source2: %{name}.png -# Fix GCC10 FTBFS -Patch0: xastir_gcc10.patch +Source3: %{name}.svg +Source4: org.xastir.Xastir.metainfo.xml URL: http://www.xastir.org Requires: wget +Requires: hicolor-icon-theme +BuildRequires: make BuildRequires: perl-generators BuildRequires: wget, libXt-devel, GraphicsMagick-devel %if 0%{?fedora} >= 24 @@ -18,9 +21,10 @@ BuildRequires: motif-devel %else 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: dos2unix, libax25-devel, curl-devel, proj-devel, libXpm-devel +BuildRequires: python3-devel, 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 @@ -31,10 +35,10 @@ software. %prep %setup -q -n Xastir-Release-%{version} -%patch0 -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 @@ -44,7 +48,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} @@ -56,10 +59,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 @@ -71,12 +75,84 @@ 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 %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 + +* 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 + +* 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 + +* 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 + +* 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) + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + +* 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 + * Thu Mar 26 2020 Peter Robinson - 1:2.1.4-6 - Fix epoch, can't be decremented 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 + + + + + + + + + + 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;