Update to latest upstream release.

This commit is contained in:
Richard M. Shaw 2015-09-24 11:30:35 -05:00
parent bdee92a8ce
commit c732223459
5 changed files with 62 additions and 11 deletions

1
.gitignore vendored
View File

@ -34,3 +34,4 @@ fldigi-3.20.20.tar.gz
/fldigi-3.22.11.tar.gz
/fldigi-3.22.12.tar.gz
/fldigi-3.22.13.tar.gz
/fldigi-3.23.01.tar.gz

23
fldigi.appdata.xml Normal file
View File

@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright 2014 Richard Shaw <hobbes1069@gmail.com -->
<application>
<id type="desktop">fldigi.desktop</id>
<metadata_license>CC0</metadata_license>
<project_license>GPL-3.0+</project_license>
<name>Fldigi</name>
<summary>Amateur Radio Sound Card Communications</summary>
<description>
<p>
Fldigi is a modem program which supports most of the digital modes used by
ham radio operators today. You can also use the program for calibrating your
sound card to WWV or doing a frequency measurement test. The program also comes
with a CW decoder. fldigi is written with the help of the Fast Light Toolkit X
GUI. Fldigi is a fast moving project many added features with each update.
</p>
</description>
<screenshots>
<screenshot type="default">https://hobbes1069.fedorapeople.org/screenshots/fldigi.png</screenshot>
</screenshots>
<url type="homepage">http://www.w1hkj.com/</url>
<updatecontact>hobbes1069_at_gmail.com</updatecontact>
</application>

View File

@ -1,15 +1,16 @@
%global _hardened_build 1
#global prerel AM
#global prerel beta
Name: fldigi
Version: 3.22.13
Release: 2%{?prerel:.%{prerel}}%{?dist}
Version: 3.23.01
Release: 1%{?prerel:.%{prerel}}%{?dist}
Summary: Digital modem program for Linux
License: GPLv3+
URL: http://www.w1hkj.com/Fldigi.html
Source0: http://www.w1hkj.com/downloads/%{name}/%{name}-%{version}%{?prerel}.tar.gz
Source1: http://www.w1hkj.com/downloads/fldigi/FLDigi_3.22_Users_Manual.pdf
Source1: http://www.w1hkj.com/downloads/fldigi/FLDigi_3.23_Users_Manual.pdf
Source100: fldigi.appdata.xml
BuildRequires: hamlib-devel
BuildRequires: fltk-devel >= 1.3
@ -72,9 +73,10 @@ make %{?_smp_mflags} CFLAGS="%{optflags}" LIBS="-lm -lX11 -lpthread" V=1
desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
desktop-file-validate %{buildroot}%{_datadir}/applications/flarq.desktop
# Remove fldigi-shell as it will no longer be installed by default in future
# versions.
rm -f %{buildroot}%{_bindir}/fldigi-shell
# Add fldigi-psk.png as it's in PNG format and higher resolution than the XPM.
mkdir -p %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/
install -pm 0644 data/fldigi-psk.png \
%{buildroot}%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
%find_lang %{name}
@ -82,6 +84,26 @@ rm -f %{buildroot}%{_bindir}/fldigi-shell
mkdir -p %{buildroot}%{_docdir}/%{name}
install -pm 0644 %{SOURCE1} %{buildroot}%{_docdir}/%{name}/
%if 0%{?fedora}
# Install and validate appdata file
mkdir -p %{buildroot}%{_datadir}/appdata
install %{SOURCE100} -pm 0644 %{buildroot}%{_datadir}/appdata/
appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata.xml
%endif
%post
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%postun
if [ $1 -eq 0 ] ; then
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
%posttrans
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files -f %{name}.lang
%if 0%{?rhel} < 7 || 0%{?fedora} < 21
%doc COPYING
@ -90,20 +112,25 @@ install -pm 0644 %{SOURCE1} %{buildroot}%{_docdir}/%{name}/
%endif
%doc AUTHORS ChangeLog README NEWS
%{_bindir}/*
%{_datadir}/pixmaps/%{name}.xpm
%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
%{_datadir}/pixmaps/%{name}.xpm
%{_datadir}/pixmaps/flarq.xpm
%{_mandir}/man1/%{name}.1.gz
%{_mandir}/man1/flarq.1.gz
%{?fedora:%{_datadir}/appdata/fldigi.appdata.xml}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/applications/flarq.desktop
%{_datadir}/%{name}/
%exclude %{_docdir}/%{name}/FLDigi_3.22_Users_Manual.pdf
%exclude %{_docdir}/%{name}/FLDigi_3.23_Users_Manual.pdf
%files doc
%{_docdir}/%{name}/FLDigi_3.22_Users_Manual.pdf
%{_docdir}/%{name}/FLDigi_3.23_Users_Manual.pdf
%changelog
* Tue Sep 22 2015 Richard Shaw <hobbes1069@gmail.com> - 3.23.01-1
- Update to latest upstream release.
* Fri Sep 18 2015 Richard Hughes <rhughes@redhat.com> - 3.22.13-2
- Remove now-unused AppData file

View File

@ -1 +1 @@
6a6eccf95360c94ab9304e75a7920970 fldigi-3.22.13.tar.gz
2a81ea3e67b21a15e76576cacd307d58 fldigi-3.23.01.tar.gz