diff --git a/speex.changes b/speex.changes index 2c75298..92c7d9c 100644 --- a/speex.changes +++ b/speex.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +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 8912ea0..0414c75 100644 --- a/speex.spec +++ b/speex.spec @@ -19,10 +19,9 @@ Name: speex -%define package_version 1.2rc1 -BuildRequires: libogg-devel pkgconfig Summary: An Open Source, Patent Free Speech Codec -Version: 1.1.999_%package_version +%define package_version 1.2rc1 +Version: 1.1.999_%{package_version} Release: 1 License: BSD3c Group: System/Libraries @@ -31,6 +30,7 @@ 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,19 +93,21 @@ 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 @@ -116,7 +118,7 @@ rm -f %{buildroot}%{_libdir}/*.a %postun -n libspeexdsp1 -p /sbin/ldconfig %clean -rm -rf $RPM_BUILD_ROOT +%{__rm} -rf %{buildroot} %files %defattr(-,root,root)