commit 1a20fc4f319d8c39281d2c4867c0893c614c5801
Author: Jakub Bogusz <[email protected]>
Date: Thu Nov 26 17:20:30 2015 +0100
- updated to 1.0.26 (fixes CVE-2014-9496 CVE-2014-9756 CVE-2015-7805)
- updated octave32 patch (now it adds octave 4 to supported versions)
- removed obsolete link patch
libsndfile-link.patch | 11 -----------
libsndfile.spec | 21 ++++++++++-----------
octave32.patch | 6 +++---
3 files changed, 13 insertions(+), 25 deletions(-)
---
diff --git a/libsndfile.spec b/libsndfile.spec
index a618652..84794bc 100644
--- a/libsndfile.spec
+++ b/libsndfile.spec
@@ -10,29 +10,28 @@
Summary: C library for reading and writing files containing sampled sound
Summary(pl.UTF-8): Biblioteka obsługi plików dźwiękowych
Name: libsndfile
-Version: 1.0.25
-Release: 11
+Version: 1.0.26
+Release: 1
License: LGPL v2.1+
Group: Libraries
Source0:
http://www.mega-nerd.com/libsndfile/files/%{name}-%{version}.tar.gz
-# Source0-md5: e2b7bb637e01022c7d20f95f9c3990a2
+# Source0-md5: ec810a0c60c08772a8a5552704b63393
Patch0: octave32.patch
-Patch1: %{name}-link.patch
URL: http://www.mega-nerd.com/libsndfile/
BuildRequires: alsa-lib-devel
BuildRequires: autoconf >= 2.57
BuildRequires: automake
-BuildRequires: flac-devel >= 1.2.1
+BuildRequires: flac-devel >= 1.3.1
BuildRequires: gcc-fortran
BuildRequires: libogg-devel >= 2:1.1.3
%{?with_tests:BuildRequires: libstdc++-devel}
BuildRequires: libtool
BuildRequires: libvorbis-devel >= 1:1.2.3
-%{?with_octave:BuildRequires: octave-devel}
+%{?with_octave:BuildRequires: octave-devel >= 2:3}
BuildRequires: pkgconfig
BuildRequires: sed >= 4.0
%{?with_regtest:BuildRequires: sqlite3-devel >= 3.2}
-Requires: flac >= 1.2.1
+Requires: flac >= 1.3.1
Requires: libogg >= 2:1.1.3
Requires: libvorbis >= 1:1.2.3
Obsoletes: libsndfile1
@@ -54,7 +53,7 @@ Summary: libsndfile header files and development
documentation
Summary(pl.UTF-8): Pliki nagłówkowe oraz dokumentacja do libsndfile
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
-Requires: flac-devel >= 1.2.1
+Requires: flac-devel >= 1.3.1
Requires: libogg-devel >= 2:1.1.3
Requires: libvorbis-devel >= 1:1.2.3
Obsoletes: libsndfile1-devel
@@ -100,7 +99,7 @@ Summary: sndfile module for Octave
Summary(pl.UTF-8): Moduł sndfile dla Octave
Group: Applications/Math
Requires: %{name} = %{version}-%{release}
-Requires: octave
+Requires: octave >= 2:3
Obsoletes: libsndfile-octave
%description -n octave-sndfile
@@ -114,7 +113,6 @@ dźwiękowych.
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
%if %{without tests}
%{__sed} -i 's, tests$,,' Makefile.am
@@ -140,7 +138,8 @@ rm -rf $RPM_BUILD_ROOT
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/libsndfile1-dev
+# packaged as %doc
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/libsndfile
%clean
rm -rf $RPM_BUILD_ROOT
diff --git a/libsndfile-link.patch b/libsndfile-link.patch
deleted file mode 100644
index dea9bbb..0000000
--- a/libsndfile-link.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libsndfile-1.0.25/configure.ac.orig 2011-07-13 10:59:57.000000000
+0200
-+++ libsndfile-1.0.25/configure.ac 2015-03-06 17:18:22.620080669 +0100
-@@ -335,7 +335,7 @@
- enable_external_libs=yes
-
- EXTERNAL_CFLAGS="$FLAC_CFLAGS $OGG_CFLAGS $VORBISENC_CFLAGS
$SPEEX_CFLAGS"
-- EXTERNAL_LIBS="$FLAC_LIBS $VORBISENC_LIBS $SPEEX_LIBS"
-+ EXTERNAL_LIBS="$FLAC_LIBS $VORBISENC_LIBS $VORBIS_LIBS
$SPEEX_LIBS $OGG_LIBS"
- else
- echo
- AC_MSG_WARN([[*** One or more of the external libraries (ie
libflac, libogg and]])
diff --git a/octave32.patch b/octave32.patch
index 881bb8f..49e17a3 100644
--- a/octave32.patch
+++ b/octave32.patch
@@ -1,10 +1,10 @@
---- libsndfile-1.0.20/M4/octave.m4.orig 2009-10-25 15:51:00.461732576
+0100
-+++ libsndfile-1.0.20/M4/octave.m4 2009-10-25 15:51:32.459533439 +0100
+--- libsndfile-1.0.26/M4/octave.m4.orig 2015-11-25 21:57:25.675180371
+0100
++++ libsndfile-1.0.26/M4/octave.m4 2015-11-26 15:46:34.252488392 +0100
@@ -119,7 +119,7 @@
2.*)
AC_MSG_WARN([Octave version 2.X is not
supported.])
;;
-- 3.0.*)
+- 3.*)
+ 3.*|4.*)
OCTAVE_DEST_ODIR=`$OCTAVE_CONFIG --oct-site-dir
| sed 's%^/usr%${prefix}%'`
OCTAVE_DEST_MDIR=`$OCTAVE_CONFIG --m-site-dir |
sed 's%^/usr%${prefix}%'`
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libsndfile.git/commitdiff/1a20fc4f319d8c39281d2c4867c0893c614c5801
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
