Changeset 1807 for spec/trunk/SPECS/libsndfile.spec

Timestamp:

Apr 10, 2022, 8:26:25 PM (4 years ago)

Author:

tellie

Message:

spec: libsndfile: Release version 1.1.0-1.

File:

• spec/trunk/SPECS/libsndfile.spec (modified) (11 diffs)

spec/trunk/SPECS/libsndfile.spec

@@ -1 +1 @@
 Summary:        Library for reading and writing sound files
 Name:           libsndfile
-Version:        1.0.31
-Release:        2%{?dist}
+Version:        1.1.0
+Release:        1%{?dist}
 License:        LGPLv2+ and GPLv2+ and BSD
 URL:            http://libsndfile.github.io/libsndfile/
@@ -8 +8 @@
 Source0:        https://github.com/libsndfile/libsndfile/releases/download/%{version}/libsndfile-%{version}.tar.bz2
 %else
-%scm_source github http://github.com/TeLLie/%{name}-os2 %{version}-os2
-%endif
-
+%scm_source github https://github.com/TeLLie/libsndfile-os2 %{version}-os2
+%endif
 %if !0%{?os2_version}
 Patch0:         libsndfile-1.0.25-system-gsm.patch
 Patch1:         libsndfile-1.0.25-zerodivfix.patch
-%endif
-
-%if !0%{?os2_version}
+# from upstream, fix #1984320=CVE-2021-3246, for <= 1.0.31
+Patch2:         libsndfile-1.0.31-deb669ee.patch
+# from upstream, fix #2027692, for <= 1.0.31
+Patch3:         libsndfile-1.0.31-ced91d7b.patch
+%endif
 BuildRequires:  gcc-c++
+%if !0%{?os2_version}
 BuildRequires:  alsa-lib-devel
 %endif
@@ -31 +33 @@
 BuildRequires:  libtool
 BuildRequires:  make
-%if !0%{?os2_version}
 BuildRequires:  python3
-%endif
+BuildRequires:  opus-devel
+
 
 %description
@@ -64 +66 @@
 This package contains command line utilities for libsndfile.
 
-%debug
 
 %prep
 %if !0%{?os2_version}
 %setup -q
-%else
-%scm_setup
-%endif
-%if !0%{?os2_version}
 %patch0 -p1 -b .system-gsm
 rm -r src/GSM610
+%else
+%scm_setup
+%endif
 # TODO: check if this patch is still needed
+%if !0%{?os2_version}
 %patch1 -p1 -b .zerodivfix
+%patch2 -p1 -b .deb669ee
+%patch3 -p1 -b .ced91d7b
 %endif
 
@@ -82 +85 @@
 %if !0%{?os2_version}
 autoreconf -I M4 -fiv # for system-gsm patch
-%endif
-
-%if !0%{?os2_version}
 %configure \
         --disable-dependency-tracking \
@@ -101 +101 @@
       -DCMAKE_BUILD_TYPE=Release \
       -Wno-dev \
-      -DBUILD_TESTING=ON \
        ..
+%endif
 # Get rid of rpath
 %if !0%{?os2_version}
@@ -109 +109 @@
 %endif
 
+%if !0%{?os2_version}
+%make_build
+%else
 make %{?_smp_mflags}
 %endif
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT
+%make_install -C build
 rm -rf __docs
 mkdir __docs
@@ -120 +123 @@
 find %{buildroot} -type f -name "*.la" -delete
 
-
 # fix multilib issues
-%if !0%{?os2_version}
 mv %{buildroot}%{_includedir}/sndfile.h \
    %{buildroot}%{_includedir}/sndfile-%{__isa_bits}.h
@@ -135 +136 @@
 #else
 # error "unexpected value for __WORDSIZE macro"
+#endif
 EOF
-%endif
-
-%if !0%{?os2_version}
-%if 0%{?rhel} != 0
+
+%if 0%{?rhel} != 0 || !0%{?os2_version}
 rm -f %{buildroot}%{_bindir}/sndfile-jackplay
 %endif
-%endif
+
 
 %check
-LD_LIBRARY_PATH=$PWD/src/.libs make check
+%if 0%{?os2_version}
+LD_LIBRARY_PATH=$PWD/build
+%endif
+cd build
+make -k test
+
 
 %if !0%{?os2_version}
@@ -174 +179 @@
 %{_bindir}/sndfile-salvage
 %else
-%{_bindir}/*.exe
+%{_bindir}/sndfile-cmp.exe
+%{_bindir}/sndfile-concat.exe
+%{_bindir}/sndfile-convert.exe
+%{_bindir}/sndfile-deinterleave.exe
+%{_bindir}/sndfile-info.exe
+%{_bindir}/sndfile-interleave.exe
+%{_bindir}/sndfile-metadata-get.exe
+%{_bindir}/sndfile-metadata-set.exe
+%{_bindir}/sndfile-play.exe
+%{_bindir}/sndfile-salvage.exe
 %endif
 %{_mandir}/man1/sndfile-cmp.1*
@@ -197 +211 @@
 %{_libdir}/*.a
 %endif
+%dir %{_libdir}/cmake/SndFile
+%{_libdir}/cmake/SndFile/SndFileTargets-release.cmake
+%{_libdir}/cmake/SndFile/SndFileConfig.cmake
+%{_libdir}/cmake/SndFile/SndFileConfigVersion.cmake
+%{_libdir}/cmake/SndFile/SndFileTargets.cmake
 %{_libdir}/pkgconfig/sndfile.pc
 
 
 %changelog
+* Sun Apr 10 2022 Elbert Pol <elbert.pol@gmail.com> - 1.0.1-1
+- Updated to latest version
+
 * Sun Jan 31 2021 Elbert Pol <elbert.pol@gmail.com> - 1.0.21-2
 - Update the spec more to Fedora style