From 2a180730e47236f91497adcfb0d6749238558f7ebf2cbdd36b2aec41ebad37b4 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Fri, 27 Jul 2018 09:30:17 +0000
Subject: [PATCH] Accepting request 625731 from
 home:scarabeus_iv:branches:multimedia:libs

- Reduce the optional conditional for the SLE12 backports to
  cover everything, most of the packages in old codestreams were
  not really ready as they need additional baselibs/etc.
  * Since these are new features user will simply wait or use TW

OBS-URL: https://build.opensuse.org/request/show/625731
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-4?expand=0&rev=13
---
 ffmpeg-4.changes |  8 ++++++++
 ffmpeg-4.spec    | 29 ++++++++++++-----------------
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/ffmpeg-4.changes b/ffmpeg-4.changes
index 91900c1..25f745b 100644
--- a/ffmpeg-4.changes
+++ b/ffmpeg-4.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Jul 27 08:56:56 UTC 2018 - tchvatal@suse.com
+
+- Reduce the optional conditional for the SLE12 backports to
+  cover everything, most of the packages in old codestreams were
+  not really ready as they need additional baselibs/etc.
+  * Since these are new features user will simply wait or use TW
+
 -------------------------------------------------------------------
 Fri Jul 27 07:03:06 UTC 2018 - jengelh@inai.de
 
diff --git a/ffmpeg-4.spec b/ffmpeg-4.spec
index 7587ddf..30d9ff0 100644
--- a/ffmpeg-4.spec
+++ b/ffmpeg-4.spec
@@ -66,10 +66,22 @@
 %bcond_without mysofa
 %bcond_without vidstab
 %bcond_without srt
+%bcond_without codec2
+%bcond_without bs2b
+%bcond_without lv2
+%bcond_without rubberband
+%bcond_without soxr
+%bcond_without zmq
 %else
 %bcond_with mysofa
 %bcond_with vidstab
 %bcond_with srt
+%bcond_with codec2
+%bcond_with bs2b
+%bcond_with lv2
+%bcond_with rubberband
+%bcond_with soxr
+%bcond_with zmq
 %endif
 
 %if 0%{?suse_version} >= 1500
@@ -80,23 +92,6 @@
 %bcond_with openmpt
 %endif
 
-%if 0%{?suse_version} > 1500 || 0%{?is_opensuse}
-%bcond_without codec2
-%bcond_without bs2b
-%bcond_without lv2
-%bcond_without rubberband
-%bcond_without soxr
-%bcond_without zmq
-%else
-# backports SLE12
-%bcond_with codec2
-%bcond_with bs2b
-%bcond_with lv2
-%bcond_with rubberband
-%bcond_with soxr
-%bcond_with zmq
-%endif
-
 %define _name ffmpeg
 %define _major_version 4
 %define _major_expected 5