From 31e38985bbadc8c997b735c278566322e60cf9f3e2d2d9ece08b33318f7494d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Mon, 29 Oct 2018 09:25:24 +0000 Subject: [PATCH] Accepting request 645194 from home:dimstar:Factory - Add pkgconfig(zlib) BuildRequires: until openssl 1.1.1, zlib was pulled in into our buildroot, avoiding srt having to care for it explicitly. Since this is changed now, we have to worry for our dependency on our own. The dep comes from: CMakeLists.txt:set (SSL_REQUIRED_MODULES "openssl libcrypto zlib") without this, we end up with a -devel package without the relevant pkgconfig(foo) buildrequires (as pkg-config can't parse a .pc file without the Requires: satisfied) This will solve the ffmpeg-4 failure curently seen in Staging:C (openssl 1.1.1 upgrade) OBS-URL: https://build.opensuse.org/request/show/645194 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/srt?expand=0&rev=11 --- srt.changes | 9 +++++++++ srt.spec | 9 ++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/srt.changes b/srt.changes index 5369528..8f073a4 100644 --- a/srt.changes +++ b/srt.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Oct 29 09:10:45 UTC 2018 - Dominique Leuenberger + +- Add pkgconfig(zlib) BuildRequires: until openssl 1.1.1, zlib was + pulled in into our buildroot, avoiding srt having to care for it + explicitly. Since this is changed now, we have to worry for our + dependency on our own. The dep comes from: + CMakeLists.txt:set (SSL_REQUIRED_MODULES "openssl libcrypto zlib") + ------------------------------------------------------------------- Wed Aug 8 16:56:55 UTC 2018 - jengelh@inai.de diff --git a/srt.spec b/srt.spec index 5db8718..99e9e82 100644 --- a/srt.spec +++ b/srt.spec @@ -12,12 +12,11 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # %define sover 1 - Name: srt Version: 1.3.1 Release: 0 @@ -29,13 +28,13 @@ Source0: https://github.com/Haivision/%{name}/archive/v%{version}.tar.gz# Source99: baselibs.conf # PATCH-FIX-UPSTREAM srt-no-rpath.patch -- Fix build, patch from archlinux Patch0: srt-no-rpath.patch - BuildRequires: cmake BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: tcl BuildRequires: pkgconfig(openssl) +BuildRequires: pkgconfig(zlib) %description SRT is a video transport protocol and technology stack @@ -53,8 +52,8 @@ Transport (SRT). %package devel Summary: Development files for the Secure Reliable Transport (SRT) library Group: Development/Libraries/C and C++ -Requires: %{name} == %{version} -Requires: libsrt%{sover} == %{version} +Requires: %{name} = %{version} +Requires: libsrt%{sover} = %{version} %description devel This package contains all necessary include files and libraries