From 40583d2f3ba6a92e008a97a5f028d0d08ad2076b12feac1879ebda3f7c0a3574 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 30 Apr 2014 18:14:20 +0000 Subject: [PATCH] Accepting request 231259 from home:olh:branches:multimedia:libs - BuildRequire libtag-devel instead of taglib-devel to work around a resolver bug. A package name from external project is prefered over a provide from the same project. This fixes dependency errors in packman 11.4 evergreen OBS-URL: https://build.opensuse.org/request/show/231259 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/vlc?expand=0&rev=72 --- vlc.changes | 7 +++++++ vlc.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/vlc.changes b/vlc.changes index 9ce77e0..eb5bcf6 100644 --- a/vlc.changes +++ b/vlc.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Apr 24 20:00:17 CEST 2014 - ohering@suse.de + +- BuildRequire libtag-devel instead of taglib-devel to work around + a resolver bug. A package name from external project is prefered + over a provide from the same project. + ------------------------------------------------------------------- Tue Apr 15 20:14:20 CEST 2014 - ohering@suse.de diff --git a/vlc.spec b/vlc.spec index da1b25c..c3e935c 100644 --- a/vlc.spec +++ b/vlc.spec @@ -86,6 +86,7 @@ BuildRequires: libsamplerate-devel BuildRequires: libshout-devel BuildRequires: libsmbclient-devel BuildRequires: libssh2-devel +BuildRequires: libtag-devel BuildRequires: libtheora-devel BuildRequires: libtool BuildRequires: libudev-devel @@ -111,7 +112,6 @@ BuildRequires: pulseaudio-devel BuildRequires: schroedinger-devel BuildRequires: slang-devel BuildRequires: speex-devel -BuildRequires: taglib-devel BuildRequires: update-desktop-files BuildRequires: vcdimager-devel BuildRequires: xosd-devel