- merged 1.0.28 from PLD master
authorMarcin Krol <hawk@tld-linux.org>
Mon, 22 Oct 2018 10:15:33 +0000 (10:15 +0000)
committerMarcin Krol <hawk@tld-linux.org>
Mon, 22 Oct 2018 10:15:33 +0000 (10:15 +0000)
libsndfile.spec
octave32.patch

index b594e5cfa3c39a94928ddedf38e98c8e80337776..853dcf405cf5dfe79ad5fb18ca9573e45218db6e 100644 (file)
 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:       8
+Version:       1.0.28
+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: 646b5f98ce89ac60cdb060fcd398247c
 Patch0:                octave32.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: libtool >= 2:2
 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
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define no_install_post_check_so 1
-
 %description
 Libsndfile is a C library for reading and writing files containing
 sampled sound (such as MS Windows WAV and the Apple/SGI AIFF format)
@@ -55,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
@@ -101,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
@@ -126,12 +124,14 @@ dźwiękowych.
 %{__autoconf}
 %{__automake}
 %configure \
-       %{!?with_static_libs:--disable-static} \
-       %{!?with_regtest:--disable-sqlite}
+       %{!?with_octave:--disable-octave} \
+       --disable-silent-rules \
+       %{!?with_regtest:--disable-sqlite} \
+       %{!?with_static_libs:--disable-static}
+
+%{__make}
 
-%{__make} \
-       V=1
-%{?with_tests: %{__make} test}
+%{?with_tests:%{__make} test}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -139,7 +139,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
index be42506f4b76e60f067aaebb466a72a18c5753b6..49e17a35102f88a9b3aacb1dd4aea4d40fd7c954 100644 (file)
@@ -1,11 +1,11 @@
---- 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.*)
++                      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}%'`