diff --git a/.gitignore b/.gitignore index 40e8fb8..6f23c4a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /speexdsp-1.2rc2.tar.gz +/speexdsp-1.2rc2.20141214git.tar.gz diff --git a/sources b/sources index 290ccbf..f348f40 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3bb48eb1c0fe641d59f39b9f616f3031 speexdsp-1.2rc2.tar.gz +2b935b2b30dbc8d5066a3b11859cff9a speexdsp-1.2rc2.20141214git.tar.gz diff --git a/speexdsp.spec b/speexdsp.spec index 1ed89c3..92eec1a 100644 --- a/speexdsp.spec +++ b/speexdsp.spec @@ -1,15 +1,21 @@ +%global git_commit dc3f8cfcec95620e47361c9e1ff6dc189754a4a2 +%global git_shortcommit dc3f8cf +%global git_snapshot 20141214git + Name: speexdsp Version: 1.2 %global rc_ver rc2 -Release: 0.1.%{rc_ver}%{?dist} +Release: 0.2.%{rc_ver}.%{git_snapshot}%{?dist} Summary: A voice compression format (DSP) Group: System Environment/Libraries License: BSD URL: http://www.speex.org/ -Source0: http://downloads.xiph.org/releases/speex/%{name}-%{version}%{rc_ver}.tar.gz - -BuildRequires: speex-devel +#Source0: http://downloads.xiph.org/releases/speex/%{name}-%{version}%{rc_ver}.tar.gz +# curl -O "http://git.xiph.org/?p=speexdsp.git;a=snapshot;h=dc3f8cfcec95620e47361c9e1ff6dc189754a4a2;sf=tgz" +# mv \?p\=speexdsp.git\;a\=snapshot\;h\=dc3f8cfcec95620e47361c9e1ff6dc189754a4a2\;sf\=tgz speexdsp-1.2rc2.20141214git.tar.gz +Source0: speexdsp-1.2rc2.20141214git.tar.gz +BuildRequires: autoconf automake libtool # speexdsp was split from speex in 1.2rc2. As speexdsp does not depend on # speex, a versioned conflict is required. @@ -40,10 +46,11 @@ This is the DSP package, see the speex package for the codec part. %prep -%setup -q -n %{name}-%{version}%{rc_ver} +%setup -q -n %{name}-%{git_shortcommit} %build +./autogen.sh %configure --disable-static make %{?_smp_mflags} V=1 @@ -67,5 +74,8 @@ make DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" install %changelog +* Sun Dec 14 2014 David King - 1.2-0.2.rc2.20141214git +- Use a git snapshot, to ensure that speex_buffer.h is present + * Fri Dec 12 2014 David King - 1.2-0.1.rc2 - New package, split from speex (#1172829)