commit ba5f326d27d78a8ebefd79539421ca05961b6342 Author: Jaroslav Škarvada <jskarvad(a)redhat.com&gt; Date: Tue Jul 25 18:37:27 2023 +0200 Added AppStream metadata .gitignore | 1 + dream-2.2-hamlib-4-fix.patch | 33 ---------------------- ...20-fix.patch => dream-2.3.0-gpsd-3.20-fix.patch | 4 +-- ...23-fix.patch => dream-2.3.0-gpsd-3.23-fix.patch | 2 +- dream-2.3.0-hamlib-4-fix.patch | 11 ++++++++ dream.spec | 25 ++++++++++------ sources | 2 +- 7 files changed, 33 insertions(+), 45 deletions(-) --- diff --git a/.gitignore b/.gitignore index e56375e..af57b64 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /dream_*.tar.gz +/drm-code-r1406-branches-dream-ollie-deployed.zip diff --git a/dream-2.2-gpsd-3.20-fix.patch b/dream-2.3.0-gpsd-3.20-fix.patch similarity index 92% rename from dream-2.2-gpsd-3.20-fix.patch rename to dream-2.3.0-gpsd-3.20-fix.patch index 1fa23aa..d227aab 100644 --- a/dream-2.2-gpsd-3.20-fix.patch +++ b/dream-2.3.0-gpsd-3.20-fix.patch @@ -19,8 +19,8 @@ index 15e0c33..cb0de4e 100644 if (gps_data.set&TIME_SET) { -- time_t time = (time_t)gps_data.fix.time; -+ time_t time = (time_t)gps_data.fix.time.tv_sec; +- time_t time = (time_t) gps_data.fix.time; ++ time_t time = (time_t) gps_data.fix.time.tv_sec; struct tm * ptm; ptm = gmtime ( &time ); Enqueue((uint32_t) ptm->tm_hour, SIZEOF__BYTE); diff --git a/dream-2.2-gpsd-3.23-fix.patch b/dream-2.3.0-gpsd-3.23-fix.patch similarity index 98% rename from dream-2.2-gpsd-3.23-fix.patch rename to dream-2.3.0-gpsd-3.23-fix.patch index 06c7342..e06b44d 100644 --- a/dream-2.2-gpsd-3.23-fix.patch +++ b/dream-2.3.0-gpsd-3.23-fix.patch @@ -19,7 +19,7 @@ index cb0de4e..fcd4b7b 100644 uint32_t source = 0xff; // GPS_SOURCE_NOT_AVAILABLE PrepareTag(26 * SIZEOF__BYTE); if(gps_data.set&STATUS_SET) { -- switch(gps_data.status) { +- switch(gps_data.status) { + switch(gps_data.fix.status) { case 0: source = 3; break; // manual case 1: source = 1; break; // gps diff --git a/dream-2.3.0-hamlib-4-fix.patch b/dream-2.3.0-hamlib-4-fix.patch new file mode 100644 index 0000000..33832c4 --- /dev/null +++ b/dream-2.3.0-hamlib-4-fix.patch @@ -0,0 +1,11 @@ +diff --git a/src/GUI-QT/DialogUtil.h b/src/GUI-QT/DialogUtil.h +--- a/src/GUI-QT/DialogUtil.h ++++ b/src/GUI-QT/DialogUtil.h +@@ -48,7 +48,6 @@ + #include <qwt_thermo.h> /* S-Meter */ + + class CRig; +-typedef int rig_model_t; + + /* Definitions ****************************************************************/ + diff --git a/dream.spec b/dream.spec index 548f166..4b1798c 100644 --- a/dream.spec +++ b/dream.spec @@ -1,20 +1,27 @@ +# https://sourceforge.net/p/drm/code/HEAD/tree/branches/dream-ollie-deployed/ +%global svn_revision r1406 +%global svn_date 20230725 +%global svn_name drm-code-%{svn_revision}-branches-dream-ollie-deployed + +%global svn_suffix %{svn_date}svn%{svn_revision} + Name: dream -Version: 2.2 -Release: 13%{?dist} +Version: 2.3.0~%{svn_suffix} +Release: 1%{?dist} Summary: A software radio for AM and Digital Radio Mondiale (DRM) License: GPLv2+ URL: https://sourceforge.net/projects/drm/ -Source0: https://sourceforge.net/projects/drm/files/dream/%{version}/dream_%{versi... +#Source0: https://sourceforge.net/projects/drm/files/dream/%%{version}/dream_%%{ver... +Source0: https://sourceforge.net/code-snapshots/svn/d/dr/drm/code/%{svn_name}.zip Source1: dream.desktop Source2: net.sourceforge.Dream.metainfo.xml Patch0: dream-2.2-use-system-libs.patch - # https://sourceforge.net/p/drm/tickets/233/ -Patch1: dream-2.2-hamlib-4-fix.patch +Patch1: dream-2.3.0-hamlib-4-fix.patch # https://sourceforge.net/p/drm/tickets/234/ -Patch2: dream-2.2-gpsd-3.20-fix.patch +Patch2: dream-2.3.0-gpsd-3.20-fix.patch # https://sourceforge.net/p/drm/tickets/235/ -Patch3: dream-2.2-gpsd-3.23-fix.patch +Patch3: dream-2.3.0-gpsd-3.23-fix.patch Patch4: dream-2.2-fix-qwttext.patch BuildRequires: gcc-c++ BuildRequires: hamlib-devel @@ -31,6 +38,8 @@ BuildRequires: qt5-qtwebkit-devel BuildRequires: desktop-file-utils BuildRequires: libpcap-devel BuildRequires: faac-devel > 1.29.9.2-3 +BuildRequires: fdk-aac-free-devel +BuildRequires: SoapySDR-devel # for future new release #BuildRequires: fdk-aac-free-devel #BuildRequires: SoapySDR-devel @@ -42,7 +51,7 @@ With Dream, DRM broadcasts can be received with a modified analog receiver (SW, MW, LW) and a PC with a sound card. %prep -%autosetup -p1 -n dream-%{version} +%autosetup -p1 -n %{svn_name} %build OUT_PWD="%{_prefix}" %{qmake_qt5} ./dream.pro diff --git a/sources b/sources index 529876e..455aefc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -df3d272ce491aafd7de843c8d9ff5e63 dream_2.2.orig.tar.gz +SHA512 (drm-code-r1406-branches-dream-ollie-deployed.zip) = 2a9c8d2a240b662f87b7245a8f9a4fc4126371005de38ef232338357e1f299f4955a3ab60360c7b9c791cd4f01295396d7a31f3693dbfb17274d8e25b239ee18