Accepting request 289355 from multimedia:libs

Submit changes to Factory; it will actually nicely help to get :D in green stage

OBS-URL: https://build.opensuse.org/request/show/289355
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/speexdsp?expand=0&rev=2

speexdsp.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+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
+
 -------------------------------------------------------------------
 Mon Feb 23 14:47:33 UTC 2015 - mpluskal@suse.com
 

speexdsp.spec

@@ -17,6 +17,7 @@
 
 
 %define package_version 1.2rc3
+%define libname libspeexdsp1
 Name:           speexdsp
 Version:        1.1.999_%{package_version}
 Release:        0
@@ -28,7 +29,7 @@ Source:         http://downloads.xiph.org/releases/speex/%{name}-%{package_versi
 Source2:        baselibs.conf
 BuildRequires:  pkg-config
 BuildRequires:  pkgconfig(ogg)
-Conflicts:	speex <= 1.1.999_1.2rc1
+Conflicts:      speex <= 1.1.999_1.2rc1
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -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,8 +51,8 @@ to the Vorbis codec.
 %package devel
 Summary:        Development package for SpeeX
 Group:          Development/Libraries/C and C++
-Requires:       libspeexdsp1 = %{version}
-Conflicts: speex-devel <= 1.1.999_1.2rc1
+Requires:       %{libname} = %{version}
+Conflicts:      speex-devel <= 1.1.999_1.2rc1
 
 %description devel
 This package contains the files needed to compile programs that use the
@@ -62,7 +63,7 @@ SpeeX library.
 
 %build
 %configure \
-	--disable-static 
+	--disable-static
 
 make %{?_smp_mflags}
 
@@ -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.*