From fec0a7eb0f5917c01c9d42b8c337736f6060dfa8a38ae7738f65f7d9dab365d3 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Tue, 14 Mar 2017 20:59:49 +0000 Subject: [PATCH] - Cleanup spec file with spec-cleaner OBS-URL: https://build.opensuse.org/package/show/hardware:sdr/codec2?expand=0&rev=2 --- _service | 7 -- ...codec2-0.5.1.tar.xz => codec2-0.5.1.tar.xz | 0 codec2.changes | 5 ++ codec2.spec | 72 +++++++++++++------ 4 files changed, 55 insertions(+), 29 deletions(-) delete mode 100644 _service rename _service:download_url:codec2-0.5.1.tar.xz => codec2-0.5.1.tar.xz (100%) diff --git a/_service b/_service deleted file mode 100644 index 9a390a3..0000000 --- a/_service +++ /dev/null @@ -1,7 +0,0 @@ - - - files.freedv.org - http - /codec2/codec2-0.5.1.tar.xz - - \ No newline at end of file diff --git a/_service:download_url:codec2-0.5.1.tar.xz b/codec2-0.5.1.tar.xz similarity index 100% rename from _service:download_url:codec2-0.5.1.tar.xz rename to codec2-0.5.1.tar.xz diff --git a/codec2.changes b/codec2.changes index 7862140..690ccde 100644 --- a/codec2.changes +++ b/codec2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Mar 14 20:57:02 UTC 2017 - mpluskal@suse.com + +- Cleanup spec file with spec-cleaner + ------------------------------------------------------------------- Tue Jan 17 22:40:33 UTC 2017 - dl8fcl@darc.de diff --git a/codec2.spec b/codec2.spec index 789916b..c4a0a2b 100644 --- a/codec2.spec +++ b/codec2.spec @@ -1,9 +1,22 @@ # # spec file for package codec2 # +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. -%define version_underline 0_5 -%define version_short 0.5 +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + + +%define libname lib%{name}-0_5 Name: codec2 Version: 0.5.1 Release: 0 @@ -11,28 +24,29 @@ Summary: Low bit rate speech codec License: LGPL-2.1 Group: Productivity/Hamradio/Other Url: http://rowetel.com/codec2.html -Source: %{name}-%{version}%{?svnrev:.svn%{svnrev}}.tar.xz +Source: http://files.freedv.org/codec2/codec2-%{version}.tar.xz +Source1: %{name}-rpmlintrc BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: pkgconfig -BuildRequires: speex-devel -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: pkgconfig(speex) +BuildRequires: pkgconfig(speexdsp) %description Codec2 is an open source low bit rate speech codec designed for communications quality speech at 2400 bit/s and below. -%package -n libcodec2-%{version_underline} +%package -n %{libname} Summary: Low bit rate speech codec -%description -n libcodec2-%{version_underline} +%description -n %{libname} Codec2 is an open source low bit rate speech codec designed for communications quality speech at 2400 bit/s and below. %package devel Summary: Development library for codec2 Group: Development/Libraries/C and C++ -Requires: libcodec2-%{version_underline} = %{version}-%{release} +Requires: %{libname} = %{version} %description devel Codec2 is an open source low bit rate speech codec designed for communications @@ -40,20 +54,20 @@ quality speech at 2400 bit/s and below. %package examples Summary: Example code for Codec 2 -Requires: %{name}-devel = %{version}-%{release} +Requires: %{name}-devel = %{version} BuildArch: noarch %description examples Example code for Codec 2, including test voices and matlab/octave files. %prep -%setup -q -n %{name}-%{version}%{?svnrev:.svn%{svnrev}} - +%setup -q %build -%cmake -DINSTALL_EXAMPLES=TRUE \ - -DUNITTEST=TRUE \ - ../ +%cmake \ + -DINSTALL_EXAMPLES=TRUE \ + -DUNITTEST=TRUE \ + -Wno-dev make %{?_smp_mflags} @@ -68,25 +82,39 @@ exec_prefix=\${prefix} includedir=\${prefix}/include/%{name} libdir=\${exec_prefix}/%{_lib} -Name: codec2 +Name: codec2 +Version: %{version} Description: Next-Generation Digital Voice for Two-Way Radio -Version: %{version} Cflags: -I\${includedir} Libs: -L\${libdir} -l%{name} EOF -%post -n libcodec2-%{version_underline} -p /sbin/ldconfig -%postun -n libcodec2-%{version_underline} -p /sbin/ldconfig +%post -n %{libname} -p /sbin/ldconfig +%postun -n %{libname} -p /sbin/ldconfig -%files -n libcodec2-%{version_underline} +%files %defattr(-,root,root) -#doc AUTHORS ChangeLog COPYING NEWS %doc README README_fdmdv.txt -%{_libdir}/libcodec2.so.%{version_short} +%{_bindir}/c2dec +%{_bindir}/c2demo +%{_bindir}/c2enc +%{_bindir}/c2sim +%{_bindir}/fdmdv_demod +%{_bindir}/fdmdv_get_test_bits +%{_bindir}/fdmdv_interleave +%{_bindir}/fdmdv_mod +%{_bindir}/fdmdv_put_test_bits +%{_bindir}/fec_dec +%{_bindir}/fec_enc +%{_bindir}/fm_demod +%{_bindir}/insert_errors + +%files -n %{libname} +%defattr(-,root,root) +%{_libdir}/libcodec2.so.* %files devel %defattr(-, root, root) -%{_bindir}/* %{_includedir}/* %{_libdir}/libcodec2.so %{_libdir}/pkgconfig/%{name}.pc