diff --git a/.gitignore b/.gitignore index fe57c39..4ccaa4f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /liquid-dsp-9658d81.tar.gz +/liquid-dsp-1.3.2.tar.gz diff --git a/liquid-dsp.spec b/liquid-dsp.spec index 29f689e..aa9a663 100644 --- a/liquid-dsp.spec +++ b/liquid-dsp.spec @@ -1,14 +1,16 @@ -%global commit 9658d811f9194229304fec2d117f49c59b49a616 +%global commit 4892ebbc04ef57dd6f603d3f4ece253d8c2bd571 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global snapshotdate 20180806 +%global snapshotdate 20190728 Name: liquid-dsp -Version: 1.3.1 -Release: 6.%{snapshotdate}git%{shortcommit}%{?dist} +Version: 1.3.2 +#Release: 1.%{snapshotdate}git%{shortcommit}%{?dist} +Release: 1%{?dist} Summary: Digital Signal Processing Library for Software-Defined Radios License: MIT URL: http://liquidsdr.org/ -Source0: https://github.com/jgaeddert/%{name}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz +#Source0: https://github.com/jgaeddert/%{name}/archive/%{commit}/%{name}-%{shortcommit}.tar.gz +Source0: liquid-dsp-1.3.2.tar.gz # set soname ourselves as upstream doesn't Patch0: soname-version.patch # add autotooling as upstream doesn't @@ -16,7 +18,7 @@ Patch1: autotools.patch # fixes ppc64 altivec, other 64-bit problems. Patch by Dan HorĂ¡k. # https://github.com/jgaeddert/liquid-dsp/pull/136 Patch2: ppc64.patch -BuildRequires: gcc fftw-libs-single +BuildRequires: gcc fftw-libs-single gcovr %description Digital signal processing library for software-defined radios @@ -29,11 +31,11 @@ Requires: %{name}%{?_isa} = %{version}-%{release} Digital signal processing library for software-defined radios %prep -%autosetup -p1 -n %{name}-%{commit} +%autosetup -p1 -n %{name}-%{version} chmod a+x configure - +./bootstrap.sh %build -%configure --exec_prefix=/ +%configure --exec_prefix=/ --enable-coverage %make_build %check @@ -59,6 +61,9 @@ popd > /dev/null 2>&1 %changelog +* Tue Apr 7 2020 Matt Domsch 1.3.2-1 +- upstream 1.3.2 + * Wed Jan 29 2020 Fedora Release Engineering - 1.3.1-6.20180806git9658d81 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/soname-version.patch b/soname-version.patch index 8fddad0..7c81533 100644 --- a/soname-version.patch +++ b/soname-version.patch @@ -1,22 +1,26 @@ ---- liquid-dsp-9658d811f9194229304fec2d117f49c59b49a616.orig/configure.ac 2018-05-22 12:50:07.000000000 -05001.2 -+++ liquid-dsp-9658d811f9194229304fec2d117f49c59b49a616/configure.ac 2018-08-07 22:22:43.337429419 -0500 -@@ -242,7 +242,7 @@ darwin*) - REBIND="" - ;; - *) +diff --git a/configure.ac b/configure.ac +index b83faaa7..20307512 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -250,7 +250,7 @@ darwin*) + AC_PROG_AR + + AR_LIB=libliquid.a - SH_LIB=libliquid.so + SH_LIB=libliquid.so.1.3 REBIND=ldconfig ;; esac ---- liquid-dsp-9658d811f9194229304fec2d117f49c59b49a616.orig/makefile.in 2018-05-22 12:50:07.000000000 -0500 -+++ liquid-dsp-9658d811f9194229304fec2d117f49c59b49a616/makefile.in 2018-08-07 22:23:25.831449375 -0500 -@@ -1174,7 +1174,7 @@ libliquid.dylib: $(objects) - $(CC) -dynamiclib -install_name $@ -o $@ $^ $(LDFLAGS) $(LIBS) +diff --git a/makefile.in b/makefile.in +index ea3ffdb6..aef36810 100644 +--- a/makefile.in ++++ b/makefile.in +@@ -1200,7 +1200,7 @@ libliquid.a: $(objects) + ${AR} r $@ $^ + ${RANLIB} $@ - # linux, et al -libliquid.so: libliquid.a +@SH_LIB@: libliquid.a $(CC) $(CFLAGS) $(LDFLAGS) -shared -Xlinker -soname=$@ -o $@ -Wl,-whole-archive $^ -Wl,-no-whole-archive $(LIBS) - all: libliquid.a $(SHARED_LIB) + # static archive and library objects diff --git a/sources b/sources index ab02846..b9748f8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (liquid-dsp-9658d81.tar.gz) = dfb6ee1724f901a2142ca36d1c414fd8aa9b16187906e3df3f6d2df64aa3c669fda89a4073d9a0749634ba8ff5467194abe4fe91c78cfc71dbba3a836bdd0484 +SHA512 (liquid-dsp-1.3.2.tar.gz) = 1af317512f56078a79396fd3c7a0135c97ef63fd187d52db1b62ddabca683a37fa6b358adafd76d81c3cb06c54f9c7c8fd66f8bb86c0bfebec9e9ef1441ca5d2