Accepting request 425333 from GNOME:Next

Supersede with spellfix

OBS-URL: https://build.opensuse.org/request/show/425333
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/rygel?expand=0&rev=146

rygel.spec

@@ -17,23 +17,25 @@
 
 
 Name:           rygel
-Version:        0.30.3
+Version:        0.31.5
 Release:        0
 Summary:        Home Media Solution for GNOME based on UPnP/DLNA
 License:        LGPL-2.0+
 Group:          Productivity/Multimedia/Other
 Url:            http://live.gnome.org/Rygel
-Source0:        http://download.gnome.org/sources/rygel/0.30/%{name}-%{version}.tar.xz
+Source0:        http://download.gnome.org/sources/rygel/0.31/%{name}-%{version}.tar.xz
 BuildRequires:  gobject-introspection-devel >= 1.33.4
 BuildRequires:  libgupnp-av-devel >= 0.12.8
 BuildRequires:  libgupnp-devel >= 0.20.14
 BuildRequires:  libsoup-devel >= 2.44.0
 BuildRequires:  libunistring-devel
 BuildRequires:  sqlite3-devel >= 3.5
+BuildRequires:  suse-xsl-stylesheets
 BuildRequires:  systemd
 BuildRequires:  translation-update-upstream
 BuildRequires:  update-desktop-files
 BuildRequires:  vala >= 0.24.0
+BuildRequires:  pkgconfig(gdk-pixbuf-2.0)
 BuildRequires:  pkgconfig(gee-0.8) >= 0.8.0
 BuildRequires:  pkgconfig(glib-2.0) >= 2.40.0
 BuildRequires:  pkgconfig(gstreamer-1.0) >= 1.0
@@ -53,6 +55,8 @@ Recommends:     %{name}-lang
 Recommends:     gstreamer-plugins-bad
 Recommends:     gstreamer-plugins-good
 Recommends:     gstreamer-plugins-ugly
+# plugin-zdf-mediathek was removed in 0.31.1
+Obsoletes:      plugin-zdf-mediathek
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %{?systemd_requires}
 
@@ -204,19 +208,6 @@ video and pictures, and control of media player on your home network.
 This package provides a plugin using tracker to export media found on
 the local machine.
 
-%package plugin-zdf-mediathek
-Summary:        Home Media Solution for GNOME based on UPnP/DLNA -- ZDF Mediathek Plugin
-Group:          Productivity/Multimedia/Other
-Requires:       %{name} = %{version}
-# Make it installable by default for german-speaking users
-Provides:       locale(%{name}:de)
-
-%description plugin-zdf-mediathek
-Rygel is a home media solution that allows you to easily share audio,
-video and pictures, and control of media player on your home network.
-
-This package provides a plugin to export online media from the ZDF TV
-station.
 
 %lang_package
 
@@ -228,37 +219,23 @@ translation-update-upstream
 %configure --enable-tracker-plugin \
     --enable-media-export-plugin \
     --enable-external-plugin \
-    --enable-mediathek-plugin \
     --enable-gst-launch-plugin
 make %{?_smp_mflags} V=1
 
 %install
 %make_install
-# test so we know if we can drop the manul installation of the .service file
-test ! -f %{buildroot}%{_unitdir}/rygel.service
-install -D -m0644 examples/service/systemd/rygel.service %{buildroot}%{_unitdir}/rygel.service
-mkdir -p %{buildroot}%{_sbindir}
-ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcrygel
 find %{buildroot} -type f -name "*.la" -delete -print
 %suse_update_desktop_file rygel
 %suse_update_desktop_file rygel-preferences X-SuSE-ControlCenter-Personal
 %find_lang %{name} %{?no_lang_C}
 
-%pre
-%service_add_pre rygel.service
-
 %post
 %desktop_database_post
 %icon_theme_cache_post
-%service_add_post rygel.service
-
-%preun
-%service_del_preun rygel.service
 
 %postun
 %desktop_database_postun
 %icon_theme_cache_postun
-%service_del_postun rygel.service
 
 %post -n librygel-core-2_6-2 -p /sbin/ldconfig
 
@@ -288,9 +265,7 @@ find %{buildroot} -type f -name "*.la" -delete -print
 %defattr(-, root, root)
 %doc AUTHORS COPYING README TODO NEWS
 %config(noreplace) %{_sysconfdir}/rygel.conf
-%{_unitdir}/rygel.service
 %{_userunitdir}/rygel.service
-%{_sbindir}/rcrygel
 %{_bindir}/rygel
 %{_bindir}/rygel-preferences
 %{_datadir}/rygel/
@@ -387,6 +362,7 @@ find %{buildroot} -type f -name "*.la" -delete -print
 %{_datadir}/gir-1.0/RygelRendererGst-2.6.gir
 %{_datadir}/gir-1.0/RygelServer-2.6.gir
 %{_datadir}/gtk-doc/html/librygel-core/
+%{_datadir}/gtk-doc/html/librygel-db/
 %{_datadir}/gtk-doc/html/librygel-renderer/
 %{_datadir}/gtk-doc/html/librygel-renderer-gst/
 %{_datadir}/gtk-doc/html/librygel-server/
@@ -413,11 +389,6 @@ find %{buildroot} -type f -name "*.la" -delete -print
 %{_libdir}/rygel-2.6/plugins/librygel-tracker.so
 %{_libdir}/rygel-2.6/plugins/tracker.plugin
 
-%files plugin-zdf-mediathek
-%defattr(-, root, root)
-%{_libdir}/rygel-2.6/plugins/librygel-mediathek.so
-%{_libdir}/rygel-2.6/plugins/mediathek.plugin
-
 %files lang -f %{name}.lang
 %defattr(-,root,root)