From f2149e54a066fbf4cdabd32b0c6f372eed6eddd5cbf3486f720549af9554441b Mon Sep 17 00:00:00 2001 From: Manfred Tremmel Date: Tue, 29 May 2012 21:17:06 +0000 Subject: [PATCH] Accepting request 122827 from home:RedDwarf:branches:multimedia:xine I see no reason to think libxine-devel requires libffmpeg-devel. If that would be the case the pkg-config file would say so (otherwise it's a bug to report upstream). And it doesn't let me compile opencv 2.3 against libffmpeg_oldabi-devel since it also depends on libxine-devel, and libffmpeg-devel and libffmpeg_oldabi-devel can't be installed at the same time. - Remove dependency from libxine-devel to libffmpeg-devel OBS-URL: https://build.opensuse.org/request/show/122827 OBS-URL: https://build.opensuse.org/package/show/multimedia:xine/xine-lib?expand=0&rev=57 --- xine-lib.changes | 5 +++++ xine-lib.spec | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/xine-lib.changes b/xine-lib.changes index 3c6cb24..05a1900 100644 --- a/xine-lib.changes +++ b/xine-lib.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 29 19:59:14 UTC 2012 - reddwarf@opensuse.org + +- Remove dependency from libxine-devel to libffmpeg-devel + ------------------------------------------------------------------- Sat Feb 04 19:40:00 UTC 2012 - Manfred.Tremmel@iiv.de diff --git a/xine-lib.spec b/xine-lib.spec index 3b51299..aa5f1f8 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -195,11 +195,6 @@ Requires: glibc-devel Requires: libv4l-devel Requires: libxine2 = %{version} Requires: zlib-devel -%if !%{with distributable} -Requires: libffmpeg-devel -%else -Requires: libavutil-devel -%endif Obsoletes: libxine2-devel < %{version}-%{release} Provides: libxine2-devel = %{version}-%{release} Obsoletes: xine-lib2-devel < %{version}-%{release}