commit e676ed6f4a6afa956abec37dff42c5d830c30df7
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Sep 1 13:46:20 2024 +0100
Update to 0.5
.gitignore | 1 +
gr-dab-0.4-gnuradio39.patch | 4893 -------------------------------------------
gr-dab.spec | 39 +-
sources | 2 +-
4 files changed, 17 insertions(+), 4918 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f8d6675..c5f3ce5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/gr-dab-a33609bd75192878f9f60c1a9b02fd7473649160.tar.gz
/gr-dab-0.3.tar.gz
/gr-dab-0.4.tar.gz
+/gr-dab-0.5.tar.gz
diff --git a/gr-dab.spec b/gr-dab.spec
index e0be877..7b50501 100644
--- a/gr-dab.spec
+++ b/gr-dab.spec
@@ -6,8 +6,8 @@
Name: gr-dab
URL:
https://github.com/andrmuel/gr-dab
-Version: 0.4
-Release: 20%{?dist}
+Version: 0.5
+Release: 1%{?dist}
License: GPLv3+
BuildRequires: cmake
BuildRequires: gcc-c++
@@ -38,9 +38,6 @@ Requires: python3-scipy
Requires: python3-matplotlib
Summary: GNU Radio DAB digital audio broadcasting module
Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
-#
https://github.com/andrmuel/gr-dab/issues/28
-# experimental and untested downstream patch
-Patch0: gr-dab-0.4-gnuradio39.patch
%description
GNU Radio DAB digital audio broadcasting module.
@@ -54,7 +51,7 @@ Development files for gr-dab.
#%%package doc
#Summary: Documentation files for gr-dab
-#Requires: %{name} = %{version}-%{release}
+#Requires: %%{name} = %%{version}-%%{release}
# doxygen bug workaround
#BuildArch: noarch
@@ -64,12 +61,6 @@ Development files for gr-dab.
%prep
%autosetup -p1
-# hack to deal with wrong name
-# drop when upstream adds correct support for gnuradio-3.9
-pushd include
-ln -s grdab dab
-popd
-
%build
%cmake -DENABLE_DOXYGEN=OFF
%cmake_build
@@ -78,37 +69,37 @@ popd
%cmake_install
# remove hashbangs
-pushd %{buildroot}%{python3_sitearch}/grdab
+pushd %{buildroot}%{python3_sitearch}/gnuradio
find . -type f -exec sed -i '/^[ \t]*#!\/usr\/bin\/\(env\|python\)/ d' {} \;
popd
-# tests not ported to gnuradio-3.9, re-enable once ported by upstream
-#%%check
-#cd %%{_vpath_builddir}
-#make test
+%check
+cd %{_vpath_builddir}
+make test
%ldconfig_scriptlets
%files
%license COPYING
%doc AUTHORS README.md THANKS
-%exclude %{_docdir}/%{name}/html
-%exclude %{_docdir}/%{name}/xml
%{_datadir}/gnuradio/grc/blocks/*
%{_libdir}/libgnuradio-dab.so.3.*
-%{python3_sitearch}/{dab,grdab}
+%{python3_sitearch}/gnuradio/
%{_bindir}/*
%files devel
-%{_includedir}/grdab
+%{_includedir}/dab
%{_libdir}/*.so
-%{_libdir}/cmake/{dab,grdab}
+%{_libdir}/cmake/gnuradio-dab/
#%%files doc
-#%doc %{_docdir}/%{name}/html
-#%doc %{_docdir}/%{name}/xml
+#%%doc %%{_docdir}/%%{name}/html
+#%%doc %%{_docdir}/%%{name}/xml
%changelog
+* Sun Sep 01 2024 Leigh Scott <leigh123linux(a)gmail.com> - 0.5-1
+- Update to 0.5
+
* Thu Jun 13 2024 Leigh Scott <leigh123linux(a)gmail.com> - 0.4-20
- Rebuilt for Python 3.13
diff --git a/sources b/sources
index f4aef4d..aad0506 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gr-dab-0.4.tar.gz) =
3630412e8e31ae73b9d904ad999d1205d753e614f17f336c6ff34a45874b3ddecd9b3b66348c30d09a50d2f1846a8ea493dbb7c04c8d352e20ded9e040b9df72
+SHA512 (gr-dab-0.5.tar.gz) =
b4199ed006e34e2ecc00b819c44416bc585552c7b14eefae5d40b06067544862a38dbcf254dc010df1583664233a28cac920878caff1234b7ce617079d1c4b47