From 0ce21168cd89c79650ae2ec9621d383b0e70a1325a1b19d7611f71115eb3f47d Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Thu, 22 Feb 2024 13:15:41 +0000 Subject: [PATCH 1/2] Accepting request 1149182 from home:dimstar:rpm4.20:b Prepare for RPM 4.20 OBS-URL: https://build.opensuse.org/request/show/1149182 OBS-URL: https://build.opensuse.org/package/show/hardware:sdr/bladeRF?expand=0&rev=42 --- bladeRF.changes | 6 ++++++ bladeRF.spec | 3 +-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/bladeRF.changes b/bladeRF.changes index 549fc69..592dd13 100644 --- a/bladeRF.changes +++ b/bladeRF.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 22 10:25:17 UTC 2024 - Dominique Leuenberger + +- Use %autosetup macro. Allows to eliminate the usage of deprecated + %patchN + ------------------------------------------------------------------- Mon Feb 13 21:53:41 UTC 2023 - Martin Hauke diff --git a/bladeRF.spec b/bladeRF.spec index b90eabc..eeaded1 100644 --- a/bladeRF.spec +++ b/bladeRF.spec @@ -86,8 +86,7 @@ Libraries and header files for developing applications that want to make use of libbladerf. %prep -%setup -q -n %{name}-%{release_name} -%patch0 -p1 +%autosetup -p1 -n %{name}-%{release_name} ls pushd thirdparty/analogdevicesinc/no-OS tar -xJf %{SOURCE1} From a3872756889b956707c10f713f8eadb344c4b57ce9147eb0fd1aa5891530a1d8 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Fri, 23 Feb 2024 13:52:54 +0000 Subject: [PATCH 2/2] Accepting request 1149823 from home:dimstar:Factory - Align path for document installation between openSUSE versions. OBS-URL: https://build.opensuse.org/request/show/1149823 OBS-URL: https://build.opensuse.org/package/show/hardware:sdr/bladeRF?expand=0&rev=43 --- bladeRF.changes | 5 +++++ bladeRF.spec | 7 ++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/bladeRF.changes b/bladeRF.changes index 592dd13..166a096 100644 --- a/bladeRF.changes +++ b/bladeRF.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Feb 23 11:25:04 UTC 2024 - Dominique Leuenberger + +- Align path for document installation between openSUSE versions. + ------------------------------------------------------------------- Thu Feb 22 10:25:17 UTC 2024 - Dominique Leuenberger diff --git a/bladeRF.spec b/bladeRF.spec index eeaded1..44870b0 100644 --- a/bladeRF.spec +++ b/bladeRF.spec @@ -1,7 +1,7 @@ # # spec file for package bladeRF # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # Copyright (c) 2013-2015 Wojciech Kazubski, wk@ire.pw.edu.pl # # All modifications and additions to the file contributed by third parties @@ -102,6 +102,7 @@ cd host %if 0%{?use_syslog} -DENABLE_LIBBLADERF_SYSLOG=ON \ %endif + -DCMAKE_INSTALL_DOCDIR:PATH=%{_docdir}/lib%{name} \ -DBUILD_DOCUMENTATION=ON %cmake_build @@ -109,10 +110,6 @@ cd host cd host %cmake_install -#move docs -mkdir -p %{buildroot}%{_docdir} -mv %{buildroot}/%{_datadir}/doc/libbladeRF %{buildroot}%{_docdir} - %post -n %{libname} -p /sbin/ldconfig %postun -n %{libname} -p /sbin/ldconfig