Accepting request 151520 from GNOME:Factory
Revert to gupnp-dlna-1.0: -1.1 pulls in GStreamer 1.0 and rygel explicitly requires GStreamer 0.10 for now.. thus resulting in two GStreamer versions in process => crash. bnc#802296 OBS-URL: https://build.opensuse.org/request/show/151520 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rygel?expand=0&rev=35
This commit is contained in:
commit
f075e0f381
@ -1,3 +1,13 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Feb 6 18:15:04 UTC 2013 - dimstar@opensuse.org
|
||||
|
||||
- Revert to usage of gupnp-dlna-1.0 in order to avoid GStreamer
|
||||
being linked in two versions (bnc#802296):
|
||||
+ Replace pkgconfig(libgupnp-dlna-1.1) BuildRequires with
|
||||
pkgconfig(gupnp-dlna-1.0).
|
||||
+ Stop replacing gupnp-dlna-1.0 in configure* with
|
||||
gupnp-dlna-1.1, reverting to original rygel upstream use.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jan 4 09:10:53 UTC 2013 - dimstar@opensuse.org
|
||||
|
||||
|
@ -40,7 +40,7 @@ BuildRequires: pkgconfig(glib-2.0) >= 2.31.13
|
||||
BuildRequires: pkgconfig(gstreamer-0.10) >= 0.10.36
|
||||
BuildRequires: pkgconfig(gstreamer-pbutils-0.10) >= 0.10.35
|
||||
BuildRequires: pkgconfig(gtk+-3.0)
|
||||
BuildRequires: pkgconfig(gupnp-dlna-1.1) >= 0.5.0
|
||||
BuildRequires: pkgconfig(gupnp-dlna-1.0) >= 0.5.0
|
||||
BuildRequires: pkgconfig(tracker-sparql-0.14) >= 0.14.0
|
||||
Requires: gstreamer-0_10-plugins-base
|
||||
Recommends: %{name}-lang
|
||||
@ -147,11 +147,6 @@ station.
|
||||
%prep
|
||||
%setup -q
|
||||
translation-update-upstream
|
||||
if grep "gupnp-dlna-1.1" configure.ac; then
|
||||
echo "rygel was correctly updated to require gupnp-dlna-1.1... remove this tweak."
|
||||
else
|
||||
sed -i "s:gupnp-dlna-1.0:gupnp-dlna-1.1:g" configure*
|
||||
fi
|
||||
|
||||
%build
|
||||
%configure --enable-tracker-plugin \
|
||||
|
Loading…
Reference in New Issue
Block a user