2 changed files with 4 additions and 166 deletions
--- a/100.patch
+++ b/100.patch
@ -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} )
--- a/airspyone_host.spec
+++ b/airspyone_host.spec
@ -6,27 +6,16 @@

 Name:           airspyone_host
 Version:        1.0.10
-Release:        14%{?git_suffix}%{?dist}
+Release:        11%{?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
+# Automatically converted from old format: GPLv2+ - review is highly recommended.
+License:        GPL-2.0-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
 # 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
@ -40,7 +29,7 @@ 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
@ -91,16 +80,6 @@ mv %{buildroot}%{_sysconfdir}/udev/rules.d/52-airspy.rules %{buildroot}%{_udevru
 %{_libdir}/libairspy.so

 %changelog
-* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.10-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
-
-* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.10-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Fri May 30 2025 Cristian Le <git@lecris.dev> - 1.0.10-12
- Allow to build with CMake 4.0
- Use GNUInstallDirs
-
 * Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.10-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild