From 298ed945ba8e56aa42571605e6a00aa5b5adea0a54b0453c1f2514130c64c49d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Sat, 28 Feb 2015 09:54:59 +0000 Subject: [PATCH] - Define libname to have the declaration only on one line OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/speexdsp?expand=0&rev=3 --- speexdsp.changes | 3 ++- speexdsp.spec | 13 +++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/speexdsp.changes b/speexdsp.changes index a312451..5729c94 100644 --- a/speexdsp.changes +++ b/speexdsp.changes @@ -1,6 +1,7 @@ ------------------------------------------------------------------- -Sat Feb 28 09:51:56 UTC 2015 - tchvatal@suse.com +Sat Feb 28 09:54:22 UTC 2015 - tchvatal@suse.com +- Define libname to have the declaration only on one line - Align the Conflict lines ------------------------------------------------------------------- diff --git a/speexdsp.spec b/speexdsp.spec index cef14a3..ce2eccc 100644 --- a/speexdsp.spec +++ b/speexdsp.spec @@ -17,6 +17,7 @@ %define package_version 1.2rc3 +%define libname libspeexdsp1 Name: speexdsp Version: 1.1.999_%{package_version} Release: 0 @@ -37,11 +38,11 @@ Speex is a patent free audio codec designed especially for voice narrowband and wideband quality. This project aims to be complementary to the Vorbis codec. -%package -n libspeexdsp1 +%package -n %{libname} Summary: An Open Source, Patent Free Speech Codec Library Group: System/Libraries -%description -n libspeexdsp1 +%description -n %{libname} Speex is a patent free audio codec designed especially for voice (unlike Vorbis which targets general audio) signals and providing good narrowband and wideband quality. This project aims to be complementary @@ -50,7 +51,7 @@ to the Vorbis codec. %package devel Summary: Development package for SpeeX Group: Development/Libraries/C and C++ -Requires: libspeexdsp1 = %{version} +Requires: %{libname} = %{version} Conflicts: speex-devel <= 1.1.999_1.2rc1 %description devel @@ -72,11 +73,11 @@ make DESTDIR=%{buildroot} install %{?_smp_mflags} rm -f %{buildroot}%{_libdir}/*.a find %{buildroot} -type f -name "*.la" -delete -print -%post -n libspeexdsp1 -p /sbin/ldconfig +%post -n %{libname} -p /sbin/ldconfig -%postun -n libspeexdsp1 -p /sbin/ldconfig +%postun -n %{libname} -p /sbin/ldconfig -%files -n libspeexdsp1 +%files -n %{libname} %defattr(-,root,root) %{_libdir}/libspeexdsp.so.*