From b728d785f720160eb70ad08e57775ba17a0d75610dad56ac44704ef7c0dc4dde Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Wed, 24 Feb 2010 01:28:27 +0000 Subject: [PATCH] Accepting request 33297 from multimedia:libs checked in (request 33297) OBS-URL: https://build.opensuse.org/request/show/33297 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/speex?expand=0&rev=8 --- speex.changes | 11 ----------- speex.spec | 30 ++++++++++++++---------------- 2 files changed, 14 insertions(+), 27 deletions(-) diff --git a/speex.changes b/speex.changes index 92c7d9c..2c75298 100644 --- a/speex.changes +++ b/speex.changes @@ -1,14 +1,3 @@ -------------------------------------------------------------------- -Thu Jan 14 12:58:49 UTC 2010 - chris@computersalat.de - -- fix build for SLE_10 - autoreconf for suse_version >= 1100 -- spec - o sort TAGS - o macros - rm > {__rm} - version > {version} .... - ------------------------------------------------------------------- Thu Jan 7 18:59:26 UTC 2010 - lnussel@suse.de diff --git a/speex.spec b/speex.spec index 0414c75..8912ea0 100644 --- a/speex.spec +++ b/speex.spec @@ -19,9 +19,10 @@ Name: speex -Summary: An Open Source, Patent Free Speech Codec %define package_version 1.2rc1 -Version: 1.1.999_%{package_version} +BuildRequires: libogg-devel pkgconfig +Summary: An Open Source, Patent Free Speech Codec +Version: 1.1.999_%package_version Release: 1 License: BSD3c Group: System/Libraries @@ -30,7 +31,6 @@ Source: %{name}-%{package_version}.tar.bz2 Source2: baselibs.conf Patch1: speex-1.0.5-warning-fix.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: libogg-devel pkgconfig # bug437293 %ifarch ppc64 Obsoletes: speex-64bit @@ -47,8 +47,8 @@ to the Vorbis codec. Summary: An Open Source, Patent Free Speech Codec Library License: BSD3c Group: System/Libraries -Obsoletes: libspeex < %{version} -Provides: libspeex = %{version} +Obsoletes: libspeex < %version +Provides: libspeex = %version %description -n libspeex1 Speex is a patent free audio codec designed especially for voice @@ -72,10 +72,10 @@ to the Vorbis codec. Summary: Development package for SpeeX License: BSD3c Group: Development/Libraries/C and C++ -Provides: libspeex-devel = %{version}-%release -Obsoletes: libspeex-devel < %{version}-%release -Requires: libspeex1 = %{version} -Requires: libspeexdsp1 = %{version} +Provides: libspeex-devel = %version-%release +Obsoletes: libspeex-devel < %version-%release +Requires: libspeex1 = %version +Requires: libspeexdsp1 = %version Requires: glibc-devel Requires: libogg-devel # bug437293 @@ -93,21 +93,19 @@ SpeeX library. %patch1 %build -%if 0%{?suse_version} >= 1100 autoreconf -fi -%endif %configure \ --disable-static \ --with-ogg-libraries=%{_libdir} -%{__make} %{?jobs:-j%{jobs}} +make %{?jobs:-j%{jobs}} %install %makeinstall # remove duped documents -%{__rm} -rf %{buildroot}%{_datadir}/doc/speex* +rm -rf %{buildroot}%{_datadir}/doc/speex* # remove unneeded *.la files -%{__rm} -f %{buildroot}%{_libdir}/*.la -%{__rm} -f %{buildroot}%{_libdir}/*.a +rm -f %{buildroot}%{_libdir}/*.la +rm -f %{buildroot}%{_libdir}/*.a %post -n libspeex1 -p /sbin/ldconfig @@ -118,7 +116,7 @@ autoreconf -fi %postun -n libspeexdsp1 -p /sbin/ldconfig %clean -%{__rm} -rf %{buildroot} +rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root)