diff --git a/rygel.changes b/rygel.changes index aab034b..6d7e8d2 100644 --- a/rygel.changes +++ b/rygel.changes @@ -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 diff --git a/rygel.spec b/rygel.spec index c4e1b6c..800105c 100644 --- a/rygel.spec +++ b/rygel.spec @@ -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 \