diff --git a/.gitignore b/.gitignore index 24f3711..47d9764 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/airspyone_host-*.tar.gz +airspyone_host-*.tar.gz diff --git a/100.patch b/100.patch deleted file mode 100644 index 0552f2d..0000000 --- a/100.patch +++ /dev/null @@ -1,141 +0,0 @@ -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-1.0.10-c23-fix.patch b/airspyone_host-1.0.10-c23-fix.patch deleted file mode 100644 index 84f2a31..0000000 --- a/airspyone_host-1.0.10-c23-fix.patch +++ /dev/null @@ -1,35 +0,0 @@ -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) - -+if (MSVC) -+ add_compile_options(/std:c17) -+else() -+ add_compile_options(-std=gnu17) -+endif() -+ - add_subdirectory(libairspy) - add_subdirectory(airspy-tools) - --- -2.47.1 - diff --git a/airspyone_host.spec b/airspyone_host.spec index a48836e..885782e 100644 --- a/airspyone_host.spec +++ b/airspyone_host.spec @@ -1,37 +1,19 @@ -#%%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.10 -Release: 14%{?git_suffix}%{?dist} +Version: 1.0.9 +Release: 3.%{git_suffix}%{?dist} Summary: AirSpy host tools and library -# 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 +License: GPLv2+ 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 -# 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 +Source0: https://github.com/airspy/%{name}/archive/%{git_commit}/%{name}-%{git_suffix}.tar.gz -BuildRequires: gcc-c++ -BuildRequires: cmake -BuildRequires: libusbx-devel -BuildRequires: systemd +BuildRequires: gcc, cmake, libusbx-devel, systemd Requires: systemd-udev %description @@ -40,14 +22,14 @@ source software radio platform. %package devel Requires: %{name}%{?_isa} = %{version}-%{release} -License: MIT AND BSD-3-Clause +License: MIT and BSD Summary: Development files for %{name} %description devel Files needed to develop software against libairspy. %prep -%autosetup -p1 +%setup -q -n %{name}-%{git_commit} # Remove win stuff rm -rf libairspy/vc @@ -56,12 +38,14 @@ rm -rf libairspy/vc sed -i -e 's/GROUP="plugdev"/ENV{ID_SOFTWARE_RADIO}="1"/g' airspy-tools/52-airspy.rules %build -%cmake -DINSTALL_UDEV_RULES=on +mkdir build +cd build +%cmake ../ -DINSTALL_UDEV_RULES=on -%cmake_build +make %{?_smp_mflags} %install -%cmake_install +make -C build install DESTDIR=%{buildroot} # Remove static object rm -f %{buildroot}%{_libdir}/libairspy.a @@ -91,84 +75,6 @@ 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - -* 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 - * Mon Jun 18 2018 Jaroslav Škarvada - 1.0.9-3.20180615gitbfb66708 - Various fixes according to review diff --git a/sources b/sources index 986ea0c..690b534 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (airspyone_host-1.0.10.tar.gz) = 61ea82e8b9892053b6fdccd7de05f248145bb5da0d4f63bb31d3a815fa739b248662a875d53d88de260cfa2a98ef266ea165ba50397e67822ea21ca273c93b24 +SHA512 (airspyone_host-20180615gitbfb66708.tar.gz) = 668bc9ee9bec185edf052ef30252d95e9902ba24983614dbe8e7af9f810d068e4b86e7770fc90bfee8551c6e4295aaf532744a2eb952a795c1c811f920eeba27