From bda3fa18c78f5d2752b0e0cbb2b084cb1ea415cc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 12 Jul 2018 20:05:06 +0000 Subject: [PATCH 01/27] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- airspyone_host.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/airspyone_host.spec b/airspyone_host.spec index 885782e..c7c35b4 100644 --- a/airspyone_host.spec +++ b/airspyone_host.spec @@ -6,7 +6,7 @@ Name: airspyone_host Version: 1.0.9 -Release: 3.%{git_suffix}%{?dist} +Release: 4.%{git_suffix}%{?dist} Summary: AirSpy host tools and library License: GPLv2+ @@ -75,6 +75,9 @@ mv %{buildroot}%{_sysconfdir}/udev/rules.d/52-airspy.rules %{buildroot}%{_udevru %{_libdir}/libairspy.so %changelog +* Thu Jul 12 2018 Fedora Release Engineering - 1.0.9-4.20180615gitbfb66708 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Mon Jun 18 2018 Jaroslav Škarvada - 1.0.9-3.20180615gitbfb66708 - Various fixes according to review From af79cc0d41e0ca605f3ec290d513fa773551a871 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Fri, 20 Jul 2018 11:14:46 +0200 Subject: [PATCH 02/27] Fixed FTBFS by adding gcc-c++ requirement Resolves: rhbz#1603360 --- airspyone_host.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/airspyone_host.spec b/airspyone_host.spec index c7c35b4..3176458 100644 --- a/airspyone_host.spec +++ b/airspyone_host.spec @@ -6,14 +6,14 @@ Name: airspyone_host Version: 1.0.9 -Release: 4.%{git_suffix}%{?dist} +Release: 5.%{git_suffix}%{?dist} Summary: AirSpy host tools and library License: GPLv2+ URL: http://airspy.com/ Source0: https://github.com/airspy/%{name}/archive/%{git_commit}/%{name}-%{git_suffix}.tar.gz -BuildRequires: gcc, cmake, libusbx-devel, systemd +BuildRequires: gcc-c++, cmake, libusbx-devel, systemd Requires: systemd-udev %description @@ -75,6 +75,10 @@ mv %{buildroot}%{_sysconfdir}/udev/rules.d/52-airspy.rules %{buildroot}%{_udevru %{_libdir}/libairspy.so %changelog +* Fri Jul 20 2018 Jaroslav Škarvada - 1.0.9-5.20180615gitbfb66708 +- Fixed FTBFS by adding gcc-c++ requirement + Resolves: rhbz#1603360 + * Thu Jul 12 2018 Fedora Release Engineering - 1.0.9-4.20180615gitbfb66708 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 09bf97955ea66a7210ebf7df5f635c9ed7c6d3fd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 13:07:02 +0000 Subject: [PATCH 03/27] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- airspyone_host.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/airspyone_host.spec b/airspyone_host.spec index 3176458..c15bdb7 100644 --- a/airspyone_host.spec +++ b/airspyone_host.spec @@ -6,7 +6,7 @@ Name: airspyone_host Version: 1.0.9 -Release: 5.%{git_suffix}%{?dist} +Release: 6.%{git_suffix}%{?dist} Summary: AirSpy host tools and library License: GPLv2+ @@ -75,6 +75,9 @@ mv %{buildroot}%{_sysconfdir}/udev/rules.d/52-airspy.rules %{buildroot}%{_udevru %{_libdir}/libairspy.so %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 1.0.9-6.20180615gitbfb66708 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Jul 20 2018 Jaroslav Škarvada - 1.0.9-5.20180615gitbfb66708 - Fixed FTBFS by adding gcc-c++ requirement Resolves: rhbz#1603360 From 085636507a60df5b6ceaa50b3080a056ef048781 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 17:41:39 +0000 Subject: [PATCH 04/27] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- airspyone_host.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/airspyone_host.spec b/airspyone_host.spec index c15bdb7..aabb0da 100644 --- a/airspyone_host.spec +++ b/airspyone_host.spec @@ -6,7 +6,7 @@ Name: airspyone_host Version: 1.0.9 -Release: 6.%{git_suffix}%{?dist} +Release: 7.%{git_suffix}%{?dist} Summary: AirSpy host tools and library License: GPLv2+ @@ -75,6 +75,9 @@ mv %{buildroot}%{_sysconfdir}/udev/rules.d/52-airspy.rules %{buildroot}%{_udevru %{_libdir}/libairspy.so %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 1.0.9-7.20180615gitbfb66708 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Jan 31 2019 Fedora Release Engineering - 1.0.9-6.20180615gitbfb66708 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 0b2c929113b64ca0d11ebd28dadfbe64bbc0fc41 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 11:21:12 +0000 Subject: [PATCH 05/27] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- airspyone_host.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/airspyone_host.spec b/airspyone_host.spec index aabb0da..0f0b4ed 100644 --- a/airspyone_host.spec +++ b/airspyone_host.spec @@ -6,7 +6,7 @@ Name: airspyone_host Version: 1.0.9 -Release: 7.%{git_suffix}%{?dist} +Release: 8.%{git_suffix}%{?dist} Summary: AirSpy host tools and library License: GPLv2+ @@ -75,6 +75,9 @@ mv %{buildroot}%{_sysconfdir}/udev/rules.d/52-airspy.rules %{buildroot}%{_udevru %{_libdir}/libairspy.so %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 1.0.9-8.20180615gitbfb66708 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Wed Jul 24 2019 Fedora Release Engineering - 1.0.9-7.20180615gitbfb66708 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From ed67fe5da1cda63f1e66dd54a7655a0f12c16ceb Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Sun, 5 Jul 2020 14:36:38 -0400 Subject: [PATCH 06/27] Update to new out-of-source build mechanism --- airspyone_host.spec | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/airspyone_host.spec b/airspyone_host.spec index 0f0b4ed..a762d1d 100644 --- a/airspyone_host.spec +++ b/airspyone_host.spec @@ -1,3 +1,6 @@ +# Force out of source build +%undefine __cmake_in_source_build + %global git_commit bfb667080936ca5c2d23b3282f5893931ec38d3f %global git_date 20180615 @@ -38,14 +41,12 @@ rm -rf libairspy/vc sed -i -e 's/GROUP="plugdev"/ENV{ID_SOFTWARE_RADIO}="1"/g' airspy-tools/52-airspy.rules %build -mkdir build -cd build -%cmake ../ -DINSTALL_UDEV_RULES=on +%cmake -DINSTALL_UDEV_RULES=on -make %{?_smp_mflags} +%cmake_build %install -make -C build install DESTDIR=%{buildroot} +%cmake_install # Remove static object rm -f %{buildroot}%{_libdir}/libairspy.a From 83ab42901ac312ed445d50e9f20ae9b9ecc21560 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 11:51:54 +0000 Subject: [PATCH 07/27] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- airspyone_host.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/airspyone_host.spec b/airspyone_host.spec index a762d1d..0caf495 100644 --- a/airspyone_host.spec +++ b/airspyone_host.spec @@ -9,7 +9,7 @@ Name: airspyone_host Version: 1.0.9 -Release: 8.%{git_suffix}%{?dist} +Release: 9.%{git_suffix}%{?dist} Summary: AirSpy host tools and library License: GPLv2+ @@ -76,6 +76,9 @@ mv %{buildroot}%{_sysconfdir}/udev/rules.d/52-airspy.rules %{buildroot}%{_udevru %{_libdir}/libairspy.so %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 1.0.9-9.20180615gitbfb66708 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jan 28 2020 Fedora Release Engineering - 1.0.9-8.20180615gitbfb66708 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From e658dee3ec9e021712ecf5b2a74ce3e179bcafca Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jul 2020 23:52:53 +0000 Subject: [PATCH 08/27] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- airspyone_host.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/airspyone_host.spec b/airspyone_host.spec index 0caf495..59fb06a 100644 --- a/airspyone_host.spec +++ b/airspyone_host.spec @@ -9,7 +9,7 @@ Name: airspyone_host Version: 1.0.9 -Release: 9.%{git_suffix}%{?dist} +Release: 10.%{git_suffix}%{?dist} Summary: AirSpy host tools and library License: GPLv2+ @@ -76,6 +76,10 @@ mv %{buildroot}%{_sysconfdir}/udev/rules.d/52-airspy.rules %{buildroot}%{_udevru %{_libdir}/libairspy.so %changelog +* Fri Jul 31 2020 Fedora Release Engineering - 1.0.9-10.20180615gitbfb66708 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 1.0.9-9.20180615gitbfb66708 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From dd67a9f7ea6c5dafc3983ae9f4be64ba1fe30fbf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 25 Jan 2021 23:55:35 +0000 Subject: [PATCH 09/27] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- airspyone_host.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/airspyone_host.spec b/airspyone_host.spec index 59fb06a..465bff4 100644 --- a/airspyone_host.spec +++ b/airspyone_host.spec @@ -9,7 +9,7 @@ Name: airspyone_host Version: 1.0.9 -Release: 10.%{git_suffix}%{?dist} +Release: 11.%{git_suffix}%{?dist} Summary: AirSpy host tools and library License: GPLv2+ @@ -76,6 +76,9 @@ mv %{buildroot}%{_sysconfdir}/udev/rules.d/52-airspy.rules %{buildroot}%{_udevru %{_libdir}/libairspy.so %changelog +* Mon Jan 25 2021 Fedora Release Engineering - 1.0.9-11.20180615gitbfb66708 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Fri Jul 31 2020 Fedora Release Engineering - 1.0.9-10.20180615gitbfb66708 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 1700ab0486143ae389219c17292e39e4b7da71b6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 12:27:42 +0000 Subject: [PATCH 10/27] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From be0701a35d0fad883ec5a71b1fdf4e852c3f2ef1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 17:23:01 +0000 Subject: [PATCH 11/27] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- airspyone_host.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/airspyone_host.spec b/airspyone_host.spec index 465bff4..fe5d907 100644 --- a/airspyone_host.spec +++ b/airspyone_host.spec @@ -9,7 +9,7 @@ Name: airspyone_host Version: 1.0.9 -Release: 11.%{git_suffix}%{?dist} +Release: 12.%{git_suffix}%{?dist} Summary: AirSpy host tools and library License: GPLv2+ @@ -76,6 +76,9 @@ mv %{buildroot}%{_sysconfdir}/udev/rules.d/52-airspy.rules %{buildroot}%{_udevru %{_libdir}/libairspy.so %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 1.0.9-12.20180615gitbfb66708 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Mon Jan 25 2021 Fedora Release Engineering - 1.0.9-11.20180615gitbfb66708 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From a5243b82869b332609a037e8513a2d36192049b5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 21:03:25 +0000 Subject: [PATCH 12/27] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- airspyone_host.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/airspyone_host.spec b/airspyone_host.spec index fe5d907..d5c3fd8 100644 --- a/airspyone_host.spec +++ b/airspyone_host.spec @@ -9,7 +9,7 @@ Name: airspyone_host Version: 1.0.9 -Release: 12.%{git_suffix}%{?dist} +Release: 13.%{git_suffix}%{?dist} Summary: AirSpy host tools and library License: GPLv2+ @@ -76,6 +76,9 @@ mv %{buildroot}%{_sysconfdir}/udev/rules.d/52-airspy.rules %{buildroot}%{_udevru %{_libdir}/libairspy.so %changelog +* Wed Jan 19 2022 Fedora Release Engineering - 1.0.9-13.20180615gitbfb66708 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Jul 21 2021 Fedora Release Engineering - 1.0.9-12.20180615gitbfb66708 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From d8eb773e68ed50336b0d5555abe52c70e0d3c6e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 12 Jul 2022 00:22:07 +0200 Subject: [PATCH 13/27] New version Resolves: rhbz#2105800 --- .gitignore | 2 +- airspyone_host.spec | 29 +++++++++++++++++------------ sources | 2 +- 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 47d9764..24f3711 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -airspyone_host-*.tar.gz +/airspyone_host-*.tar.gz diff --git a/airspyone_host.spec b/airspyone_host.spec index d5c3fd8..82a8125 100644 --- a/airspyone_host.spec +++ b/airspyone_host.spec @@ -1,22 +1,23 @@ -# Force out of source build -%undefine __cmake_in_source_build +#%%global git_commit bfb667080936ca5c2d23b3282f5893931ec38d3f +#%%global git_date 20180615 -%global git_commit bfb667080936ca5c2d23b3282f5893931ec38d3f -%global git_date 20180615 - -%global git_short_commit %(echo %{git_commit} | cut -c -8) -%global git_suffix %{git_date}git%{git_short_commit} +#%%global git_short_commit %%(echo %%{git_commit} | cut -c -8) +#%%global git_suffix %%{git_date}git%%{git_short_commit} Name: airspyone_host -Version: 1.0.9 -Release: 13.%{git_suffix}%{?dist} +Version: 1.0.10 +Release: 1%{?git_suffix}%{?dist} Summary: AirSpy host tools and library License: GPLv2+ URL: http://airspy.com/ -Source0: https://github.com/airspy/%{name}/archive/%{git_commit}/%{name}-%{git_suffix}.tar.gz +#Source0: https://github.com/airspy/%%{name}/archive/%%{git_commit}/%%{name}-%%{git_suffix}.tar.gz +Source0: https://github.com/airspy/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz -BuildRequires: gcc-c++, cmake, libusbx-devel, systemd +BuildRequires: gcc-c++ +BuildRequires: cmake +BuildRequires: libusbx-devel +BuildRequires: systemd Requires: systemd-udev %description @@ -32,7 +33,7 @@ Summary: Development files for %{name} Files needed to develop software against libairspy. %prep -%setup -q -n %{name}-%{git_commit} +%autosetup -p1 # Remove win stuff rm -rf libairspy/vc @@ -76,6 +77,10 @@ mv %{buildroot}%{_sysconfdir}/udev/rules.d/52-airspy.rules %{buildroot}%{_udevru %{_libdir}/libairspy.so %changelog +* Mon Jul 11 2022 Jaroslav Škarvada - 1.0.10-1 +- New version + Resolves: rhbz#2105800 + * Wed Jan 19 2022 Fedora Release Engineering - 1.0.9-13.20180615gitbfb66708 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index 690b534..986ea0c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (airspyone_host-20180615gitbfb66708.tar.gz) = 668bc9ee9bec185edf052ef30252d95e9902ba24983614dbe8e7af9f810d068e4b86e7770fc90bfee8551c6e4295aaf532744a2eb952a795c1c811f920eeba27 +SHA512 (airspyone_host-1.0.10.tar.gz) = 61ea82e8b9892053b6fdccd7de05f248145bb5da0d4f63bb31d3a815fa739b248662a875d53d88de260cfa2a98ef266ea165ba50397e67822ea21ca273c93b24 From 77bb70b1d2fcca8778dc7e218c0b440aad73fc69 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 20:34:34 +0000 Subject: [PATCH 14/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- airspyone_host.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/airspyone_host.spec b/airspyone_host.spec index 82a8125..749497a 100644 --- a/airspyone_host.spec +++ b/airspyone_host.spec @@ -6,7 +6,7 @@ Name: airspyone_host Version: 1.0.10 -Release: 1%{?git_suffix}%{?dist} +Release: 2%{?git_suffix}%{?dist} Summary: AirSpy host tools and library License: GPLv2+ @@ -77,6 +77,9 @@ mv %{buildroot}%{_sysconfdir}/udev/rules.d/52-airspy.rules %{buildroot}%{_udevru %{_libdir}/libairspy.so %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 1.0.10-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Mon Jul 11 2022 Jaroslav Škarvada - 1.0.10-1 - New version Resolves: rhbz#2105800 From 4b84c9b4d908933fbe67baadfa4516efa64a5f46 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 21:31:52 +0000 Subject: [PATCH 15/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- airspyone_host.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/airspyone_host.spec b/airspyone_host.spec index 749497a..bd5ac33 100644 --- a/airspyone_host.spec +++ b/airspyone_host.spec @@ -6,7 +6,7 @@ Name: airspyone_host Version: 1.0.10 -Release: 2%{?git_suffix}%{?dist} +Release: 3%{?git_suffix}%{?dist} Summary: AirSpy host tools and library License: GPLv2+ @@ -77,6 +77,9 @@ mv %{buildroot}%{_sysconfdir}/udev/rules.d/52-airspy.rules %{buildroot}%{_udevru %{_libdir}/libairspy.so %changelog +* Wed Jan 18 2023 Fedora Release Engineering - 1.0.10-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Jul 20 2022 Fedora Release Engineering - 1.0.10-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 0f40ec5df2395859b5028c95b679c958cb932100 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 13:03:15 +0000 Subject: [PATCH 16/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- airspyone_host.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/airspyone_host.spec b/airspyone_host.spec index bd5ac33..3769dd5 100644 --- a/airspyone_host.spec +++ b/airspyone_host.spec @@ -6,7 +6,7 @@ Name: airspyone_host Version: 1.0.10 -Release: 3%{?git_suffix}%{?dist} +Release: 4%{?git_suffix}%{?dist} Summary: AirSpy host tools and library License: GPLv2+ @@ -77,6 +77,9 @@ mv %{buildroot}%{_sysconfdir}/udev/rules.d/52-airspy.rules %{buildroot}%{_udevru %{_libdir}/libairspy.so %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 1.0.10-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed Jan 18 2023 Fedora Release Engineering - 1.0.10-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 13af8f917e2b57726bcde83602f8ff0ba02665dd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 12:29:07 +0000 Subject: [PATCH 17/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- airspyone_host.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/airspyone_host.spec b/airspyone_host.spec index 3769dd5..690f53d 100644 --- a/airspyone_host.spec +++ b/airspyone_host.spec @@ -6,7 +6,7 @@ Name: airspyone_host Version: 1.0.10 -Release: 4%{?git_suffix}%{?dist} +Release: 5%{?git_suffix}%{?dist} Summary: AirSpy host tools and library License: GPLv2+ @@ -77,6 +77,9 @@ mv %{buildroot}%{_sysconfdir}/udev/rules.d/52-airspy.rules %{buildroot}%{_udevru %{_libdir}/libairspy.so %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 1.0.10-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jul 19 2023 Fedora Release Engineering - 1.0.10-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From f8914999943bd431150ddc9d611c29f63c4e9383 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 22:49:06 +0000 Subject: [PATCH 18/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- airspyone_host.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/airspyone_host.spec b/airspyone_host.spec index 690f53d..8d2deb7 100644 --- a/airspyone_host.spec +++ b/airspyone_host.spec @@ -6,7 +6,7 @@ Name: airspyone_host Version: 1.0.10 -Release: 5%{?git_suffix}%{?dist} +Release: 6%{?git_suffix}%{?dist} Summary: AirSpy host tools and library License: GPLv2+ @@ -77,6 +77,9 @@ mv %{buildroot}%{_sysconfdir}/udev/rules.d/52-airspy.rules %{buildroot}%{_udevru %{_libdir}/libairspy.so %changelog +* Mon Jan 22 2024 Fedora Release Engineering - 1.0.10-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 1.0.10-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From c5bf9333a81142024ff86274dd66f4dcaa91fe29 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 16:45:29 +0000 Subject: [PATCH 19/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- airspyone_host.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/airspyone_host.spec b/airspyone_host.spec index 8d2deb7..8d917ac 100644 --- a/airspyone_host.spec +++ b/airspyone_host.spec @@ -6,7 +6,7 @@ Name: airspyone_host Version: 1.0.10 -Release: 6%{?git_suffix}%{?dist} +Release: 7%{?git_suffix}%{?dist} Summary: AirSpy host tools and library License: GPLv2+ @@ -77,6 +77,9 @@ mv %{buildroot}%{_sysconfdir}/udev/rules.d/52-airspy.rules %{buildroot}%{_udevru %{_libdir}/libairspy.so %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 1.0.10-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Mon Jan 22 2024 Fedora Release Engineering - 1.0.10-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From abdbab731903daa31e10f13ccaccd8992f41d5a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Thu, 25 Jul 2024 22:54:04 +0200 Subject: [PATCH 20/27] convert GPLv2+ license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- airspyone_host.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/airspyone_host.spec b/airspyone_host.spec index 8d917ac..cafd049 100644 --- a/airspyone_host.spec +++ b/airspyone_host.spec @@ -6,10 +6,11 @@ Name: airspyone_host Version: 1.0.10 -Release: 7%{?git_suffix}%{?dist} +Release: 8%{?git_suffix}%{?dist} Summary: AirSpy host tools and library -License: GPLv2+ +# Automatically converted from old format: GPLv2+ - review is highly recommended. +License: GPL-2.0-or-later URL: http://airspy.com/ #Source0: https://github.com/airspy/%%{name}/archive/%%{git_commit}/%%{name}-%%{git_suffix}.tar.gz Source0: https://github.com/airspy/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz @@ -77,6 +78,9 @@ mv %{buildroot}%{_sysconfdir}/udev/rules.d/52-airspy.rules %{buildroot}%{_udevru %{_libdir}/libairspy.so %changelog +* Thu Jul 25 2024 Miroslav Suchý - 1.0.10-8 +- convert license to SPDX + * Wed Jul 17 2024 Fedora Release Engineering - 1.0.10-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 88f1853cb2a596466941153f8764df1a6849c8fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Tue, 7 Jan 2025 13:09:18 +0100 Subject: [PATCH 21/27] Fixed bool conflict in C23 Resolves: rhbz#2336033 Fixed bool conflict in C23 Resolves: rhbz#2336033 --- airspyone_host-1.0.10-c23-fix.patch | 159 ++++++++++++++++++++++++++++ airspyone_host.spec | 12 ++- 2 files changed, 168 insertions(+), 3 deletions(-) create mode 100644 airspyone_host-1.0.10-c23-fix.patch diff --git a/airspyone_host-1.0.10-c23-fix.patch b/airspyone_host-1.0.10-c23-fix.patch new file mode 100644 index 0000000..543a5bc --- /dev/null +++ b/airspyone_host-1.0.10-c23-fix.patch @@ -0,0 +1,159 @@ +diff --git a/airspy-tools/src/airspy_gpio.c b/airspy-tools/src/airspy_gpio.c +index b5ae99e..cad39f6 100644 +--- a/airspy-tools/src/airspy_gpio.c ++++ b/airspy-tools/src/airspy_gpio.c +@@ -26,12 +26,6 @@ + #include + #include + +-#ifndef bool +-typedef int bool; +-#define true 1 +-#define false 0 +-#endif +- + #define PORT_NUM_INVALID (255) + #define PIN_NUM_INVALID (255) + +diff --git a/airspy-tools/src/airspy_gpiodir.c b/airspy-tools/src/airspy_gpiodir.c +index 6a1abb7..59c36d1 100644 +--- a/airspy-tools/src/airspy_gpiodir.c ++++ b/airspy-tools/src/airspy_gpiodir.c +@@ -26,12 +26,6 @@ + #include + #include + +-#ifndef bool +-typedef int bool; +-#define true 1 +-#define false 0 +-#endif +- + #define PORT_NUM_INVALID (255) + #define PIN_NUM_INVALID (255) + +diff --git a/airspy-tools/src/airspy_info.c b/airspy-tools/src/airspy_info.c +index 5b5d13f..80ac5df 100644 +--- a/airspy-tools/src/airspy_info.c ++++ b/airspy-tools/src/airspy_info.c +@@ -28,12 +28,6 @@ + #include + #include + +-#ifndef bool +-typedef int bool; +-#define true 1 +-#define false 0 +-#endif +- + #define AIRSPY_MAX_DEVICE (32) + char version[255 + 1]; + airspy_read_partid_serialno_t read_partid_serialno; +diff --git a/airspy-tools/src/airspy_r820t.c b/airspy-tools/src/airspy_r820t.c +index ca9ce5e..d8c723d 100644 +--- a/airspy-tools/src/airspy_r820t.c ++++ b/airspy-tools/src/airspy_r820t.c +@@ -26,12 +26,6 @@ + #include + #include + +-#ifndef bool +-typedef int bool; +-#define true 1 +-#define false 0 +-#endif +- + #define REGISTER_NUM_MIN (0) + #define REGISTER_NUM_MAX (31) + +diff --git a/airspy-tools/src/airspy_rx.c b/airspy-tools/src/airspy_rx.c +index a8ece76..f528daf 100644 +--- a/airspy-tools/src/airspy_rx.c ++++ b/airspy-tools/src/airspy_rx.c +@@ -36,12 +36,6 @@ + + #define AIRSPY_RX_VERSION "1.0.5 23 April 2016" + +-#ifndef bool +-typedef int bool; +-#define true 1 +-#define false 0 +-#endif +- + #ifdef _WIN32 + #include + +diff --git a/airspy-tools/src/airspy_si5351c.c b/airspy-tools/src/airspy_si5351c.c +index ae8efb4..f6539ca 100644 +--- a/airspy-tools/src/airspy_si5351c.c ++++ b/airspy-tools/src/airspy_si5351c.c +@@ -27,12 +27,6 @@ + #include + #include + +-#ifndef bool +-typedef int bool; +-#define true 1 +-#define false 0 +-#endif +- + static void usage() { + printf("\nUsage:\n"); + printf("\t-c, --config: print textual configuration information\n"); +diff --git a/airspy-tools/src/airspy_spiflash.c b/airspy-tools/src/airspy_spiflash.c +index ae6c64c..41811a6 100644 +--- a/airspy-tools/src/airspy_spiflash.c ++++ b/airspy-tools/src/airspy_spiflash.c +@@ -30,12 +30,6 @@ + #include + #include + +-#ifndef bool +-typedef int bool; +-#define true 1 +-#define false 0 +-#endif +- + #ifdef _WIN32 + #include + #ifdef _MSC_VER +diff --git a/libairspy/src/airspy.c b/libairspy/src/airspy.c +index 3ac3c55..55bbc25 100644 +--- a/libairspy/src/airspy.c ++++ b/libairspy/src/airspy.c +@@ -34,12 +34,6 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSI + #include "iqconverter_int16.h" + #include "filters.h" + +-#ifndef bool +-typedef int bool; +-#define true 1 +-#define false 0 +-#endif +- + #define PACKET_SIZE (12) + #define UNPACKED_SIZE (16) + #define RAW_BUFFER_COUNT (8) +diff --git a/libairspy/src/airspy.h b/libairspy/src/airspy.h +index ab78e2f..72ee428 100644 +--- a/libairspy/src/airspy.h ++++ b/libairspy/src/airspy.h +@@ -54,6 +54,18 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSI + + #endif + ++#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 202311L) ++ #define C23 ++#endif ++ ++#ifndef C23 ++#ifndef bool ++typedef int bool; ++#define true 1 ++#define false 0 ++#endif ++#endif ++ + #ifdef __cplusplus + extern "C" + { diff --git a/airspyone_host.spec b/airspyone_host.spec index cafd049..78a06a8 100644 --- a/airspyone_host.spec +++ b/airspyone_host.spec @@ -6,14 +6,16 @@ Name: airspyone_host Version: 1.0.10 -Release: 8%{?git_suffix}%{?dist} +Release: 9%{?git_suffix}%{?dist} Summary: AirSpy host tools and library # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later URL: http://airspy.com/ -#Source0: https://github.com/airspy/%%{name}/archive/%%{git_commit}/%%{name}-%%{git_suffix}.tar.gz -Source0: https://github.com/airspy/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz +#Source: https://github.com/airspy/%%{name}/archive/%%{git_commit}/%%{name}-%%{git_suffix}.tar.gz +Source: https://github.com/airspy/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz +# https://github.com/airspy/airspyone_host/pull/98 +Patch: airspyone_host-1.0.10-c23-fix.patch BuildRequires: gcc-c++ BuildRequires: cmake @@ -78,6 +80,10 @@ mv %{buildroot}%{_sysconfdir}/udev/rules.d/52-airspy.rules %{buildroot}%{_udevru %{_libdir}/libairspy.so %changelog +* Tue Jan 7 2025 Jaroslav Škarvada - 1.0.10-9 +- Fixed bool conflict in C23 + Resolves: rhbz#2336033 + * Thu Jul 25 2024 Miroslav Suchý - 1.0.10-8 - convert license to SPDX From d6ff4329bad75d0585b0fd086e8dd6c993a5f7fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Thu, 9 Jan 2025 11:43:15 +0100 Subject: [PATCH 22/27] Used upstream fix to enforce gnu17 standard Related: rhbz#2336033 Used upstream fix to enforce gnu17 standard Related: rhbz#2336033 --- airspyone_host-1.0.10-c23-fix.patch | 190 +++++----------------------- airspyone_host.spec | 6 +- 2 files changed, 38 insertions(+), 158 deletions(-) diff --git a/airspyone_host-1.0.10-c23-fix.patch b/airspyone_host-1.0.10-c23-fix.patch index 543a5bc..84f2a31 100644 --- a/airspyone_host-1.0.10-c23-fix.patch +++ b/airspyone_host-1.0.10-c23-fix.patch @@ -1,159 +1,35 @@ -diff --git a/airspy-tools/src/airspy_gpio.c b/airspy-tools/src/airspy_gpio.c -index b5ae99e..cad39f6 100644 ---- a/airspy-tools/src/airspy_gpio.c -+++ b/airspy-tools/src/airspy_gpio.c -@@ -26,12 +26,6 @@ - #include - #include +From 4533645ac585c9f3b78930403e04529503499690 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= +Date: Tue, 7 Jan 2025 12:59:01 +0100 +Subject: [PATCH] Fixed bool conflict in C23 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +https://bugzilla.redhat.com/show_bug.cgi?id=2336033 + +Signed-off-by: Jaroslav Škarvada +--- + CMakeLists.txt | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f03fa6d..0e80c43 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -8,6 +8,12 @@ if(MSVC11) + add_definitions(-Dstrtoull=_strtoui64) + endif(MSVC11) --#ifndef bool --typedef int bool; --#define true 1 --#define false 0 --#endif -- - #define PORT_NUM_INVALID (255) - #define PIN_NUM_INVALID (255) - -diff --git a/airspy-tools/src/airspy_gpiodir.c b/airspy-tools/src/airspy_gpiodir.c -index 6a1abb7..59c36d1 100644 ---- a/airspy-tools/src/airspy_gpiodir.c -+++ b/airspy-tools/src/airspy_gpiodir.c -@@ -26,12 +26,6 @@ - #include - #include - --#ifndef bool --typedef int bool; --#define true 1 --#define false 0 --#endif -- - #define PORT_NUM_INVALID (255) - #define PIN_NUM_INVALID (255) - -diff --git a/airspy-tools/src/airspy_info.c b/airspy-tools/src/airspy_info.c -index 5b5d13f..80ac5df 100644 ---- a/airspy-tools/src/airspy_info.c -+++ b/airspy-tools/src/airspy_info.c -@@ -28,12 +28,6 @@ - #include - #include - --#ifndef bool --typedef int bool; --#define true 1 --#define false 0 --#endif -- - #define AIRSPY_MAX_DEVICE (32) - char version[255 + 1]; - airspy_read_partid_serialno_t read_partid_serialno; -diff --git a/airspy-tools/src/airspy_r820t.c b/airspy-tools/src/airspy_r820t.c -index ca9ce5e..d8c723d 100644 ---- a/airspy-tools/src/airspy_r820t.c -+++ b/airspy-tools/src/airspy_r820t.c -@@ -26,12 +26,6 @@ - #include - #include - --#ifndef bool --typedef int bool; --#define true 1 --#define false 0 --#endif -- - #define REGISTER_NUM_MIN (0) - #define REGISTER_NUM_MAX (31) - -diff --git a/airspy-tools/src/airspy_rx.c b/airspy-tools/src/airspy_rx.c -index a8ece76..f528daf 100644 ---- a/airspy-tools/src/airspy_rx.c -+++ b/airspy-tools/src/airspy_rx.c -@@ -36,12 +36,6 @@ - - #define AIRSPY_RX_VERSION "1.0.5 23 April 2016" - --#ifndef bool --typedef int bool; --#define true 1 --#define false 0 --#endif -- - #ifdef _WIN32 - #include - -diff --git a/airspy-tools/src/airspy_si5351c.c b/airspy-tools/src/airspy_si5351c.c -index ae8efb4..f6539ca 100644 ---- a/airspy-tools/src/airspy_si5351c.c -+++ b/airspy-tools/src/airspy_si5351c.c -@@ -27,12 +27,6 @@ - #include - #include - --#ifndef bool --typedef int bool; --#define true 1 --#define false 0 --#endif -- - static void usage() { - printf("\nUsage:\n"); - printf("\t-c, --config: print textual configuration information\n"); -diff --git a/airspy-tools/src/airspy_spiflash.c b/airspy-tools/src/airspy_spiflash.c -index ae6c64c..41811a6 100644 ---- a/airspy-tools/src/airspy_spiflash.c -+++ b/airspy-tools/src/airspy_spiflash.c -@@ -30,12 +30,6 @@ - #include - #include - --#ifndef bool --typedef int bool; --#define true 1 --#define false 0 --#endif -- - #ifdef _WIN32 - #include - #ifdef _MSC_VER -diff --git a/libairspy/src/airspy.c b/libairspy/src/airspy.c -index 3ac3c55..55bbc25 100644 ---- a/libairspy/src/airspy.c -+++ b/libairspy/src/airspy.c -@@ -34,12 +34,6 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSI - #include "iqconverter_int16.h" - #include "filters.h" - --#ifndef bool --typedef int bool; --#define true 1 --#define false 0 --#endif -- - #define PACKET_SIZE (12) - #define UNPACKED_SIZE (16) - #define RAW_BUFFER_COUNT (8) -diff --git a/libairspy/src/airspy.h b/libairspy/src/airspy.h -index ab78e2f..72ee428 100644 ---- a/libairspy/src/airspy.h -+++ b/libairspy/src/airspy.h -@@ -54,6 +54,18 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSI - - #endif - -+#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 202311L) -+ #define C23 -+#endif ++if (MSVC) ++ add_compile_options(/std:c17) ++else() ++ add_compile_options(-std=gnu17) ++endif() + -+#ifndef C23 -+#ifndef bool -+typedef int bool; -+#define true 1 -+#define false 0 -+#endif -+#endif -+ - #ifdef __cplusplus - extern "C" - { + add_subdirectory(libairspy) + add_subdirectory(airspy-tools) + +-- +2.47.1 + diff --git a/airspyone_host.spec b/airspyone_host.spec index 78a06a8..460add0 100644 --- a/airspyone_host.spec +++ b/airspyone_host.spec @@ -6,7 +6,7 @@ Name: airspyone_host Version: 1.0.10 -Release: 9%{?git_suffix}%{?dist} +Release: 10%{?git_suffix}%{?dist} Summary: AirSpy host tools and library # Automatically converted from old format: GPLv2+ - review is highly recommended. @@ -80,6 +80,10 @@ mv %{buildroot}%{_sysconfdir}/udev/rules.d/52-airspy.rules %{buildroot}%{_udevru %{_libdir}/libairspy.so %changelog +* Thu Jan 9 2025 Jaroslav Škarvada - 1.0.10-10 +- Used upstream fix to enforce gnu17 standard + Related: rhbz#2336033 + * Tue Jan 7 2025 Jaroslav Škarvada - 1.0.10-9 - Fixed bool conflict in C23 Resolves: rhbz#2336033 From 5cc172c0105546c170c632b4d4da9f3e2d339826 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 10:45:45 +0000 Subject: [PATCH 23/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- airspyone_host.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/airspyone_host.spec b/airspyone_host.spec index 460add0..d96ee05 100644 --- a/airspyone_host.spec +++ b/airspyone_host.spec @@ -6,7 +6,7 @@ Name: airspyone_host Version: 1.0.10 -Release: 10%{?git_suffix}%{?dist} +Release: 11%{?git_suffix}%{?dist} Summary: AirSpy host tools and library # Automatically converted from old format: GPLv2+ - review is highly recommended. @@ -80,6 +80,9 @@ mv %{buildroot}%{_sysconfdir}/udev/rules.d/52-airspy.rules %{buildroot}%{_udevru %{_libdir}/libairspy.so %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 1.0.10-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Jan 9 2025 Jaroslav Škarvada - 1.0.10-10 - Used upstream fix to enforce gnu17 standard Related: rhbz#2336033 From fb6a0e2a7246eb051dc919010b11b6dc3730f8e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Sat, 25 Jan 2025 10:03:58 +0000 Subject: [PATCH 24/27] Migrate to SPDX license This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- airspyone_host.spec | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/airspyone_host.spec b/airspyone_host.spec index d96ee05..2c01dec 100644 --- a/airspyone_host.spec +++ b/airspyone_host.spec @@ -9,8 +9,16 @@ Version: 1.0.10 Release: 11%{?git_suffix}%{?dist} Summary: AirSpy host tools and library -# Automatically converted from old format: GPLv2+ - review is highly recommended. -License: GPL-2.0-or-later +# following is LGPL-2.1-or-later +# airspy-tools/getopt/getopt.* +# following is BSD-3-Clause +# libairspy/src/airspy.* +# libairspy/src/airspy_commands.h +# following is MIT +# libairspy/src/filters.h +# libairspy/iqconverter_* +# everything else is GPL-2.0-or-later +License: GPL-2.0-or-later AND MIT AND BSD-3-Clause AND LGPL-2.1-or-later URL: http://airspy.com/ #Source: https://github.com/airspy/%%{name}/archive/%%{git_commit}/%%{name}-%%{git_suffix}.tar.gz Source: https://github.com/airspy/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz @@ -29,7 +37,7 @@ source software radio platform. %package devel Requires: %{name}%{?_isa} = %{version}-%{release} -License: MIT and BSD +License: MIT AND BSD-3-Clause Summary: Development files for %{name} %description devel From d7b9d4ab7dcd1a7a40ec193d075365ef12d8d158 Mon Sep 17 00:00:00 2001 From: Cristian Le Date: Fri, 30 May 2025 14:28:32 +0200 Subject: [PATCH 25/27] Allow to build with CMake 4.0 --- 100.patch | 141 ++++++++++++++++++++++++++++++++++++++++++++ airspyone_host.spec | 9 ++- 2 files changed, 149 insertions(+), 1 deletion(-) create mode 100644 100.patch diff --git a/100.patch b/100.patch new file mode 100644 index 0000000..0552f2d --- /dev/null +++ b/100.patch @@ -0,0 +1,141 @@ +Subject: [PATCH] Use GNUInstallDirs +Bump CMake policies +--- +Index: CMakeLists.txt +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt (revision d0c4ff510bb40e134adfe655b7fe818ac2d2f66d) ++++ b/CMakeLists.txt (revision 387f6f797513e6dc119bda633712c05f07b9c13d) +@@ -1,8 +1,10 @@ + #top dir cmake project for libairspy + airspy-tools + +-cmake_minimum_required(VERSION 2.8) ++cmake_minimum_required(VERSION 2.8...4.0) + project (airspy_all) + ++include(GNUInstallDirs) ++ + #provide missing strtoull() for VC11 + if(MSVC11) + add_definitions(-Dstrtoull=_strtoui64) +Index: airspy-tools/CMakeLists.txt +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/airspy-tools/CMakeLists.txt b/airspy-tools/CMakeLists.txt +--- a/airspy-tools/CMakeLists.txt (revision d0c4ff510bb40e134adfe655b7fe818ac2d2f66d) ++++ b/airspy-tools/CMakeLists.txt (revision 0708cf50b6821fe0fb37fc9a7534c635c4d9c235) +@@ -21,7 +21,7 @@ + + # Based heavily upon the libftdi cmake setup. + +-cmake_minimum_required(VERSION 2.8) ++cmake_minimum_required(VERSION 2.8...4.0) + project(airspy-tools C) + set(MAJOR_VERSION 0) + set(MINOR_VERSION 2) +Index: libairspy/CMakeLists.txt +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/libairspy/CMakeLists.txt b/libairspy/CMakeLists.txt +--- a/libairspy/CMakeLists.txt (revision d0c4ff510bb40e134adfe655b7fe818ac2d2f66d) ++++ b/libairspy/CMakeLists.txt (revision 387f6f797513e6dc119bda633712c05f07b9c13d) +@@ -21,7 +21,7 @@ + + # Based heavily upon the libftdi cmake setup. + +-cmake_minimum_required(VERSION 2.8) ++cmake_minimum_required(VERSION 2.8...4.0) + project(libairspy C) + file(READ ${CMAKE_CURRENT_SOURCE_DIR}/src/airspy.h AIRSPY_H_CONTENTS) + +@@ -99,8 +99,8 @@ + + set(prefix ${CMAKE_INSTALL_PREFIX}) + set(exec_prefix \${prefix}) +-set(libdir \${exec_prefix}/lib${LIB_SUFFIX}) +-set(includedir \${prefix}/include) ++set(libdir \${exec_prefix}/${CMAKE_INSTALL_LIBDIR}) ++set(includedir \${prefix}/${CMAKE_INSTALL_INCLUDEDIR}) + + CONFIGURE_FILE( + ${CMAKE_CURRENT_SOURCE_DIR}/libairspy.pc.in +@@ -109,7 +109,7 @@ + + INSTALL( + FILES ${CMAKE_CURRENT_BINARY_DIR}/libairspy.pc +- DESTINATION lib${LIB_SUFFIX}/pkgconfig ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig + ) + + ######################################################################## +Index: airspy-tools/src/CMakeLists.txt +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/airspy-tools/src/CMakeLists.txt b/airspy-tools/src/CMakeLists.txt +--- a/airspy-tools/src/CMakeLists.txt (revision 0708cf50b6821fe0fb37fc9a7534c635c4d9c235) ++++ b/airspy-tools/src/CMakeLists.txt (revision 387f6f797513e6dc119bda633712c05f07b9c13d) +@@ -21,7 +21,13 @@ + + # Based heavily upon the libftdi cmake setup. + +-set(INSTALL_DEFAULT_BINDIR "bin" CACHE STRING "Appended to CMAKE_INSTALL_PREFIX") ++if(DEFINED INSTALL_DEFAULT_BINDIR) ++ message(WARNING ++ "INSTALL_DEFAULT_BINDIR is deprecated, use the standard CMAKE_INSTALL_BINDIR instead." ++ ) ++else() ++ set(INSTALL_DEFAULT_BINDIR "${CMAKE_INSTALL_BINDIR}") ++endif() + + if(MSVC) + add_library(libgetopt_static STATIC +Index: libairspy/src/CMakeLists.txt +IDEA additional info: +Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP +<+>UTF-8 +=================================================================== +diff --git a/libairspy/src/CMakeLists.txt b/libairspy/src/CMakeLists.txt +--- a/libairspy/src/CMakeLists.txt (revision 0708cf50b6821fe0fb37fc9a7534c635c4d9c235) ++++ b/libairspy/src/CMakeLists.txt (revision 387f6f797513e6dc119bda633712c05f07b9c13d) +@@ -79,30 +79,26 @@ + + if( ${UNIX} ) + install(TARGETS airspy +- LIBRARY DESTINATION lib${LIB_SUFFIX} + COMPONENT sharedlibs + ) + install(TARGETS airspy-static +- ARCHIVE DESTINATION lib${LIB_SUFFIX} + COMPONENT staticlibs + ) + install(FILES ${c_headers} +- DESTINATION include/${PROJECT_NAME} ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME} + COMPONENT headers + ) + endif( ${UNIX} ) + + if( ${WIN32} ) + install(TARGETS airspy +- DESTINATION bin + COMPONENT sharedlibs + ) + install(TARGETS airspy-static +- DESTINATION bin + COMPONENT staticlibs + ) + install(FILES ${c_headers} +- DESTINATION include/${PROJECT_NAME} ++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME} + COMPONENT headers + ) + endif( ${WIN32} ) diff --git a/airspyone_host.spec b/airspyone_host.spec index 2c01dec..51476a9 100644 --- a/airspyone_host.spec +++ b/airspyone_host.spec @@ -6,7 +6,7 @@ Name: airspyone_host Version: 1.0.10 -Release: 11%{?git_suffix}%{?dist} +Release: 12%{?git_suffix}%{?dist} Summary: AirSpy host tools and library # following is LGPL-2.1-or-later @@ -24,6 +24,9 @@ URL: http://airspy.com/ Source: https://github.com/airspy/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz # https://github.com/airspy/airspyone_host/pull/98 Patch: airspyone_host-1.0.10-c23-fix.patch +# CMake 4.0 and GNUInstallDirs support +# Cherry-picked from https://github.com/airspy/airspyone_host/pull/100 +Patch: 100.patch BuildRequires: gcc-c++ BuildRequires: cmake @@ -88,6 +91,10 @@ mv %{buildroot}%{_sysconfdir}/udev/rules.d/52-airspy.rules %{buildroot}%{_udevru %{_libdir}/libairspy.so %changelog +* Fri May 30 2025 Cristian Le - 1.0.10-12 +- Allow to build with CMake 4.0 +- Use GNUInstallDirs + * Thu Jan 16 2025 Fedora Release Engineering - 1.0.10-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 61b472b860619d553688c3f5bb55ae5c4d59f04f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 16:50:58 +0000 Subject: [PATCH 26/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- airspyone_host.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/airspyone_host.spec b/airspyone_host.spec index 51476a9..9af55a7 100644 --- a/airspyone_host.spec +++ b/airspyone_host.spec @@ -6,7 +6,7 @@ Name: airspyone_host Version: 1.0.10 -Release: 12%{?git_suffix}%{?dist} +Release: 13%{?git_suffix}%{?dist} Summary: AirSpy host tools and library # following is LGPL-2.1-or-later @@ -91,6 +91,9 @@ mv %{buildroot}%{_sysconfdir}/udev/rules.d/52-airspy.rules %{buildroot}%{_udevru %{_libdir}/libairspy.so %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 1.0.10-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri May 30 2025 Cristian Le - 1.0.10-12 - Allow to build with CMake 4.0 - Use GNUInstallDirs From b94e1a55f2d75819e8096bfe1332f0e734055246 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 03:32:23 +0000 Subject: [PATCH 27/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- airspyone_host.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/airspyone_host.spec b/airspyone_host.spec index 9af55a7..a48836e 100644 --- a/airspyone_host.spec +++ b/airspyone_host.spec @@ -6,7 +6,7 @@ Name: airspyone_host Version: 1.0.10 -Release: 13%{?git_suffix}%{?dist} +Release: 14%{?git_suffix}%{?dist} Summary: AirSpy host tools and library # following is LGPL-2.1-or-later @@ -91,6 +91,9 @@ mv %{buildroot}%{_sysconfdir}/udev/rules.d/52-airspy.rules %{buildroot}%{_udevru %{_libdir}/libairspy.so %changelog +* Fri Jan 16 2026 Fedora Release Engineering - 1.0.10-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Wed Jul 23 2025 Fedora Release Engineering - 1.0.10-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild