- versioned Obsoletes

[packages/sox.git] / sox.spec

diff --git a/sox.spec b/sox.spec
index 9ebed81beb7c36cf931f250df47b34f693159d5e..389c22441139d530093f633c4fdea671b3772872 100644 (file)
--- a/sox.spec
+++ b/sox.spec
@@ -1,10 +1,16 @@
 #
 # Conditional build:
 %bcond_without alsa            # ALSA support
-%bcond_without gomp            # OpenMP support
+%bcond_without openmp          # OpenMP support
 %bcond_without pulseaudio      # PulseAudio support
 %bcond_without amr             # AMR codecs (AMR-NB and AMR-WB) support
 #
+
+# Problems with -D_FORTIFY_SOURCE=2 param: sox fall into infinity loop
+# see also upstream commit:
+# https://sourceforge.net/p/sox/code/ci/256b7e37d14de2e5303a6f899be8cdffda8e1661/
+%undefine _fortify_cflags
+
 Summary:       A general purpose sound file conversion tool
 Summary(de.UTF-8):     Mehrzweck-Sounddatei-Konvertierungs-Tool
 Summary(es.UTF-8):     Herramienta para conversión de archivos de sonido
@@ -16,10 +22,10 @@ Summary(tr.UTF-8):  Genel amaçlı ses dosyası çevirme aracı
 Summary(uk.UTF-8):     Утиліта загального призначення для роботи із звуковими файлами
 Name:          sox
 Version:       14.4.2
-Release:       1
+Release:       5
 License:       GPL v2+ (sox), LGPL v2+ (libsox)
 Group:         Applications/Sound
-Source0:       http://downloads.sourceforge.net/sox/%{name}-%{version}.tar.bz2
+Source0:       https://downloads.sourceforge.net/sox/%{name}-%{version}.tar.bz2
 # Source0-md5: ba804bb1ce5c71dd484a102a5b27d0dd
 Patch0:                %{name}-system-lpc10.patch
 Patch1:                %{name}-dyn.patch
@@ -29,11 +35,11 @@ URL:                http://sox.sourceforge.net/
 BuildRequires: autoconf >= 2.62
 BuildRequires: automake
 BuildRequires: flac-devel >= 1.1.3
-%{?with_gomp:BuildRequires:    gcc >= 6:4.2}
+%{?with_openmp:BuildRequires:  gcc >= 6:4.2}
 BuildRequires: ladspa-devel
 BuildRequires: lame-libs-devel >= 3.98
 BuildRequires: libao-devel
-%{?with_gomp:BuildRequires:    libgomp-devel}
+%{?with_openmp:BuildRequires:  libgomp-devel}
 BuildRequires: libgsm-devel
 BuildRequires: libid3tag-devel
 BuildRequires: libltdl-devel
@@ -52,7 +58,7 @@ BuildRequires:        pkgconfig
 BuildRequires: twolame-devel
 BuildRequires: wavpack-devel
 Suggests:      ffmpeg
-Obsoletes:     sox-fmt-ffmpeg
+Obsoletes:     sox-fmt-ffmpeg < 14.4.2
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -188,7 +194,7 @@ bibliotekę opusfile.
 %{__autoheader}
 %{__automake}
 %configure \
-       %{!?with_gomp:--disable-gomp} \
+       %{!?with_openmp:--disable-gomp} \
        --disable-silent-rules \
        --with-distro='PLD Linux Distribution' \
        --with-dyn-default \