From 2688763addc3665e151eda0bb27ab0046c2af73fec1fc168b95f8a381aba4283 Mon Sep 17 00:00:00 2001 From: Manfred Tremmel Date: Thu, 23 Feb 2012 20:10:22 +0000 Subject: [PATCH] Accepting request 106677 from home:coolo:branches:openSUSE:Factory - buildrequire xorg-x11-devel to get all X11 libs (better safe than sorry) OBS-URL: https://build.opensuse.org/request/show/106677 OBS-URL: https://build.opensuse.org/package/show/multimedia:xine/xine-lib?expand=0&rev=53 --- xine-lib.changes | 6 ++++++ xine-lib.spec | 9 +++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/xine-lib.changes b/xine-lib.changes index ac6656c..386b0fb 100644 --- a/xine-lib.changes +++ b/xine-lib.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 23 12:51:27 UTC 2012 - coolo@suse.com + +- buildrequire xorg-x11-devel to get all X11 libs (better safe + than sorry) + ------------------------------------------------------------------- Mon Feb 13 10:57:56 UTC 2012 - coolo@suse.com diff --git a/xine-lib.spec b/xine-lib.spec index c55e40a..39efa79 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -68,6 +68,7 @@ BuildRequires: readline-devel BuildRequires: speex-devel BuildRequires: update-desktop-files BuildRequires: vcdimager-devel +BuildRequires: xorg-x11-devel %if 0%{suse_version} >= 1210 BuildRequires: libv4l-devel >= 0.8.4 %else @@ -272,7 +273,10 @@ Autoren: Summary: Development environment for xine-based media players License: GPL-2.0+ ; SUSE-Public-Domain Group: Development/Libraries/C and C++ -Requires: glibc-devel freetype2-devel zlib-devel libxine1 = %{version} +Requires: freetype2-devel +Requires: glibc-devel +Requires: libxine1 = %{version} +Requires: zlib-devel Obsoletes: libxine1-devel < %{version}-%{release} Provides: libxine1-devel = %{version}-%{release} Obsoletes: xine-devel < %{version}-%{release} @@ -593,7 +597,8 @@ Provides: libxine1-dvd = %{version}-%{release} Obsoletes: libxine1-dvd < %{version}-%{release} Provides: libxine1-dxr3 = %{version}-%{release} Obsoletes: libxine1-dxr3 < %{version}-%{release} -Provides: xine-lib:%{_libdir}/xine/plugins/1.0.0/xineplug_decode_mad.so xine-mad +Provides: xine-lib:%{_libdir}/xine/plugins/1.0.0/xineplug_decode_mad.so +Provides: xine-mad Obsoletes: xine-mad Provides: libxine1-dvd = %{version}-%{release} Obsoletes: libxine1-dvd < %{version}-%{release}