From 17fac1ff7e5cb3a4224de28f80b16fc31ae7dc81 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 17 Mar 2015 14:47:42 +0000 Subject: [PATCH 01/53] Initial setup of the repo --- .gitignore | 0 sources | 0 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 .gitignore create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/sources b/sources new file mode 100644 index 0000000..e69de29 From 4dabbe52d887ae2c61ad6882d2bd14e1f9963d17 Mon Sep 17 00:00:00 2001 From: "Richard M. Shaw" Date: Tue, 17 Mar 2015 09:51:24 -0500 Subject: [PATCH 02/53] Initial import (#1110386). --- .gitignore | 1 + codec2.spec | 137 ++++++++++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + 3 files changed, 139 insertions(+) create mode 100644 codec2.spec diff --git a/.gitignore b/.gitignore index e69de29..ae5de83 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/codec2-0.3.svn2080.tar.xz diff --git a/codec2.spec b/codec2.spec new file mode 100644 index 0000000..5d2bee0 --- /dev/null +++ b/codec2.spec @@ -0,0 +1,137 @@ +%global svnrev 2080 +%global codate 20150317 + +Name: codec2 +Version: 0.3 +Release: 5.%{codate}svn%{svnrev}%{?dist} +Summary: Next-Generation Digital Voice for Two-Way Radio +License: LGPLv2 + +URL: http://rowetel.com/codec2.html +# svn co https://svn.code.sf.net/p/freetel/code/ freetel +# cd freetel; svn export codec2 +Source0: %{name}-%{version}%{?svnrev:.svn%{svnrev}}.tar.xz + + +BuildRequires: cmake + + +%description +Codec 2 is an open source (LGPL licensed) speech codec for 2400 bit/s +and below. This is the runtime library package. + + +%package devel +Summary: Development files for Codec 2 +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +Codec 2 is an open source (LGPL licensed) speech codec for 2400 bit/s +and below. This package contains the development files required to +compile programs that use codec2. + + +%package devel-examples +Summary: Example code for Codec 2 +Requires: %{name}-devel = %{version}-%{release} +BuildArch: noarch + +%description devel-examples +Example code for Codec 2 + + +%prep +%setup -q -n %{name}-%{version}%{?svnrev:.svn%{svnrev}} + + +%build +rm -rf build_linux && mkdir build_linux && pushd build_linux +%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DINSTALL_EXAMPLES=TRUE \ + -DUNITTEST=TRUE \ + ../ + +make %{?_smp_mflags} + + +%install +pushd build_linux +%make_install +popd + +# Create and install pkgconfig file +mkdir -p %{buildroot}%{_libdir}/pkgconfig +cat > %{buildroot}%{_libdir}/pkgconfig/codec2.pc << EOF +prefix=%{_prefix} +exec_prefix=\${prefix} +includedir=\${prefix}/include/%{name} +libdir=\${exec_prefix}/%{_lib} + +Name: codec2 +Description: Next-Generation Digital Voice for Two-Way Radio +Version: %{version} +Cflags: -I\${includedir} +Libs: -L\${libdir} -l%{name} +EOF + + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + + +%files +%doc COPYING README +%{_libdir}/*.so.* + +%files devel +%{_bindir}/* +%{_includedir}/%{name}/ +%{_libdir}/*.so +%{_libdir}/pkgconfig/%{name}.pc + +%files devel-examples +%{_datadir}/%{name}/ + + +%changelog +* Tue Mar 17 2015 Richard Shaw - 0.3-5.svn2080 +- Update to later checkout. + +* Mon Mar 16 2015 Richard Shaw - 0.3-4.svn1914 +- Fixup spec file per review request comments. + +* Sun Jul 27 2014 Richard Shaw - 0.3-2.svn1771 +- Fix executable permissions on scripts. +- Move example package to devel-examples. +- Move binaries to devel package as they are not useful elsewere. +- Fix package name to include svn checkout date. + +* Mon Jun 16 2014 Richard Shaw - 0.3-1.svn1657 +- Updated for ABI incompatible change in freedv. + +* Mon Jun 16 2014 Richard Shaw - 0.2-9 +- Update to newer svn checkout. + +* Mon May 5 2014 Richard Shaw - 0.2-8 +- Update to newer checkout. + +* Fri Mar 28 2014 Richard Shaw - 0.2-6 +- Update to newer checkout. + +* Wed Mar 27 2013 Richard Shaw - 0.2.0-5 +- Make the package more Fedora compliant. +- Add patch to make sure fdmdv.h is installed. +- Strip rpath from binaries. +- Create pkgconfig file to deal with non-standard header location. +- Move examples to a separate sub-package. + +* Sun Dec 30 2012 Mike Heitmann 0.2.0-2 +- Fixed ldconfig path error + +* Sun Dec 30 2012 Mike Heitmann 0.2.0-1 +- Fixed ldconfig errors, corrected version number + +* Sun Dec 23 2012 Mike Heitmann 0.0.1-1 +- Initial SPEC +- Split out from FreeDV to compile separately diff --git a/sources b/sources index e69de29..30f14ab 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +68073852621f4a1bd5aa5cf2ae3f6cc2 codec2-0.3.svn2080.tar.xz From 18af376f662c2ca852cace615a9539b9d99dc6ae Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 02:56:49 +0000 Subject: [PATCH 03/53] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- codec2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/codec2.spec b/codec2.spec index 5d2bee0..a994700 100644 --- a/codec2.spec +++ b/codec2.spec @@ -3,7 +3,7 @@ Name: codec2 Version: 0.3 -Release: 5.%{codate}svn%{svnrev}%{?dist} +Release: 6.%{codate}svn%{svnrev}%{?dist} Summary: Next-Generation Digital Voice for Two-Way Radio License: LGPLv2 @@ -95,6 +95,9 @@ EOF %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 0.3-6.20150317svn2080 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Tue Mar 17 2015 Richard Shaw - 0.3-5.svn2080 - Update to later checkout. From d92ad2d54f1b48f0ceb44d84a86bb17fec691a26 Mon Sep 17 00:00:00 2001 From: "Richard M. Shaw" Date: Thu, 2 Jul 2015 08:52:04 -0500 Subject: [PATCH 04/53] Update to latest upstream release. --- .gitignore | 1 + codec2.spec | 12 +++++++----- sources | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index ae5de83..6188088 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /codec2-0.3.svn2080.tar.xz +/codec2-0.4.tar.xz diff --git a/codec2.spec b/codec2.spec index a994700..42e51d6 100644 --- a/codec2.spec +++ b/codec2.spec @@ -1,9 +1,9 @@ -%global svnrev 2080 -%global codate 20150317 +#global svnrev 2167 +#global codate 20150530 Name: codec2 -Version: 0.3 -Release: 6.%{codate}svn%{svnrev}%{?dist} +Version: 0.4 +Release: 1%{?svnrev:.%{codate}svn%{svnrev}}%{?dist} Summary: Next-Generation Digital Voice for Two-Way Radio License: LGPLv2 @@ -12,7 +12,6 @@ URL: http://rowetel.com/codec2.html # cd freetel; svn export codec2 Source0: %{name}-%{version}%{?svnrev:.svn%{svnrev}}.tar.xz - BuildRequires: cmake @@ -95,6 +94,9 @@ EOF %changelog +* Thu Jul 2 2015 Richard Shaw - 0.4-1 +- Update to latest upstream release. + * Wed Jun 17 2015 Fedora Release Engineering - 0.3-6.20150317svn2080 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index 30f14ab..c48a784 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -68073852621f4a1bd5aa5cf2ae3f6cc2 codec2-0.3.svn2080.tar.xz +d4218aefd90f6383444be230a1957539 codec2-0.4.tar.xz From 3432c5553313d5b943f949305f29997d42e3c49e Mon Sep 17 00:00:00 2001 From: "Richard M. Shaw" Date: Thu, 2 Jul 2015 09:16:14 -0500 Subject: [PATCH 05/53] Add new build requirements speex & speexdsp. --- codec2.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/codec2.spec b/codec2.spec index 42e51d6..a6d071e 100644 --- a/codec2.spec +++ b/codec2.spec @@ -13,6 +13,10 @@ URL: http://rowetel.com/codec2.html Source0: %{name}-%{version}%{?svnrev:.svn%{svnrev}}.tar.xz BuildRequires: cmake +BuildRequires: speex-devel +%if 0%{?fedora} >= 22 +BuildRequires: speexdsp-devel +%endif %description From e048bc9bb67621b4f87da063fed9d25fb192326d Mon Sep 17 00:00:00 2001 From: "Richard M. Shaw" Date: Thu, 29 Oct 2015 08:40:06 -0500 Subject: [PATCH 06/53] Update to latest upstream release. --- .gitignore | 1 + codec2.spec | 28 +++++++++++++--------------- sources | 2 +- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index 6188088..9332115 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /codec2-0.3.svn2080.tar.xz /codec2-0.4.tar.xz +/codec2-0.5.tar.xz diff --git a/codec2.spec b/codec2.spec index a6d071e..1041773 100644 --- a/codec2.spec +++ b/codec2.spec @@ -1,16 +1,11 @@ -#global svnrev 2167 -#global codate 20150530 - Name: codec2 -Version: 0.4 -Release: 1%{?svnrev:.%{codate}svn%{svnrev}}%{?dist} +Version: 0.5 +Release: 1%{?dist} Summary: Next-Generation Digital Voice for Two-Way Radio License: LGPLv2 URL: http://rowetel.com/codec2.html -# svn co https://svn.code.sf.net/p/freetel/code/ freetel -# cd freetel; svn export codec2 -Source0: %{name}-%{version}%{?svnrev:.svn%{svnrev}}.tar.xz +Source0: http://files.freedv.org/%{name}/%{name}-%{version}.tar.xz BuildRequires: cmake BuildRequires: speex-devel @@ -44,14 +39,12 @@ Example code for Codec 2 %prep -%setup -q -n %{name}-%{version}%{?svnrev:.svn%{svnrev}} +%setup -q %build rm -rf build_linux && mkdir build_linux && pushd build_linux %cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DINSTALL_EXAMPLES=TRUE \ - -DUNITTEST=TRUE \ ../ make %{?_smp_mflags} @@ -84,7 +77,9 @@ EOF %files -%doc COPYING README +%{!?_licensedir:%global license %doc} +%license COPYING +%doc README %{_libdir}/*.so.* %files devel @@ -93,11 +88,14 @@ EOF %{_libdir}/*.so %{_libdir}/pkgconfig/%{name}.pc -%files devel-examples -%{_datadir}/%{name}/ - %changelog +* Thu Oct 29 2015 Richard Shaw - 0.5-1 +- Update to latest upstream release. + +* Sat Aug 8 2015 Richard Shaw - 0.4-2 +- Update to latest bugfix release. + * Thu Jul 2 2015 Richard Shaw - 0.4-1 - Update to latest upstream release. diff --git a/sources b/sources index c48a784..f345ab9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d4218aefd90f6383444be230a1957539 codec2-0.4.tar.xz +80d176fb8948c43c747cd798f200cefe codec2-0.5.tar.xz From 5ad72429b666a4bb3016417364081cd83f8c84d0 Mon Sep 17 00:00:00 2001 From: "Richard M. Shaw" Date: Thu, 21 Jan 2016 08:26:53 -0600 Subject: [PATCH 07/53] Remove %%license conditional as it is available in EPEL 7 now. --- codec2.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/codec2.spec b/codec2.spec index 1041773..b7b8a3c 100644 --- a/codec2.spec +++ b/codec2.spec @@ -77,7 +77,6 @@ EOF %files -%{!?_licensedir:%global license %doc} %license COPYING %doc README %{_libdir}/*.so.* From 9ce8b0e2d50087ed9c1eb163526952b1f9a0ac47 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 17:52:46 +0000 Subject: [PATCH 08/53] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- codec2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/codec2.spec b/codec2.spec index b7b8a3c..33d31b3 100644 --- a/codec2.spec +++ b/codec2.spec @@ -1,6 +1,6 @@ Name: codec2 Version: 0.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Next-Generation Digital Voice for Two-Way Radio License: LGPLv2 @@ -89,6 +89,9 @@ EOF %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 0.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Thu Oct 29 2015 Richard Shaw - 0.5-1 - Update to latest upstream release. From 76893ac45c802cd7cf8fcdec7943be140cf0ba62 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 07:40:56 +0000 Subject: [PATCH 09/53] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- codec2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/codec2.spec b/codec2.spec index 33d31b3..db12b0e 100644 --- a/codec2.spec +++ b/codec2.spec @@ -1,6 +1,6 @@ Name: codec2 Version: 0.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Next-Generation Digital Voice for Two-Way Radio License: LGPLv2 @@ -89,6 +89,9 @@ EOF %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 0.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Wed Feb 03 2016 Fedora Release Engineering - 0.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 894c9a5fbbdbb62550ba713eeeb9c4b089c30a5d Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Sun, 19 Feb 2017 12:49:18 -0600 Subject: [PATCH 10/53] Update to latest upstream release. --- .gitignore | 1 + codec2.spec | 12 ++++++------ sources | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 9332115..2fc9197 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /codec2-0.3.svn2080.tar.xz /codec2-0.4.tar.xz /codec2-0.5.tar.xz +/codec2-0.6.tar.xz diff --git a/codec2.spec b/codec2.spec index db12b0e..e599c7d 100644 --- a/codec2.spec +++ b/codec2.spec @@ -1,6 +1,6 @@ Name: codec2 -Version: 0.5 -Release: 3%{?dist} +Version: 0.6 +Release: 1%{?dist} Summary: Next-Generation Digital Voice for Two-Way Radio License: LGPLv2 @@ -9,9 +9,7 @@ Source0: http://files.freedv.org/%{name}/%{name}-%{version}.tar.xz BuildRequires: cmake BuildRequires: speex-devel -%if 0%{?fedora} >= 22 BuildRequires: speexdsp-devel -%endif %description @@ -39,7 +37,7 @@ Example code for Codec 2 %prep -%setup -q +%autosetup %build @@ -72,7 +70,6 @@ EOF %post -p /sbin/ldconfig - %postun -p /sbin/ldconfig @@ -89,6 +86,9 @@ EOF %changelog +* Sun Feb 19 2017 Richard Shaw - 0.6-1 +- Update to latest upstream release. + * Fri Feb 10 2017 Fedora Release Engineering - 0.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index f345ab9..47db213 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -80d176fb8948c43c747cd798f200cefe codec2-0.5.tar.xz +SHA512 (codec2-0.6.tar.xz) = 437d2ce26b1fd920960cce6565af5dd7fed12bc8afdd78f6059ab8efb2f472095b3fb49a12d54f837fbd543e8c85f275e2ade8e25e6bacdea6195ba1bb233535 From 36efd3efa931f537aa6872f2c294aaa7d99127be Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Mon, 20 Feb 2017 11:20:46 -0600 Subject: [PATCH 11/53] Add conditionals to deal with EL 6 & 7. --- codec2.spec | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/codec2.spec b/codec2.spec index e599c7d..de35e7a 100644 --- a/codec2.spec +++ b/codec2.spec @@ -7,9 +7,13 @@ License: LGPLv2 URL: http://rowetel.com/codec2.html Source0: http://files.freedv.org/%{name}/%{name}-%{version}.tar.xz -BuildRequires: cmake +Patch0: codec2-el6_gnu11.patch + +BuildRequires: cmake%{?rhel:3} BuildRequires: speex-devel +%if 0%{?fedora} BuildRequires: speexdsp-devel +%endif %description @@ -37,13 +41,19 @@ Example code for Codec 2 %prep -%autosetup +%setup -q +%patch0 -p1 %build rm -rf build_linux && mkdir build_linux && pushd build_linux -%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - ../ +%if 0%{?rhel} +%cmake3 \ +%else +%cmake \ +%endif + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + ../ make %{?_smp_mflags} @@ -70,6 +80,7 @@ EOF %post -p /sbin/ldconfig + %postun -p /sbin/ldconfig @@ -95,6 +106,9 @@ EOF * Wed Feb 03 2016 Fedora Release Engineering - 0.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild +* Mon Apr 25 2016 Richard Shaw - 0.5.1-1 +- Update to latest upstream release. + * Thu Oct 29 2015 Richard Shaw - 0.5-1 - Update to latest upstream release. From b2949d38dcf7c9ed44bd9e5106d5e12dd400f0f6 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Mon, 20 Feb 2017 11:22:21 -0600 Subject: [PATCH 12/53] Fix changelog order. --- codec2.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/codec2.spec b/codec2.spec index de35e7a..541eb67 100644 --- a/codec2.spec +++ b/codec2.spec @@ -103,12 +103,12 @@ EOF * Fri Feb 10 2017 Fedora Release Engineering - 0.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild -* Wed Feb 03 2016 Fedora Release Engineering - 0.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - * Mon Apr 25 2016 Richard Shaw - 0.5.1-1 - Update to latest upstream release. +* Wed Feb 03 2016 Fedora Release Engineering - 0.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Thu Oct 29 2015 Richard Shaw - 0.5-1 - Update to latest upstream release. From 7c061d35817b0cbc58f693e82899927aa0818b9b Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Mon, 20 Feb 2017 11:25:27 -0600 Subject: [PATCH 13/53] Add patch to deal with c++11 on EL6. --- codec2-el6_gnu11.patch | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 codec2-el6_gnu11.patch diff --git a/codec2-el6_gnu11.patch b/codec2-el6_gnu11.patch new file mode 100644 index 0000000..2b133e7 --- /dev/null +++ b/codec2-el6_gnu11.patch @@ -0,0 +1,31 @@ +Index: codec2-dev/CMakeLists.txt +=================================================================== +--- codec2-dev/CMakeLists.txt (revision 3026) ++++ codec2-dev/CMakeLists.txt (working copy) +@@ -52,18 +52,21 @@ + endif() + + # Set default C++ flags. +-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall") +-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -g -O3 -std=gnu11") ++include(CheckCCompilerFlag) ++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -g -O3") ++CHECK_C_COMPILER_FLAG("-std=gnu11" COMPILER_SUPPORTS_GNU11) ++if(COMPILER_SUPPORTS_GNU11) ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu11") ++else() ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99") ++endif() + # set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-function") + + set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS}") +-set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS}") + set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS}") +-set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS}") + + # -fPIC is implied on MinGW... + if(NOT WIN32) +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC") + endif() + From c2b30ba26fc55356341f3493747465775ec7244e Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Mon, 20 Feb 2017 11:30:54 -0600 Subject: [PATCH 14/53] Patch has been included upstream, removing. --- codec2-el6_gnu11.patch | 31 ------------------------------- codec2.spec | 5 +---- 2 files changed, 1 insertion(+), 35 deletions(-) delete mode 100644 codec2-el6_gnu11.patch diff --git a/codec2-el6_gnu11.patch b/codec2-el6_gnu11.patch deleted file mode 100644 index 2b133e7..0000000 --- a/codec2-el6_gnu11.patch +++ /dev/null @@ -1,31 +0,0 @@ -Index: codec2-dev/CMakeLists.txt -=================================================================== ---- codec2-dev/CMakeLists.txt (revision 3026) -+++ codec2-dev/CMakeLists.txt (working copy) -@@ -52,18 +52,21 @@ - endif() - - # Set default C++ flags. --set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall") --set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -g -O3 -std=gnu11") -+include(CheckCCompilerFlag) -+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -g -O3") -+CHECK_C_COMPILER_FLAG("-std=gnu11" COMPILER_SUPPORTS_GNU11) -+if(COMPILER_SUPPORTS_GNU11) -+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu11") -+else() -+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99") -+endif() - # set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-function") - - set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS}") --set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS}") - set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS}") --set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS}") - - # -fPIC is implied on MinGW... - if(NOT WIN32) -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC") - endif() - diff --git a/codec2.spec b/codec2.spec index 541eb67..21c0d57 100644 --- a/codec2.spec +++ b/codec2.spec @@ -7,8 +7,6 @@ License: LGPLv2 URL: http://rowetel.com/codec2.html Source0: http://files.freedv.org/%{name}/%{name}-%{version}.tar.xz -Patch0: codec2-el6_gnu11.patch - BuildRequires: cmake%{?rhel:3} BuildRequires: speex-devel %if 0%{?fedora} @@ -41,8 +39,7 @@ Example code for Codec 2 %prep -%setup -q -%patch0 -p1 +%autosetup %build From 762f92bdf6cf1e0251769557595fa51c80cf6f11 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Fri, 21 Jul 2017 08:10:56 -0500 Subject: [PATCH 15/53] Update to latest upstream release. --- .gitignore | 1 + codec2.spec | 14 +++++++------- sources | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 2fc9197..0f619b9 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /codec2-0.4.tar.xz /codec2-0.5.tar.xz /codec2-0.6.tar.xz +/codec2-0.7.tar.xz diff --git a/codec2.spec b/codec2.spec index 21c0d57..29b9aae 100644 --- a/codec2.spec +++ b/codec2.spec @@ -1,5 +1,7 @@ +%{?rhel: %global cmake %cmake3} + Name: codec2 -Version: 0.6 +Version: 0.7 Release: 1%{?dist} Summary: Next-Generation Digital Voice for Two-Way Radio License: LGPLv2 @@ -44,12 +46,7 @@ Example code for Codec 2 %build rm -rf build_linux && mkdir build_linux && pushd build_linux -%if 0%{?rhel} -%cmake3 \ -%else -%cmake \ -%endif - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ +%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \ ../ make %{?_smp_mflags} @@ -94,6 +91,9 @@ EOF %changelog +* Fri Jul 21 2017 Richard Shaw - 0.7-1 +- Update to latest upstream release. + * Sun Feb 19 2017 Richard Shaw - 0.6-1 - Update to latest upstream release. diff --git a/sources b/sources index 47db213..f21ee3f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (codec2-0.6.tar.xz) = 437d2ce26b1fd920960cce6565af5dd7fed12bc8afdd78f6059ab8efb2f472095b3fb49a12d54f837fbd543e8c85f275e2ade8e25e6bacdea6195ba1bb233535 +SHA512 (codec2-0.7.tar.xz) = bf2f40071c21096d9504aacb293e7c293e1a51d732b91d870b5b35c372684cdb187fe4aafb6c27601c75167bd3783470e054d65b4be215facf67acee8afc56af From 2baca6f25b9918aceac191f2e53df738fbf9fad5 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Fri, 21 Jul 2017 09:15:41 -0500 Subject: [PATCH 16/53] Add libsamplerate-devel as build requirement. --- codec2.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/codec2.spec b/codec2.spec index 29b9aae..122eac2 100644 --- a/codec2.spec +++ b/codec2.spec @@ -10,6 +10,7 @@ URL: http://rowetel.com/codec2.html Source0: http://files.freedv.org/%{name}/%{name}-%{version}.tar.xz BuildRequires: cmake%{?rhel:3} +BuildRequires: libsamplerate-devel BuildRequires: speex-devel %if 0%{?fedora} BuildRequires: speexdsp-devel From 965a770979fa697001c1b54a186c16e1cfc4cd5a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 05:08:32 +0000 Subject: [PATCH 17/53] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- codec2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/codec2.spec b/codec2.spec index 122eac2..e98e2a6 100644 --- a/codec2.spec +++ b/codec2.spec @@ -2,7 +2,7 @@ Name: codec2 Version: 0.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Next-Generation Digital Voice for Two-Way Radio License: LGPLv2 @@ -92,6 +92,9 @@ EOF %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 0.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Jul 21 2017 Richard Shaw - 0.7-1 - Update to latest upstream release. From d34cf2afdc392165da8d8c6648034ceb9df9dfe7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 2 Aug 2017 18:58:38 +0000 Subject: [PATCH 18/53] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- codec2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/codec2.spec b/codec2.spec index e98e2a6..1a3c04a 100644 --- a/codec2.spec +++ b/codec2.spec @@ -2,7 +2,7 @@ Name: codec2 Version: 0.7 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Next-Generation Digital Voice for Two-Way Radio License: LGPLv2 @@ -92,6 +92,9 @@ EOF %changelog +* Wed Aug 02 2017 Fedora Release Engineering - 0.7-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 0.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From afc6fefd8256efbdf75ab698bfcf5c2765673c0e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 05:19:10 +0000 Subject: [PATCH 19/53] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- codec2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/codec2.spec b/codec2.spec index 1a3c04a..31d34b0 100644 --- a/codec2.spec +++ b/codec2.spec @@ -2,7 +2,7 @@ Name: codec2 Version: 0.7 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Next-Generation Digital Voice for Two-Way Radio License: LGPLv2 @@ -92,6 +92,9 @@ EOF %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 0.7-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Wed Aug 02 2017 Fedora Release Engineering - 0.7-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From dcfdcf99e9eda3f673c0cd7d5a8c395cede80390 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Tue, 29 May 2018 07:40:23 -0500 Subject: [PATCH 20/53] Update to 0.8. --- .gitignore | 1 + codec2.spec | 13 +++++++------ sources | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 0f619b9..57abb13 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /codec2-0.5.tar.xz /codec2-0.6.tar.xz /codec2-0.7.tar.xz +/codec2-0.8.tar.xz diff --git a/codec2.spec b/codec2.spec index 31d34b0..549a3ff 100644 --- a/codec2.spec +++ b/codec2.spec @@ -1,13 +1,13 @@ %{?rhel: %global cmake %cmake3} Name: codec2 -Version: 0.7 -Release: 4%{?dist} +Version: 0.8 +Release: 1%{?dist} Summary: Next-Generation Digital Voice for Two-Way Radio License: LGPLv2 URL: http://rowetel.com/codec2.html -Source0: http://files.freedv.org/%{name}/%{name}-%{version}.tar.xz +Source0: https://hobbes1069.fedorapeople.org/freetel/%{name}/%{name}-%{version}.tar.xz BuildRequires: cmake%{?rhel:3} BuildRequires: libsamplerate-devel @@ -74,9 +74,7 @@ Libs: -L\${libdir} -l%{name} EOF -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig +%ldconfig_scriptlets %files @@ -92,6 +90,9 @@ EOF %changelog +* Tue May 29 2018 Richard Shaw - 0.8-1 +- Update to 0.8. + * Wed Feb 07 2018 Fedora Release Engineering - 0.7-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index f21ee3f..cec5434 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (codec2-0.7.tar.xz) = bf2f40071c21096d9504aacb293e7c293e1a51d732b91d870b5b35c372684cdb187fe4aafb6c27601c75167bd3783470e054d65b4be215facf67acee8afc56af +SHA512 (codec2-0.8.tar.xz) = dd10ca2d5cb18bef2b1e363d005b63ed3d0ed4b829ed172ec61f2f678460356f8cadb578d9fe4adfff49c18991e0396b0bc892c9e88b53acf98c2412e731d4f9 From 5a337290f1043ff4461e1148cc9430bdb69bb961 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Sun, 3 Jun 2018 08:32:39 -0500 Subject: [PATCH 21/53] Update to 0.8.1 --- .gitignore | 1 + codec2.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 57abb13..7e78cd2 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /codec2-0.6.tar.xz /codec2-0.7.tar.xz /codec2-0.8.tar.xz +/codec2-0.8.1.tar.xz diff --git a/codec2.spec b/codec2.spec index 549a3ff..079d0d4 100644 --- a/codec2.spec +++ b/codec2.spec @@ -1,7 +1,7 @@ %{?rhel: %global cmake %cmake3} Name: codec2 -Version: 0.8 +Version: 0.8.1 Release: 1%{?dist} Summary: Next-Generation Digital Voice for Two-Way Radio License: LGPLv2 @@ -68,7 +68,7 @@ libdir=\${exec_prefix}/%{_lib} Name: codec2 Description: Next-Generation Digital Voice for Two-Way Radio -Version: %{version} +Version: 0.8.1 Cflags: -I\${includedir} Libs: -L\${libdir} -l%{name} EOF @@ -90,6 +90,9 @@ EOF %changelog +* Sun Jun 03 2018 Richard Shaw - 0.8.1-1 +- Update to 0.8.1 + * Tue May 29 2018 Richard Shaw - 0.8-1 - Update to 0.8. diff --git a/sources b/sources index cec5434..0da5c09 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (codec2-0.8.tar.xz) = dd10ca2d5cb18bef2b1e363d005b63ed3d0ed4b829ed172ec61f2f678460356f8cadb578d9fe4adfff49c18991e0396b0bc892c9e88b53acf98c2412e731d4f9 +SHA512 (codec2-0.8.1.tar.xz) = 4f2633d510ab68102b77b15492d87d25fe5fa96d90dc1ca6b3bf7deea04a3765382bfbbde981c9cac70d3e9d091c56b2099544b09b36a84ed62cb9087c9bb819 From b1f4a58c4a8004e4ecaf03ee9e273cf0944d7f55 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 9 Jul 2018 19:06:43 +0200 Subject: [PATCH 22/53] add BuildRequires: gcc Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- codec2.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/codec2.spec b/codec2.spec index 079d0d4..143dc31 100644 --- a/codec2.spec +++ b/codec2.spec @@ -9,6 +9,7 @@ License: LGPLv2 URL: http://rowetel.com/codec2.html Source0: https://hobbes1069.fedorapeople.org/freetel/%{name}/%{name}-%{version}.tar.xz +BuildRequires: gcc BuildRequires: cmake%{?rhel:3} BuildRequires: libsamplerate-devel BuildRequires: speex-devel From 3b05b2ac8a33caa2ad5e48633faa1157bae39638 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 12 Jul 2018 21:59:53 +0000 Subject: [PATCH 23/53] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- codec2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/codec2.spec b/codec2.spec index 143dc31..99feb82 100644 --- a/codec2.spec +++ b/codec2.spec @@ -2,7 +2,7 @@ Name: codec2 Version: 0.8.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Next-Generation Digital Voice for Two-Way Radio License: LGPLv2 @@ -91,6 +91,9 @@ EOF %changelog +* Thu Jul 12 2018 Fedora Release Engineering - 0.8.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Sun Jun 03 2018 Richard Shaw - 0.8.1-1 - Update to 0.8.1 From faf19637aed6e83f6946f136e804e9c01ad0253f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 15:54:33 +0000 Subject: [PATCH 24/53] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- codec2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/codec2.spec b/codec2.spec index 99feb82..925e555 100644 --- a/codec2.spec +++ b/codec2.spec @@ -2,7 +2,7 @@ Name: codec2 Version: 0.8.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Next-Generation Digital Voice for Two-Way Radio License: LGPLv2 @@ -91,6 +91,9 @@ EOF %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 0.8.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Thu Jul 12 2018 Fedora Release Engineering - 0.8.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 2ec6dfbcd5a5cb763ce7a1f0724e8dd938d8c399 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 20:35:17 +0000 Subject: [PATCH 25/53] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- codec2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/codec2.spec b/codec2.spec index 925e555..3d6524a 100644 --- a/codec2.spec +++ b/codec2.spec @@ -2,7 +2,7 @@ Name: codec2 Version: 0.8.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Next-Generation Digital Voice for Two-Way Radio License: LGPLv2 @@ -91,6 +91,9 @@ EOF %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 0.8.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Jan 31 2019 Fedora Release Engineering - 0.8.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From ff36c9a6df42af60d40b0fd4a3f26be1103347c8 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Mon, 11 Nov 2019 14:16:24 -0600 Subject: [PATCH 26/53] Update spec file for EL 8. --- codec2.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/codec2.spec b/codec2.spec index 3d6524a..864291a 100644 --- a/codec2.spec +++ b/codec2.spec @@ -13,7 +13,7 @@ BuildRequires: gcc BuildRequires: cmake%{?rhel:3} BuildRequires: libsamplerate-devel BuildRequires: speex-devel -%if 0%{?fedora} +%if ! 0%{?rhel} < 8 BuildRequires: speexdsp-devel %endif From 43cc552febc248be09afbbcb92df8d3adc586af5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 14:24:10 +0000 Subject: [PATCH 27/53] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- codec2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/codec2.spec b/codec2.spec index 864291a..34e4336 100644 --- a/codec2.spec +++ b/codec2.spec @@ -2,7 +2,7 @@ Name: codec2 Version: 0.8.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Next-Generation Digital Voice for Two-Way Radio License: LGPLv2 @@ -91,6 +91,9 @@ EOF %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 0.8.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Wed Jul 24 2019 Fedora Release Engineering - 0.8.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From edafd8db320e471a49eea8afb8605a0b6f46ecfd Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Thu, 16 Apr 2020 15:58:56 -0500 Subject: [PATCH 28/53] Update to 0.9.2. --- .gitignore | 1 + codec2.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 7e78cd2..3c6e67b 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /codec2-0.7.tar.xz /codec2-0.8.tar.xz /codec2-0.8.1.tar.xz +/codec2-0.9.2.tar.gz diff --git a/codec2.spec b/codec2.spec index 34e4336..c81b876 100644 --- a/codec2.spec +++ b/codec2.spec @@ -1,13 +1,13 @@ %{?rhel: %global cmake %cmake3} Name: codec2 -Version: 0.8.1 -Release: 5%{?dist} +Version: 0.9.2 +Release: 1%{?dist} Summary: Next-Generation Digital Voice for Two-Way Radio License: LGPLv2 URL: http://rowetel.com/codec2.html -Source0: https://hobbes1069.fedorapeople.org/freetel/%{name}/%{name}-%{version}.tar.xz +Source0: https://github.com/drowe67/codec2/archive/v%{version}/%{name}-%{version}.tar.gz BuildRequires: gcc BuildRequires: cmake%{?rhel:3} @@ -69,7 +69,7 @@ libdir=\${exec_prefix}/%{_lib} Name: codec2 Description: Next-Generation Digital Voice for Two-Way Radio -Version: 0.8.1 +Version: 0.9.2 Cflags: -I\${includedir} Libs: -L\${libdir} -l%{name} EOF @@ -91,6 +91,9 @@ EOF %changelog +* Thu Apr 16 2020 Richard Shaw - 0.9.2-1 +- Update to 0.9.2. + * Tue Jan 28 2020 Fedora Release Engineering - 0.8.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 0da5c09..f846f7b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (codec2-0.8.1.tar.xz) = 4f2633d510ab68102b77b15492d87d25fe5fa96d90dc1ca6b3bf7deea04a3765382bfbbde981c9cac70d3e9d091c56b2099544b09b36a84ed62cb9087c9bb819 +SHA512 (codec2-0.9.2.tar.gz) = 30a2eb95f7b0f47f0c0c7f08c9118f089acc32adf8b27f5b4354c89139efe80607d6d0ca5e0a9eefddf3640f02c483b9c804ad52c5dec6295968b7267f3a716c From a1fc7da128674fa1ff8d25684f109da3d6f2ad7d Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Thu, 16 Apr 2020 16:12:39 -0500 Subject: [PATCH 29/53] Add legacy fcommon back for now. --- codec2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/codec2.spec b/codec2.spec index c81b876..f34f6ae 100644 --- a/codec2.spec +++ b/codec2.spec @@ -1,3 +1,6 @@ +# https://bugzilla.redhat.com/show_bug.cgi?id=1799237 +%define _legacy_common_support 1 + %{?rhel: %global cmake %cmake3} Name: codec2 @@ -47,7 +50,7 @@ Example code for Codec 2 %build -rm -rf build_linux && mkdir build_linux && pushd build_linux +mkdir build_linux && pushd build_linux %cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \ ../ From abfeb6cac3dd23004f304675d1a29813cb3a117c Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Thu, 16 Apr 2020 16:30:57 -0500 Subject: [PATCH 30/53] Update for new cmake devel files. --- codec2.spec | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/codec2.spec b/codec2.spec index f34f6ae..fb4496e 100644 --- a/codec2.spec +++ b/codec2.spec @@ -1,6 +1,3 @@ -# https://bugzilla.redhat.com/show_bug.cgi?id=1799237 -%define _legacy_common_support 1 - %{?rhel: %global cmake %cmake3} Name: codec2 @@ -83,7 +80,7 @@ EOF %files %license COPYING -%doc README +%doc README.md %{_libdir}/*.so.* %files devel @@ -91,6 +88,7 @@ EOF %{_includedir}/%{name}/ %{_libdir}/*.so %{_libdir}/pkgconfig/%{name}.pc +%{_libdir}/cmake/%{name}/ %changelog From 5c2d495a593a5406b44485a63c2414fdc5135198 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Fri, 22 May 2020 12:54:37 -0500 Subject: [PATCH 31/53] Rebuild with lpcnetfreedv. --- codec2.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/codec2.spec b/codec2.spec index fb4496e..aefae09 100644 --- a/codec2.spec +++ b/codec2.spec @@ -2,7 +2,7 @@ Name: codec2 Version: 0.9.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Next-Generation Digital Voice for Two-Way Radio License: LGPLv2 @@ -49,6 +49,7 @@ Example code for Codec 2 %build mkdir build_linux && pushd build_linux %cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DLPCNET=ON \ ../ make %{?_smp_mflags} @@ -92,6 +93,9 @@ EOF %changelog +* Fri May 22 2020 Richard Shaw - 0.9.2-2 +- Rebuild with lpcnetfreedv. + * Thu Apr 16 2020 Richard Shaw - 0.9.2-1 - Update to 0.9.2. From 3406f59b950a1bce9462ddf1587d543c3dc79d76 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Fri, 22 May 2020 13:00:24 -0500 Subject: [PATCH 32/53] Add BR on lpcnetfreedv. --- codec2.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/codec2.spec b/codec2.spec index aefae09..dc42b55 100644 --- a/codec2.spec +++ b/codec2.spec @@ -12,6 +12,7 @@ Source0: https://github.com/drowe67/codec2/archive/v%{version}/%{name}-%{ BuildRequires: gcc BuildRequires: cmake%{?rhel:3} BuildRequires: libsamplerate-devel +BuildRequires: lpcnetfreedv-devel BuildRequires: speex-devel %if ! 0%{?rhel} < 8 BuildRequires: speexdsp-devel From ab4f0be886f90c80f371f5f51361e7109f0121be Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 14:15:16 +0000 Subject: [PATCH 33/53] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- codec2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/codec2.spec b/codec2.spec index dc42b55..26b237a 100644 --- a/codec2.spec +++ b/codec2.spec @@ -2,7 +2,7 @@ Name: codec2 Version: 0.9.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Next-Generation Digital Voice for Two-Way Radio License: LGPLv2 @@ -94,6 +94,9 @@ EOF %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 0.9.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri May 22 2020 Richard Shaw - 0.9.2-2 - Rebuild with lpcnetfreedv. From ff0b1f0b5b074beddcf0816c90ac621acc2ba8bd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 00:24:50 +0000 Subject: [PATCH 34/53] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- codec2.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/codec2.spec b/codec2.spec index 26b237a..0eb87a4 100644 --- a/codec2.spec +++ b/codec2.spec @@ -2,7 +2,7 @@ Name: codec2 Version: 0.9.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Next-Generation Digital Voice for Two-Way Radio License: LGPLv2 @@ -94,6 +94,10 @@ EOF %changelog +* Sat Aug 01 2020 Fedora Release Engineering - 0.9.2-4 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 0.9.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 85d43c8edf16456bba9522026155814233d097be Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Sat, 22 Aug 2020 20:47:03 -0500 Subject: [PATCH 35/53] CMake fixups for mass change. --- codec2.spec | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/codec2.spec b/codec2.spec index 0eb87a4..64b7aeb 100644 --- a/codec2.spec +++ b/codec2.spec @@ -48,18 +48,14 @@ Example code for Codec 2 %build -mkdir build_linux && pushd build_linux %cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DLPCNET=ON \ - ../ + -DLPCNET=ON -make %{?_smp_mflags} +%cmake_build %install -pushd build_linux -%make_install -popd +%cmake_install # Create and install pkgconfig file mkdir -p %{buildroot}%{_libdir}/pkgconfig From 9907798f285d02e765c1225fda664cf2077a5661 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Sun, 20 Dec 2020 10:13:33 -0600 Subject: [PATCH 36/53] Rebuild for updated lpcnetfreedv. --- codec2.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/codec2.spec b/codec2.spec index 64b7aeb..a17976b 100644 --- a/codec2.spec +++ b/codec2.spec @@ -1,8 +1,9 @@ +%undefine __cmake_in_source_build %{?rhel: %global cmake %cmake3} Name: codec2 Version: 0.9.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Next-Generation Digital Voice for Two-Way Radio License: LGPLv2 @@ -90,6 +91,9 @@ EOF %changelog +* Sun Dec 20 2020 Richard Shaw - 0.9.2-5 +- Rebuild for updated lpcnetfreedv. + * Sat Aug 01 2020 Fedora Release Engineering - 0.9.2-4 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 3f2d8d9440e6ead4cfb1a26f6215a860e4d6d46e Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Sun, 20 Dec 2020 10:50:24 -0600 Subject: [PATCH 37/53] Re-bootstrap build. --- codec2.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/codec2.spec b/codec2.spec index a17976b..1d095aa 100644 --- a/codec2.spec +++ b/codec2.spec @@ -13,7 +13,7 @@ Source0: https://github.com/drowe67/codec2/archive/v%{version}/%{name}-%{ BuildRequires: gcc BuildRequires: cmake%{?rhel:3} BuildRequires: libsamplerate-devel -BuildRequires: lpcnetfreedv-devel +#BuildRequires: lpcnetfreedv-devel BuildRequires: speex-devel %if ! 0%{?rhel} < 8 BuildRequires: speexdsp-devel @@ -50,7 +50,7 @@ Example code for Codec 2 %build %cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DLPCNET=ON + -DLPCNET=OFF %cmake_build From 4cb73749a551f67e7736a0afcbd2095ec5f0ad74 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Sun, 20 Dec 2020 12:20:07 -0600 Subject: [PATCH 38/53] Re-enable normal build after bootstrapping lpcnetfreedv. --- codec2.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/codec2.spec b/codec2.spec index 1d095aa..2c99ada 100644 --- a/codec2.spec +++ b/codec2.spec @@ -3,7 +3,7 @@ Name: codec2 Version: 0.9.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Next-Generation Digital Voice for Two-Way Radio License: LGPLv2 @@ -13,7 +13,7 @@ Source0: https://github.com/drowe67/codec2/archive/v%{version}/%{name}-%{ BuildRequires: gcc BuildRequires: cmake%{?rhel:3} BuildRequires: libsamplerate-devel -#BuildRequires: lpcnetfreedv-devel +BuildRequires: lpcnetfreedv-devel BuildRequires: speex-devel %if ! 0%{?rhel} < 8 BuildRequires: speexdsp-devel @@ -50,7 +50,7 @@ Example code for Codec 2 %build %cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DLPCNET=OFF + -DLPCNET=ON %cmake_build @@ -91,6 +91,9 @@ EOF %changelog +* Sun Dec 20 2020 Richard Shaw - 0.9.2-6 +- Re-enable normal build after bootstrapping lpcnetfreedv. + * Sun Dec 20 2020 Richard Shaw - 0.9.2-5 - Rebuild for updated lpcnetfreedv. From 41b3d2dc837f7c5311a3c4d5b1ced2e15afb9f6b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 02:15:16 +0000 Subject: [PATCH 39/53] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- codec2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/codec2.spec b/codec2.spec index 2c99ada..414f4c2 100644 --- a/codec2.spec +++ b/codec2.spec @@ -3,7 +3,7 @@ Name: codec2 Version: 0.9.2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Next-Generation Digital Voice for Two-Way Radio License: LGPLv2 @@ -91,6 +91,9 @@ EOF %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 0.9.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Sun Dec 20 2020 Richard Shaw - 0.9.2-6 - Re-enable normal build after bootstrapping lpcnetfreedv. From b172c10dd4d929e167f585a756c4a1fabf2678a2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 19:44:49 +0000 Subject: [PATCH 41/53] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- codec2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/codec2.spec b/codec2.spec index 414f4c2..063024f 100644 --- a/codec2.spec +++ b/codec2.spec @@ -3,7 +3,7 @@ Name: codec2 Version: 0.9.2 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Next-Generation Digital Voice for Two-Way Radio License: LGPLv2 @@ -91,6 +91,9 @@ EOF %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 0.9.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 0.9.2-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 0e3b835a186b8d06714b6562ada4682832d62bf7 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Sun, 8 Aug 2021 08:16:33 -0500 Subject: [PATCH 42/53] Update to 1.0.0. --- codec2.spec | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/codec2.spec b/codec2.spec index 063024f..06aeab1 100644 --- a/codec2.spec +++ b/codec2.spec @@ -2,16 +2,16 @@ %{?rhel: %global cmake %cmake3} Name: codec2 -Version: 0.9.2 -Release: 8%{?dist} +Version: 1.0.0 +Release: 1%{?dist} Summary: Next-Generation Digital Voice for Two-Way Radio License: LGPLv2 URL: http://rowetel.com/codec2.html Source0: https://github.com/drowe67/codec2/archive/v%{version}/%{name}-%{version}.tar.gz -BuildRequires: gcc BuildRequires: cmake%{?rhel:3} +BuildRequires: gcc BuildRequires: libsamplerate-devel BuildRequires: lpcnetfreedv-devel BuildRequires: speex-devel @@ -68,7 +68,7 @@ libdir=\${exec_prefix}/%{_lib} Name: codec2 Description: Next-Generation Digital Voice for Two-Way Radio -Version: 0.9.2 +Version: 1.0.0 Cflags: -I\${includedir} Libs: -L\${libdir} -l%{name} EOF @@ -83,7 +83,6 @@ EOF %{_libdir}/*.so.* %files devel -%{_bindir}/* %{_includedir}/%{name}/ %{_libdir}/*.so %{_libdir}/pkgconfig/%{name}.pc @@ -91,6 +90,9 @@ EOF %changelog +* Sun Aug 08 2021 Richard Shaw - 1.0.0-1 +- Update to 1.0.0. + * Wed Jul 21 2021 Fedora Release Engineering - 0.9.2-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From e3234f6200430fefc0b9649771d05015b64286b8 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Sun, 8 Aug 2021 08:23:11 -0500 Subject: [PATCH 43/53] Upload source. --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 3c6e67b..d9191b8 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /codec2-0.8.tar.xz /codec2-0.8.1.tar.xz /codec2-0.9.2.tar.gz +/codec2-1.0.0.tar.gz diff --git a/sources b/sources index f846f7b..578da63 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (codec2-0.9.2.tar.gz) = 30a2eb95f7b0f47f0c0c7f08c9118f089acc32adf8b27f5b4354c89139efe80607d6d0ca5e0a9eefddf3640f02c483b9c804ad52c5dec6295968b7267f3a716c +SHA512 (codec2-1.0.0.tar.gz) = bba8ccf915600b093252c85059c5472804e843f5a4e331cc6e01f31b4131d84362d8385d0a1d8703be36064ca498e58181c2b7fdedb76d0be58bf6f13ec929b3 From 69a5807f7c211a381b63d2896f3b976a40610d95 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Mon, 9 Aug 2021 07:29:49 -0500 Subject: [PATCH 44/53] Rebuild codec2 without lpcnetfreedv to break circular depdendency. --- codec2.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/codec2.spec b/codec2.spec index 06aeab1..ec6cddf 100644 --- a/codec2.spec +++ b/codec2.spec @@ -3,7 +3,7 @@ Name: codec2 Version: 1.0.0 -Release: 1%{?dist} +Release: 1%{?dist}.1 Summary: Next-Generation Digital Voice for Two-Way Radio License: LGPLv2 @@ -50,7 +50,7 @@ Example code for Codec 2 %build %cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DLPCNET=ON + -DLPCNET=OFF %cmake_build @@ -90,6 +90,9 @@ EOF %changelog +* Mon Aug 09 2021 Richard Shaw - 1.0.0-1.1 +- Rebuild codec2 without lpcnetfreedv to break circular depdendency. + * Sun Aug 08 2021 Richard Shaw - 1.0.0-1 - Update to 1.0.0. From f1b2cc9c5c5468b5bb62f671dd0f4529e01c13b0 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Mon, 9 Aug 2021 07:50:41 -0500 Subject: [PATCH 45/53] Temporarily remove lpcnetfreedv from BR. --- codec2.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/codec2.spec b/codec2.spec index ec6cddf..89f242b 100644 --- a/codec2.spec +++ b/codec2.spec @@ -13,7 +13,7 @@ Source0: https://github.com/drowe67/codec2/archive/v%{version}/%{name}-%{ BuildRequires: cmake%{?rhel:3} BuildRequires: gcc BuildRequires: libsamplerate-devel -BuildRequires: lpcnetfreedv-devel +#BuildRequires: lpcnetfreedv-devel BuildRequires: speex-devel %if ! 0%{?rhel} < 8 BuildRequires: speexdsp-devel From 7399b0a3d096f6a7a4c63857b5f7e713538f5648 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Mon, 9 Aug 2021 11:07:54 -0500 Subject: [PATCH 46/53] Rebuild codec2 with lpcnetfreedv post bootstrap. --- codec2.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/codec2.spec b/codec2.spec index 89f242b..71ff453 100644 --- a/codec2.spec +++ b/codec2.spec @@ -3,7 +3,7 @@ Name: codec2 Version: 1.0.0 -Release: 1%{?dist}.1 +Release: 1%{?dist}.2 Summary: Next-Generation Digital Voice for Two-Way Radio License: LGPLv2 @@ -13,7 +13,7 @@ Source0: https://github.com/drowe67/codec2/archive/v%{version}/%{name}-%{ BuildRequires: cmake%{?rhel:3} BuildRequires: gcc BuildRequires: libsamplerate-devel -#BuildRequires: lpcnetfreedv-devel +BuildRequires: lpcnetfreedv-devel BuildRequires: speex-devel %if ! 0%{?rhel} < 8 BuildRequires: speexdsp-devel @@ -50,7 +50,7 @@ Example code for Codec 2 %build %cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DLPCNET=OFF + -DLPCNET=ON %cmake_build @@ -90,6 +90,9 @@ EOF %changelog +* Mon Aug 09 2021 Richard Shaw - 1.0.0-1.2 +- Rebuild codec2 with lpcnetfreedv post bootstrap. + * Mon Aug 09 2021 Richard Shaw - 1.0.0-1.1 - Rebuild codec2 without lpcnetfreedv to break circular depdendency. From 3a6ff6426a79fd0ebea960c4dc65246f4170b764 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Sun, 5 Dec 2021 07:40:53 -0600 Subject: [PATCH 47/53] Update to 1.0.1. --- .gitignore | 1 + codec2.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index d9191b8..2ca3f0a 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /codec2-0.8.1.tar.xz /codec2-0.9.2.tar.gz /codec2-1.0.0.tar.gz +/codec2-1.0.1.tar.gz diff --git a/codec2.spec b/codec2.spec index 71ff453..e87bdec 100644 --- a/codec2.spec +++ b/codec2.spec @@ -2,8 +2,8 @@ %{?rhel: %global cmake %cmake3} Name: codec2 -Version: 1.0.0 -Release: 1%{?dist}.2 +Version: 1.0.1 +Release: 1%{?dist} Summary: Next-Generation Digital Voice for Two-Way Radio License: LGPLv2 @@ -68,7 +68,7 @@ libdir=\${exec_prefix}/%{_lib} Name: codec2 Description: Next-Generation Digital Voice for Two-Way Radio -Version: 1.0.0 +Version: 1.0.1 Cflags: -I\${includedir} Libs: -L\${libdir} -l%{name} EOF @@ -90,6 +90,9 @@ EOF %changelog +* Sun Dec 05 2021 Richard Shaw - 1.0.1-1 +- Update to 1.0.1. + * Mon Aug 09 2021 Richard Shaw - 1.0.0-1.2 - Rebuild codec2 with lpcnetfreedv post bootstrap. diff --git a/sources b/sources index 578da63..dce4c0b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (codec2-1.0.0.tar.gz) = bba8ccf915600b093252c85059c5472804e843f5a4e331cc6e01f31b4131d84362d8385d0a1d8703be36064ca498e58181c2b7fdedb76d0be58bf6f13ec929b3 +SHA512 (codec2-1.0.1.tar.gz) = e32b6ebb5480b4a6ae15e835abc0da4fac7fb46a2b14bcc2a3c52df2da6c8d3f5acbcf83d8039f1ee402b4d2e1e7445841e3c9c415bfb70af3a251e74ab3f3b6 From 7be079114f27bfe862f69770b1b64603fefd252e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 23:31:31 +0000 Subject: [PATCH 48/53] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- codec2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/codec2.spec b/codec2.spec index e87bdec..d5e00de 100644 --- a/codec2.spec +++ b/codec2.spec @@ -3,7 +3,7 @@ Name: codec2 Version: 1.0.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Next-Generation Digital Voice for Two-Way Radio License: LGPLv2 @@ -90,6 +90,9 @@ EOF %changelog +* Wed Jan 19 2022 Fedora Release Engineering - 1.0.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Sun Dec 05 2021 Richard Shaw - 1.0.1-1 - Update to 1.0.1. From 92daf9d0efd3e9a936a356457a3c58afc6eb0be3 Mon Sep 17 00:00:00 2001 From: Richard Shaw Date: Thu, 3 Mar 2022 12:24:52 -0600 Subject: [PATCH 49/53] Update to 1.0.3. --- .gitignore | 1 + codec2.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 2ca3f0a..94945b7 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /codec2-0.9.2.tar.gz /codec2-1.0.0.tar.gz /codec2-1.0.1.tar.gz +/codec2-1.0.3.tar.gz diff --git a/codec2.spec b/codec2.spec index d5e00de..f976512 100644 --- a/codec2.spec +++ b/codec2.spec @@ -2,8 +2,8 @@ %{?rhel: %global cmake %cmake3} Name: codec2 -Version: 1.0.1 -Release: 2%{?dist} +Version: 1.0.3 +Release: 1%{?dist} Summary: Next-Generation Digital Voice for Two-Way Radio License: LGPLv2 @@ -11,7 +11,7 @@ URL: http://rowetel.com/codec2.html Source0: https://github.com/drowe67/codec2/archive/v%{version}/%{name}-%{version}.tar.gz BuildRequires: cmake%{?rhel:3} -BuildRequires: gcc +BuildRequires: gcc gcc-c++ BuildRequires: libsamplerate-devel BuildRequires: lpcnetfreedv-devel BuildRequires: speex-devel @@ -68,7 +68,7 @@ libdir=\${exec_prefix}/%{_lib} Name: codec2 Description: Next-Generation Digital Voice for Two-Way Radio -Version: 1.0.1 +Version: 1.0.3 Cflags: -I\${includedir} Libs: -L\${libdir} -l%{name} EOF @@ -90,6 +90,9 @@ EOF %changelog +* Thu Mar 03 2022 Richard Shaw - 1.0.3-1 +- Update to 1.0.3. + * Wed Jan 19 2022 Fedora Release Engineering - 1.0.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index dce4c0b..5d5f6fb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (codec2-1.0.1.tar.gz) = e32b6ebb5480b4a6ae15e835abc0da4fac7fb46a2b14bcc2a3c52df2da6c8d3f5acbcf83d8039f1ee402b4d2e1e7445841e3c9c415bfb70af3a251e74ab3f3b6 +SHA512 (codec2-1.0.3.tar.gz) = 634f07db5ada5026483b7c3c17702e93a50cb424bbee5e3c8f77c586a74b6db493d79b9686ada74a0d9dd3c7922394e14daf347d3f9e9cc951b93ccff0b0e4c5 From 20647a929a4e6a50fee6aceb152bda40da57ed89 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Mon, 14 Mar 2022 22:22:52 +0100 Subject: [PATCH 50/53] Bootstrap may be needed to break circular dependencies between codec2 and lpcnetfreedv --- codec2.spec | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/codec2.spec b/codec2.spec index f976512..0f0bbc5 100644 --- a/codec2.spec +++ b/codec2.spec @@ -1,6 +1,10 @@ %undefine __cmake_in_source_build %{?rhel: %global cmake %cmake3} +# Bootstrap may be needed to break circular dependencies between +# codec2 and lpcnetfreedv +%bcond_with bootstrap + Name: codec2 Version: 1.0.3 Release: 1%{?dist} @@ -13,7 +17,9 @@ Source0: https://github.com/drowe67/codec2/archive/v%{version}/%{name}-%{ BuildRequires: cmake%{?rhel:3} BuildRequires: gcc gcc-c++ BuildRequires: libsamplerate-devel +%if %{without bootstrap} BuildRequires: lpcnetfreedv-devel +%endif BuildRequires: speex-devel %if ! 0%{?rhel} < 8 BuildRequires: speexdsp-devel @@ -50,7 +56,9 @@ Example code for Codec 2 %build %cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \ +%if %{without bootstrap} -DLPCNET=ON +%endif %cmake_build From bd6dcfea7bfdfa12189c794dc7d9e9186d59a614 Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Mon, 14 Mar 2022 22:30:43 +0100 Subject: [PATCH 51/53] Enable bootstrap as lpcnetfreedv is not (yet) in EPEL 9 --- codec2.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/codec2.spec b/codec2.spec index 0f0bbc5..7c1d1f1 100644 --- a/codec2.spec +++ b/codec2.spec @@ -3,11 +3,11 @@ # Bootstrap may be needed to break circular dependencies between # codec2 and lpcnetfreedv -%bcond_with bootstrap +%bcond_without bootstrap Name: codec2 Version: 1.0.3 -Release: 1%{?dist} +Release: 0%{?dist} Summary: Next-Generation Digital Voice for Two-Way Radio License: LGPLv2 From 80dd9686a4bf4677533368ffb523a8e03bc108cf Mon Sep 17 00:00:00 2001 From: Robert Scheck Date: Mon, 14 Mar 2022 23:05:30 +0100 Subject: [PATCH 52/53] Disable bootstrap --- codec2.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/codec2.spec b/codec2.spec index 7c1d1f1..0f0bbc5 100644 --- a/codec2.spec +++ b/codec2.spec @@ -3,11 +3,11 @@ # Bootstrap may be needed to break circular dependencies between # codec2 and lpcnetfreedv -%bcond_without bootstrap +%bcond_with bootstrap Name: codec2 Version: 1.0.3 -Release: 0%{?dist} +Release: 1%{?dist} Summary: Next-Generation Digital Voice for Two-Way Radio License: LGPLv2 From ac205a45bbaf7d9840c1ee973975c99ca269f7f3 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Mon, 30 Oct 2023 20:07:07 +0300 Subject: [PATCH 53/53] Remove unnecessary files --- sources | 1 - 1 file changed, 1 deletion(-) delete mode 100644 sources diff --git a/sources b/sources deleted file mode 100644 index 5d5f6fb..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (codec2-1.0.3.tar.gz) = 634f07db5ada5026483b7c3c17702e93a50cb424bbee5e3c8f77c586a74b6db493d79b9686ada74a0d9dd3c7922394e14daf347d3f9e9cc951b93ccff0b0e4c5