From d1376280377b80fcb7b1b959da40b5dc836d9652 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 06:41:00 +0000 Subject: [PATCH 01/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wdsp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wdsp.spec b/wdsp.spec index 5b47176..0e3cc9a 100644 --- a/wdsp.spec +++ b/wdsp.spec @@ -7,7 +7,7 @@ Name: wdsp Version: 0 -Release: 0.4.%{git_suffix}%{?dist} +Release: 0.5.%{git_suffix}%{?dist} Summary: DSP library for LinHPSDR License: GPLv2+ URL: https://github.com/g0orx/%{name} @@ -54,6 +54,9 @@ rmdir fftw %{_libdir}/libwdsp.so %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 0-0.5.20210705gitc55342c5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Jul 23 2022 Fedora Release Engineering - 0-0.4.20210705gitc55342c5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 04199c6d85dee54a05897ce5d9441c227f965589 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 18:03:17 +0000 Subject: [PATCH 02/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- wdsp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wdsp.spec b/wdsp.spec index 0e3cc9a..c78d7ad 100644 --- a/wdsp.spec +++ b/wdsp.spec @@ -7,7 +7,7 @@ Name: wdsp Version: 0 -Release: 0.5.%{git_suffix}%{?dist} +Release: 0.6.%{git_suffix}%{?dist} Summary: DSP library for LinHPSDR License: GPLv2+ URL: https://github.com/g0orx/%{name} @@ -54,6 +54,9 @@ rmdir fftw %{_libdir}/libwdsp.so %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 0-0.6.20210705gitc55342c5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jan 21 2023 Fedora Release Engineering - 0-0.5.20210705gitc55342c5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 987c276df1e5d142c1c34afd425f2a2fb0d8d2af Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 08:31:19 +0000 Subject: [PATCH 03/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- wdsp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wdsp.spec b/wdsp.spec index c78d7ad..18f1524 100644 --- a/wdsp.spec +++ b/wdsp.spec @@ -7,7 +7,7 @@ Name: wdsp Version: 0 -Release: 0.6.%{git_suffix}%{?dist} +Release: 0.7.%{git_suffix}%{?dist} Summary: DSP library for LinHPSDR License: GPLv2+ URL: https://github.com/g0orx/%{name} @@ -54,6 +54,9 @@ rmdir fftw %{_libdir}/libwdsp.so %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 0-0.7.20210705gitc55342c5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 0-0.6.20210705gitc55342c5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From f9030fd9cd301b398034051efd8038a5593347ea Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 09:12:05 +0000 Subject: [PATCH 04/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- wdsp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wdsp.spec b/wdsp.spec index 18f1524..7802739 100644 --- a/wdsp.spec +++ b/wdsp.spec @@ -7,7 +7,7 @@ Name: wdsp Version: 0 -Release: 0.7.%{git_suffix}%{?dist} +Release: 0.8.%{git_suffix}%{?dist} Summary: DSP library for LinHPSDR License: GPLv2+ URL: https://github.com/g0orx/%{name} @@ -54,6 +54,9 @@ rmdir fftw %{_libdir}/libwdsp.so %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 0-0.8.20210705gitc55342c5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 0-0.7.20210705gitc55342c5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 7fa5146068cf3f0e7c06ecf89bfab1cdbc57c2e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Fri, 26 Jul 2024 03:38:29 +0200 Subject: [PATCH 05/11] convert GPLv2+ license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- wdsp.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/wdsp.spec b/wdsp.spec index 7802739..005fa8f 100644 --- a/wdsp.spec +++ b/wdsp.spec @@ -7,9 +7,10 @@ Name: wdsp Version: 0 -Release: 0.8.%{git_suffix}%{?dist} +Release: 0.9.%{git_suffix}%{?dist} Summary: DSP library for LinHPSDR -License: GPLv2+ +# Automatically converted from old format: GPLv2+ - review is highly recommended. +License: GPL-2.0-or-later URL: https://github.com/g0orx/%{name} Source0: %{url}/archive/%{git_commit}/%{name}-%{git_suffix}.tar.gz BuildRequires: make @@ -54,6 +55,9 @@ rmdir fftw %{_libdir}/libwdsp.so %changelog +* Fri Jul 26 2024 Miroslav Suchý - 0-0.9.20210705gitc55342c5 +- convert license to SPDX + * Sat Jul 20 2024 Fedora Release Engineering - 0-0.8.20210705gitc55342c5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 80ea872234542a6919bc5221f90dc9691f128241 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 14:50:53 +0000 Subject: [PATCH 06/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- wdsp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wdsp.spec b/wdsp.spec index 005fa8f..d2bb741 100644 --- a/wdsp.spec +++ b/wdsp.spec @@ -7,7 +7,7 @@ Name: wdsp Version: 0 -Release: 0.9.%{git_suffix}%{?dist} +Release: 0.10.%{git_suffix}%{?dist} Summary: DSP library for LinHPSDR # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later @@ -55,6 +55,9 @@ rmdir fftw %{_libdir}/libwdsp.so %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 0-0.10.20210705gitc55342c5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Jul 26 2024 Miroslav Suchý - 0-0.9.20210705gitc55342c5 - convert license to SPDX From 983df6942061e7e640c2ac18a2a0bd3b4e7ae92a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:20:13 +0000 Subject: [PATCH 07/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- wdsp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wdsp.spec b/wdsp.spec index d2bb741..2a98acb 100644 --- a/wdsp.spec +++ b/wdsp.spec @@ -7,7 +7,7 @@ Name: wdsp Version: 0 -Release: 0.10.%{git_suffix}%{?dist} +Release: 0.11.%{git_suffix}%{?dist} Summary: DSP library for LinHPSDR # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later @@ -55,6 +55,9 @@ rmdir fftw %{_libdir}/libwdsp.so %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 0-0.11.20210705gitc55342c5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sun Jan 19 2025 Fedora Release Engineering - 0-0.10.20210705gitc55342c5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 8d7d42425d1f87d633d0b17f689cbd1680d241d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 22 Sep 2025 17:04:36 +0200 Subject: [PATCH 08/11] Switched to new upstream MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- sources | 2 +- wdsp-0-distro-makefile.patch | 52 ------------------------------------ wdsp-0-soname-add.patch | 35 +++++++++--------------- wdsp.spec | 43 ++++++++++++++++++----------- 4 files changed, 41 insertions(+), 91 deletions(-) delete mode 100644 wdsp-0-distro-makefile.patch diff --git a/sources b/sources index b173ed8..e8d4700 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (wdsp-20210705gitc55342c5.tar.gz) = 82fe1c2c4b2f94401f69e16fbd41fc8f91c31110d2d0719ffdf98ec5068a874d75044a34ce0f92af6f8bd74e04a6fcbf3bc94e31690ec1bee2212f6bdda314d5 +SHA512 (wdsp-20250922git18782be8.tar.gz) = e98f345bcce6157a379d9363d744bb6d7a61edb991fa97bd84e32db18d8724b01acc6c3b01c55fe29033a729ac193ad2f132230b05c0745ed3f1ce5e05991e31 diff --git a/wdsp-0-distro-makefile.patch b/wdsp-0-distro-makefile.patch deleted file mode 100644 index 98a8520..0000000 --- a/wdsp-0-distro-makefile.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff --git a/Makefile b/Makefile -index 037ef82..904614a 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,6 +1,9 @@ - # - # libwdsp.so Makefile (Linux) - # -+PREFIX=/usr/local -+LIBDIR=$(DESTDIR)$(PREFIX)/lib -+INCLUDEDIR=$(DESTDIR)$(PREFIX)/include - CC=gcc - LINK=gcc - OPTIONS=-g -fPIC -O3 -D _GNU_SOURCE -@@ -213,24 +216,27 @@ all: $(PROGRAM) $(HEADERS) $(SOURCES) - java: $(JAVA_PROGRAM) $(JAVA_HEADERS) $(JAVA_SOURCES) - - $(PROGRAM): $(OBJS) -- $(LINK) -shared -z noexecstack -o $(PROGRAM) $(OBJS) $(LIBS) $(GTKLIBS) -+ $(LINK) -shared -z noexecstack $(LDFLAGS) -o $(PROGRAM) $(OBJS) $(LIBS) $(GTKLIBS) - - $(JAVA_PROGRAM): $(JAVA_OBJS) -- $(LINK) -shared -z noexecstack -o $(JAVA_PROGRAM) $(JAVA_OBJS) $(JAVA_LIBS) -+ $(LINK) -shared -z noexecstack $(LDFLAGS) -o $(JAVA_PROGRAM) $(JAVA_OBJS) $(JAVA_LIBS) - - .c.o: -- $(COMPILE) $(OPTIONS) $(GTKOPTIONS) -c -o $@ $< -+ $(COMPILE) $(OPTIONS) $(GTKOPTIONS) $(CFLAGS) -c -o $@ $< - --install: $(PROGRAM) -- cp wdsp.h /usr/local/include -- cp $(PROGRAM) /usr/local/lib -- ldconfig -+install-dirs: -+ mkdir -p $(LIBDIR) $(INCLUDEDIR) - --install_java: $(JAVA_PROGRAM) -- cp $(JAVA_PROGRAM) /usr/local/lib -+install: $(PROGRAM) install-dirs -+ cp -a wdsp.h $(INCLUDEDIR) -+ cp -a $(PROGRAM) $(LIBDIR) -+ ldconfig || : -+ -+install_java: $(JAVA_PROGRAM) install-dirs -+ cp -a $(JAVA_PROGRAM) $(LIBDIR) - - release: $(PROGRAM) -- cp $(PROGRAM) ../pihpsdr.src/release/pihpsdr -+ cp -a $(PROGRAM) ../pihpsdr.src/release/pihpsdr - - clean: - -rm -f *.o diff --git a/wdsp-0-soname-add.patch b/wdsp-0-soname-add.patch index 3d61daa..13d8456 100644 --- a/wdsp-0-soname-add.patch +++ b/wdsp-0-soname-add.patch @@ -1,23 +1,14 @@ -diff --git a/Makefile b/Makefile -index a2f0416..ecd7218 100644 ---- a/Makefile -+++ b/Makefile -@@ -216,7 +216,8 @@ all: $(PROGRAM) $(HEADERS) $(SOURCES) - java: $(JAVA_PROGRAM) $(JAVA_HEADERS) $(JAVA_SOURCES) +diff --git a/build_shared/makefile b/build_shared/makefile +index 4872ba1..a7983da 100644 +--- a/build_shared/makefile ++++ b/build_shared/makefile +@@ -73,7 +73,8 @@ wisdom.o\ + zetahat.o - $(PROGRAM): $(OBJS) -- $(LINK) -shared -z noexecstack $(LDFLAGS) -o $(PROGRAM) $(OBJS) $(LIBS) $(GTKLIBS) -+ $(LINK) -shared -fPIC -Wl,-soname,$(PROGRAM).0.1 -z noexecstack $(LDFLAGS) -o $(PROGRAM).0.1 $(OBJS) $(LIBS) $(GTKLIBS) -+ ln -s $(PROGRAM).0.1 $(PROGRAM) - - $(JAVA_PROGRAM): $(JAVA_OBJS) - $(LINK) -shared -z noexecstack $(LDFLAGS) -o $(JAVA_PROGRAM) $(JAVA_OBJS) $(JAVA_LIBS) -@@ -229,7 +231,7 @@ install-dirs: - - install: $(PROGRAM) install-dirs - cp -a wdsp.h $(INCLUDEDIR) -- cp -a $(PROGRAM) $(LIBDIR) -+ cp -a $(PROGRAM)* $(LIBDIR) - ldconfig || : - - install_java: $(JAVA_PROGRAM) install-dirs + libwdsp.so: $(OBJS) +- $(CC) -shared -o ../libwdsp.so $(OBJS) $(LIBS) ++ $(CC) -shared -Wl,-soname,libwdsp.so.0.1 -z noexecstack $(LDFLAGS) -o ../libwdsp.so.0.1 $(OBJS) $(LIBS) ++ ln -s ./libwdsp.so.0.1 ../libwdsp.so + + # Define the location for dependency files + DEPDIR = deps diff --git a/wdsp.spec b/wdsp.spec index 2a98acb..cd6c196 100644 --- a/wdsp.spec +++ b/wdsp.spec @@ -1,26 +1,23 @@ -# git ls-remote git://github.com/g0orx/wdsp.git -%global git_commit c55342c5b15354a9ac2b8b16eb8748d5518f723c -%global git_date 20210705 +# git ls-remote git://github.com/jimahlstrom/wdsp +%global git_commit 18782be8d7e75bf7e41e1f23e912640de8d6ce58 +%global git_date 20250922 %global git_short_commit %(echo %{git_commit} | cut -c -8) %global git_suffix %{git_date}git%{git_short_commit} Name: wdsp Version: 0 -Release: 0.11.%{git_suffix}%{?dist} +Release: 0.12.%{git_suffix}%{?dist} Summary: DSP library for LinHPSDR # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later -URL: https://github.com/g0orx/%{name} +URL: https://github.com/jimahlstrom/%{name} Source0: %{url}/archive/%{git_commit}/%{name}-%{git_suffix}.tar.gz BuildRequires: make BuildRequires: gcc BuildRequires: fftw-devel BuildRequires: pkgconfig(gtk+-3.0) -# https://github.com/g0orx/wdsp/pull/15 -Patch0: wdsp-0-distro-makefile.patch -# Encouraged upstream to add SONAME (https://github.com/g0orx/wdsp/pull/15) -Patch1: wdsp-0-soname-add.patch +Patch0: wdsp-0-soname-add.patch %description DSP library for LinHPSDR. @@ -32,29 +29,43 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %description devel Development files for wdsp. +%package doc +Summary: Documentation files for wdsp +Requires: %{name}%{?_isa} = %{version}-%{release} +BuildArch: noarch + +%description doc +Documentation files for wdsp. + %prep %autosetup -n %{name}-%{git_commit} -p1 -# unbundle fftw -rm -f fftw/* -rmdir fftw - %build -%make_build OPTIONS="-fPIC -D _GNU_SOURCE" CFLAGS="%{build_cflags}" LDFLAGS="%{build_ldflags}" GTK_INCLUDE=GTK +cd build_shared +%make_build CFLAGS="%{build_cflags} -fPIC -D _GNU_SOURCE" LDFLAGS="%{build_ldflags}" %install -%make_install LIBDIR="%{buildroot}%{_libdir}" INCLUDEDIR="%{buildroot}%{_includedir}" +install -Dpm 0775 -t %{buildroot}%{_libdir} ./libwdsp.so.0.* +cp ./libwdsp.so "%{buildroot}%{_libdir}/libwdsp.so" +install -Dpm 0664 src/wdsp.h "%{buildroot}%{_includedir}/wdsp.h" +install -Dpm 0664 "WDSP Guide, Rev 1.25.pdf" %{buildroot}/%{_docdir}/%{name}/"WDSP Guide, Rev 1.25.pdf" %files %doc README.md -%license COPYING +%license GNU_GENERAL_PUBLIC_LICENSE.txt %{_libdir}/libwdsp.so.0* %files devel %{_includedir}/wdsp.h %{_libdir}/libwdsp.so +%files doc +%{_docdir}/%{name}/WDSP\ Guide\,\ Rev\ 1.25.pdf + %changelog +* Mon Sep 22 2025 Jaroslav Škarvada - 0-0.12.20250922git18782be8 +- Switched to new upstream + * Fri Jul 25 2025 Fedora Release Engineering - 0-0.11.20210705gitc55342c5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 855eed35ebeca9068aca6436aeb20ea513f165d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= Date: Mon, 22 Sep 2025 17:51:55 +0200 Subject: [PATCH 09/11] Dropped isa requirement for docs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jaroslav Škarvada --- wdsp.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wdsp.spec b/wdsp.spec index cd6c196..75b082f 100644 --- a/wdsp.spec +++ b/wdsp.spec @@ -31,7 +31,7 @@ Development files for wdsp. %package doc Summary: Documentation files for wdsp -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name} = %{version}-%{release} BuildArch: noarch %description doc From da283a9908e010ae74f8833a090713bec2c63894 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:09:49 +0000 Subject: [PATCH 10/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- wdsp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wdsp.spec b/wdsp.spec index 75b082f..c815f5d 100644 --- a/wdsp.spec +++ b/wdsp.spec @@ -7,7 +7,7 @@ Name: wdsp Version: 0 -Release: 0.12.%{git_suffix}%{?dist} +Release: 0.13.%{git_suffix}%{?dist} Summary: DSP library for LinHPSDR # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later @@ -63,6 +63,9 @@ install -Dpm 0664 "WDSP Guide, Rev 1.25.pdf" %{buildroot}/%{_docdir}/%{name}/"WD %{_docdir}/%{name}/WDSP\ Guide\,\ Rev\ 1.25.pdf %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 0-0.13.20250922git18782be8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Mon Sep 22 2025 Jaroslav Škarvada - 0-0.12.20250922git18782be8 - Switched to new upstream From f9cfd1a17cac8bafb935ff7dd445a1091b5a182e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:44:14 +0000 Subject: [PATCH 11/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- wdsp.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wdsp.spec b/wdsp.spec index c815f5d..9baf23d 100644 --- a/wdsp.spec +++ b/wdsp.spec @@ -7,7 +7,7 @@ Name: wdsp Version: 0 -Release: 0.13.%{git_suffix}%{?dist} +Release: 0.14.%{git_suffix}%{?dist} Summary: DSP library for LinHPSDR # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later @@ -63,6 +63,9 @@ install -Dpm 0664 "WDSP Guide, Rev 1.25.pdf" %{buildroot}/%{_docdir}/%{name}/"WD %{_docdir}/%{name}/WDSP\ Guide\,\ Rev\ 1.25.pdf %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 0-0.14.20250922git18782be8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Sat Jan 17 2026 Fedora Release Engineering - 0-0.13.20250922git18782be8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild