[speex] Update to 1.2-0.1.rc2, split off speexdsp (#1172820)
David King
amigadave at fedoraproject.org
Fri Dec 12 15:42:49 UTC 2014
commit bb9d9c15131b736d470b5e8ce5e5b9bb3969ad4b
Author: David King <amigadave at amigadave.com>
Date: Fri Dec 12 15:18:22 2014 +0000
Update to 1.2-0.1.rc2, split off speexdsp (#1172820)
.gitignore | 1 +
sources | 2 +-
speex-aarch64.patch | 1679 ---------------------------------------------------
speex-ppc64le.patch | 13 -
speex.spec | 33 +-
5 files changed, 20 insertions(+), 1708 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 57cfccf..6834b8f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
speex-1.2rc1.tar.gz
+/speex-1.2rc2.tar.gz
diff --git a/sources b/sources
index 8bd92a8..64ff66d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c4438b22c08e5811ff10e2b06ee9b9ae speex-1.2rc1.tar.gz
+6ae7db3bab01e1d4b86bacfa8ca33e81 speex-1.2rc2.tar.gz
diff --git a/speex.spec b/speex.spec
index e62cc2f..e03b06c 100644
--- a/speex.spec
+++ b/speex.spec
@@ -1,17 +1,20 @@
+# speex optionally requires speexdsp, but speexdsp requires the speex headers.
+# Disable speexdsp support if bootstrapping.
+%bcond_without speexdsp
+
Summary: A voice compression format (codec)
Name: speex
Version: 1.2
-%define rc_ver rc1
-Release: 0.21.%{rc_ver}%{?dist}
+%global rc_ver rc2
+Release: 0.1.%{rc_ver}%{?dist}
License: BSD
Group: System Environment/Libraries
URL: http://www.speex.org/
Source0: http://downloads.xiph.org/releases/speex/%{name}-%{version}%{rc_ver}.tar.gz
-BuildRequires: libogg-devel
-# update config.guess and config.sub for aarch64
-Patch1: speex-aarch64.patch
-# update config.sub for ppc64le
-Patch2: speex-ppc64le.patch
+BuildRequires: pkgconfig(ogg)
+%if %{with speexdsp}
+BuildRequires: pkgconfig(speexdsp)
+%endif
%description
Speex is a patent-free compression format designed especially for
@@ -24,7 +27,6 @@ data (e.g. voice mail).
Summary: Development package for %{name}
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: pkgconfig
%description devel
Speex is a patent-free compression format designed especially for
@@ -41,11 +43,9 @@ speech. This package contains tools files and user's manual for %{name}.
%prep
%setup -q -n %{name}-%{version}%{rc_ver}
-%patch1 -p1 -b .aarch64
-%patch2 -p1 -b .ppc64le
%build
-%configure --disable-static
+%configure --disable-static --enable-binaries
# Remove rpath from speexenc and speexdec
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
@@ -60,15 +60,15 @@ rm -f $RPM_BUILD_ROOT%{_docdir}/speex/manual.pdf
%files
%doc AUTHORS COPYING TODO ChangeLog README NEWS
-%{_libdir}/libspeex*.so.*
+%{_libdir}/libspeex.so.*
%files devel
%doc doc/manual.pdf
%{_includedir}/speex
%{_datadir}/aclocal/speex.m4
-%{_libdir}/pkgconfig/speex*.pc
-%{_libdir}/libspeex*.so
-%exclude %{_libdir}/libspeex*.la
+%{_libdir}/pkgconfig/speex.pc
+%{_libdir}/libspeex.so
+%exclude %{_libdir}/libspeex.la
%files tools
%{_bindir}/speexenc
@@ -77,6 +77,9 @@ rm -f $RPM_BUILD_ROOT%{_docdir}/speex/manual.pdf
%{_mandir}/man1/speexdec.1*
%changelog
+* Fri Dec 12 2014 David King <amigadave at amigadave.com> - 1.2-0.1.rc2
+- Update to 1.2-0.1.rc2, split off speexdsp to separate package (#1172820)
+
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2-0.21.rc1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
More information about the scm-commits
mailing list