diff --git a/.gitignore b/.gitignore index b788872..277268f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ xfhell-1.9.tar.gz -/xfhell-3.5.1.tar.bz2 diff --git a/sources b/sources index 730f3b8..a8dbcf3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xfhell-3.5.1.tar.bz2) = daa271a91e174fba5d7ad3237f56451dbc91e855c0c3775a5d5b5f5d7fce4ada332cb8084eb08cbf1c74b55b33f62eaaa7dd8439c08a61dcde0764599ec8b1b4 +7d805d2be5fb2a67f820f488b33263e5 xfhell-1.9.tar.gz diff --git a/xfhell-1.9-format-security.patch b/xfhell-1.9-format-security.patch deleted file mode 100644 index 53b8a84..0000000 --- a/xfhell-1.9-format-security.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/utils.c b/src/utils.c -index b2dfcc3..ff76b98 100644 ---- a/src/utils.c -+++ b/src/utils.c -@@ -827,7 +827,7 @@ Save_Pixbuf( void ) - "jpeg", &error, "quality", "75", NULL ); - if( error != NULL ) - { -- fprintf( stderr, error->message ); -+ fprintf( stderr, "%s", error->message ); - Error_Dialog( "Failed to save Receive pixbuf\n", FALSE ); - } - diff --git a/xfhell-Makefile.patch b/xfhell-Makefile.patch deleted file mode 100644 index 837aa03..0000000 --- a/xfhell-Makefile.patch +++ /dev/null @@ -1,44 +0,0 @@ ---- a/Makefile.am -+++ b/Makefile.am -@@ -50,16 +50,9 @@ install-data-local: - cp files/$(PACKAGE).png $(DESTDIR)/usr/share/pixmaps/; \ - fi; \ - if !(test -d $(DESTDIR)/usr/share/doc/$(PACKAGE)); then \ -- mkdir $(DESTDIR)/usr/share/doc/$(PACKAGE)/; \ -+ mkdir -p $(DESTDIR)/usr/share/doc/$(PACKAGE)/; \ - fi; \ - if test -d doc/; then \ - cp -r doc/* $(DESTDIR)/usr/share/doc/$(PACKAGE)/; \ -- cp -r doc/$(PACKAGE).1.gz $(DESTDIR)/usr/share/man/man1/; \ -- fi; \ -- if !(test -d /home/`logname`/$(PACKAGE)); then \ -- cp -r $(PACKAGE) /home/`logname`/; \ -- else \ -- cp $(PACKAGE)/$(PACKAGE).glade /home/`logname`/$(PACKAGE); \ -- fi; \ -- chown -R `logname`:`logname` /home/`logname`/$(PACKAGE); -+ fi; - ---- a/Makefile.in -+++ b/Makefile.in -@@ -903,18 +903,11 @@ install-data-local: - cp files/$(PACKAGE).png $(DESTDIR)/usr/share/pixmaps/; \ - fi; \ - if !(test -d $(DESTDIR)/usr/share/doc/$(PACKAGE)); then \ -- mkdir $(DESTDIR)/usr/share/doc/$(PACKAGE)/; \ -+ mkdir -p $(DESTDIR)/usr/share/doc/$(PACKAGE)/; \ - fi; \ - if test -d doc/; then \ - cp -r doc/* $(DESTDIR)/usr/share/doc/$(PACKAGE)/; \ -- cp -r doc/$(PACKAGE).1.gz $(DESTDIR)/usr/share/man/man1/; \ -- fi; \ -- if !(test -d /home/`logname`/$(PACKAGE)); then \ -- cp -r $(PACKAGE) /home/`logname`/; \ -- else \ -- cp $(PACKAGE)/$(PACKAGE).glade /home/`logname`/$(PACKAGE); \ -- fi; \ -- chown -R `logname`:`logname` /home/`logname`/$(PACKAGE); -+ fi; - - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/xfhell-configure-c99.patch b/xfhell-configure-c99.patch deleted file mode 100644 index ed0ab56..0000000 --- a/xfhell-configure-c99.patch +++ /dev/null @@ -1,16 +0,0 @@ -Include for the exit function. This avoids an implicit -function declaration and mishandling of this test with future -compilers. - -diff --git a/m4/intdiv0.m4 b/m4/intdiv0.m4 -index 744b99ea8da87ca1..f5cbd3e944362697 100644 ---- a/m4/intdiv0.m4 -+++ b/m4/intdiv0.m4 -@@ -33,6 +33,7 @@ changequote([,])dnl - [AC_LANG_SOURCE([[ - #include - #include -+#include - - static void - sigfpe_handler (int sig) diff --git a/xfhell.spec b/xfhell.spec index fcc2d00..ca0eeb9 100644 --- a/xfhell.spec +++ b/xfhell.spec @@ -1,28 +1,19 @@ Name: xfhell -Version: 3.5.1 -Release: 16%{?dist} +Version: 1.9 +Release: 10%{?dist} Summary: GTK based Ham Radio application for the Hellschreiber communications mode -# Automatically converted from old format: GPLv2+ - review is highly recommended. -License: GPL-2.0-or-later -URL: http://www.5b4az.org/ -Source0: http://www.5b4az.org/pkg/%{name}/%{name}-%{version}.tar.bz2 +Group: Applications/Communications +License: GPLv2+ +URL: http://5b4az.chronos.org.uk/pages/digital.html +Source0: http://5b4az.chronos.org.uk/pkg/%{name}/%{name}-%{version}.tar.gz #add .desktop file Source1: %{name}.desktop #temporary Icon Source2: %{name}.png -Patch0: xfhell-Makefile.patch -Patch1: xfhell-configure-c99.patch - -BuildRequires: make -BuildRequires: gcc gcc-c++ -BuildRequires: autoconf, automake, libtool -BuildRequires: desktop-file-utils -BuildRequires: alsa-lib-devel -BuildRequires: glib2-devel -BuildRequires: gtk3-devel - +BuildRequires: autoconf, automake, gtk2-devel, desktop-file-utils +#Requires: %description xfhell is a GTK+ application for the "fuzzy" digital amateur radio @@ -30,15 +21,13 @@ communication mode known as Hellschreiber. %prep -%autosetup -p1 +%setup -qn %{name} %build ./autogen.sh -export CFLAGS="%{optflags} `pkg-config --cflags gmodule-2.0`" -export LDFLAGS="%{optflags} -lm `pkg-config --libs gmodule-2.0`" %configure -%make_build +make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" LIBS=" -lm" %install @@ -47,14 +36,9 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" # no upstream .desktop or icon yet mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/ cp -p %{SOURCE2} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/%{name}.png - desktop-file-install \ --dir=${RPM_BUILD_ROOT}%{_datadir}/applications %{SOURCE1} -rm -f %{buildroot}%{_docdir}/%{name}/%{name}.1.gz -mkdir -p %{buildroot}%{_mandir}/man1 -cp -a doc/%{name}.1.gz %{buildroot}%{_mandir}/man1/ - %files #Missing copy of the GPL, Notified upstream @@ -63,100 +47,8 @@ cp -a doc/%{name}.1.gz %{buildroot}%{_mandir}/man1/ %{_bindir}/* %{_datadir}/pixmaps/%{name}.png %{_datadir}/applications/%{name}.desktop -%{_mandir}/man1/%{name}.1* - %changelog -* Fri Jul 17 2026 Fedora Release Engineering - 3.5.1-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild - -* Sat Jan 17 2026 Fedora Release Engineering - 3.5.1-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Fri Jul 25 2025 Fedora Release Engineering - 3.5.1-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sun Jan 19 2025 Fedora Release Engineering - 3.5.1-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Fri Jul 26 2024 Miroslav Suchý - 3.5.1-12 -- convert license to SPDX - -* Sat Jul 20 2024 Fedora Release Engineering - 3.5.1-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sat Jan 27 2024 Fedora Release Engineering - 3.5.1-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jul 22 2023 Fedora Release Engineering - 3.5.1-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Jan 21 2023 Fedora Release Engineering - 3.5.1-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Tue Jan 03 2023 Florian Weimer - 3.5.1-7 -- C99 compatibility fixes (#2157935) - -* Sat Jul 23 2022 Fedora Release Engineering - 3.5.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Jan 22 2022 Fedora Release Engineering - 3.5.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 3.5.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Thu Jan 28 2021 Fedora Release Engineering - 3.5.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jul 29 2020 Fedora Release Engineering - 3.5.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed Feb 19 2020 Richard Shaw - 3.5.1-1 -- Update to 3.5.1. - -* Fri Jan 31 2020 Fedora Release Engineering - 1.9-24 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Jul 27 2019 Fedora Release Engineering - 1.9-23 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 03 2019 Fedora Release Engineering - 1.9-22 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 1.9-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Fedora Release Engineering - 1.9-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Aug 03 2017 Fedora Release Engineering - 1.9-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 1.9-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 1.9-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Feb 05 2016 Fedora Release Engineering - 1.9-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jun 19 2015 Fedora Release Engineering - 1.9-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Mon Aug 18 2014 Fedora Release Engineering - 1.9-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Fri Jun 20 2014 Yaakov Selkowitz - 1.9-13 -- Fix FTBFS with -Werror=format-security (#1037396, #1107276) - -* Sun Jun 08 2014 Fedora Release Engineering - 1.9-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sun Aug 04 2013 Fedora Release Engineering - 1.9-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - * Sun Feb 10 2013 Parag Nemade - 1.9-10 - Remove vendor tag from desktop file as per https://fedorahosted.org/fesco/ticket/1077 - Cleanup spec as per recently changed packaging guidelines