From 3171ea907c6ffdfe2f4130699c494ae42054919cf12c86416940d0edd7025730 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 6 Feb 2013 18:57:32 +0000 Subject: [PATCH] Accepting request 151512 from home:dimstar:gupnp-dlna-1.0 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. OBS-URL: https://build.opensuse.org/request/show/151512 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gupnp-dlna?expand=0&rev=31 --- gupnp-dlna-0.6.6.tar.xz | 3 +++ gupnp-dlna-0.8.0.tar.xz | 3 --- gupnp-dlna.changes | 32 ------------------------------- gupnp-dlna.spec | 42 ++++++++++++++++++++--------------------- 4 files changed, 24 insertions(+), 56 deletions(-) create mode 100644 gupnp-dlna-0.6.6.tar.xz delete mode 100644 gupnp-dlna-0.8.0.tar.xz diff --git a/gupnp-dlna-0.6.6.tar.xz b/gupnp-dlna-0.6.6.tar.xz new file mode 100644 index 0000000..a48f68e --- /dev/null +++ b/gupnp-dlna-0.6.6.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:82a1e75c398379567a5a5db9acd19bd01334b4f0053c8a166a77bc09bf0ca047 +size 263936 diff --git a/gupnp-dlna-0.8.0.tar.xz b/gupnp-dlna-0.8.0.tar.xz deleted file mode 100644 index c5aab1f..0000000 --- a/gupnp-dlna-0.8.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:31535cb8ee290dd7a9df4448e796a6d3a338ea2ecd03c5a97245a52724929704 -size 267004 diff --git a/gupnp-dlna.changes b/gupnp-dlna.changes index 635833c..fc57cd6 100644 --- a/gupnp-dlna.changes +++ b/gupnp-dlna.changes @@ -1,35 +1,3 @@ -------------------------------------------------------------------- -Wed Dec 26 10:57:37 UTC 2012 - zaitor@opensuse.org - -- Update to version 0.8.0: - + Relax PNG depth requirements to work around a GStreamer issue. - -------------------------------------------------------------------- -Sun Nov 25 19:06:48 UTC 2012 - dimstar@opensuse.org - -- Update to version 0.7.0: - + Port to GStreamer 1.0. - + Add parallel installability with gstreamer-0.10-based - gupnp-dlna. -- Drop gupnp-dlna-GSTPort.patch: fixed upstream. -- Remove gnome-common BuildRequires and call to gnome-autogen.sh, - as we no longer carry patches. -- Rename typelib-1_0-GUPnPDLNA-1_0 subpackage to - typelib-1_0-GUPnPDLNA-1_1, followin upstream. -- Rename libgupnp-dlna-1_0-2 subpackage to libgupnp-dlna-1_1-3, - followin upstreams soname change. - -------------------------------------------------------------------- -Fri Aug 31 14:51:19 UTC 2012 - dimstar@opensuse.org - -- Port to GStreamer 1.0: - + Add gupnp-dlna-GSTPort.patch: Port to GStreamer 1.0 API - + Replace gstreamer-0_10*-devel BuildRequires with - gstreamer*-devel equivalents - + Add gnome-common BuildRequires and call gnome-autogen.sh in - build section, as gupnp-dlna-GSTPort.patch touches the build - system. - ------------------------------------------------------------------- Sat Mar 17 16:02:51 UTC 2012 - dimstar@opensuse.org diff --git a/gupnp-dlna.spec b/gupnp-dlna.spec index f24a848..d3a9dff 100644 --- a/gupnp-dlna.spec +++ b/gupnp-dlna.spec @@ -17,16 +17,16 @@ Name: gupnp-dlna -Version: 0.8.0 +Version: 0.6.6 Release: 0 Summary: A collection of helpers for building DLNA applications License: LGPL-2.1+ Group: Development/Libraries/C and C++ Url: http://www.gupnp.org/ -Source: http://download.gnome.org/sources/gupnp-dlna/0.8/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/gupnp-dlna/0.6/%{name}-%{version}.tar.xz BuildRequires: gobject-introspection-devel -BuildRequires: gstreamer-devel -BuildRequires: gstreamer-plugins-base-devel +BuildRequires: gstreamer-0_10-devel +BuildRequires: gstreamer-0_10-plugins-base-devel BuildRequires: libxml2-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -34,19 +34,19 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build GUPnP-DLNA is a collection of helpers for building DLNA media sharing applications using GUPnP. -%package -n libgupnp-dlna-1_1-3 +%package -n libgupnp-dlna-1_0-2 Summary: A collection of helpers for building DLNA applications Group: Development/Libraries/C and C++ -%description -n libgupnp-dlna-1_1-3 +%description -n libgupnp-dlna-1_0-2 GUPnP-DLNA is a collection of helpers for building DLNA media sharing applications using GUPnP. -%package -n typelib-1_0-GUPnPDLNA-1_1 +%package -n typelib-1_0-GUPnPDLNA-1_0 Summary: A collection of helpers for building DLNA applications -- Introspection bindings Group: Development/Libraries/C and C++ -%description -n typelib-1_0-GUPnPDLNA-1_1 +%description -n typelib-1_0-GUPnPDLNA-1_0 GUPnP-DLNA is a collection of helpers for building DLNA media sharing applications using GUPnP. @@ -55,8 +55,8 @@ This package provides the GObject Introspection bindings for GUPnP-DLNA. %package -n libgupnp-dlna-devel Summary: A collection of helpers for building DLNA applications - Development Files Group: Development/Libraries/C and C++ -Requires: libgupnp-dlna-1_1-3 = %{version} -Requires: typelib-1_0-GUPnPDLNA-1_1 = %{version} +Requires: libgupnp-dlna-1_0-2 = %{version} +Requires: typelib-1_0-GUPnPDLNA-1_0 = %{version} %description -n libgupnp-dlna-devel GUPnP-DLNA is a collection of helpers for building DLNA media sharing @@ -85,32 +85,32 @@ find %{buildroot} -type f -name "*.la" -delete -print %clean rm -rf %{buildroot} -%post -n libgupnp-dlna-1_1-3 -p /sbin/ldconfig +%post -n libgupnp-dlna-1_0-2 -p /sbin/ldconfig -%postun -n libgupnp-dlna-1_1-3 -p /sbin/ldconfig +%postun -n libgupnp-dlna-1_0-2 -p /sbin/ldconfig -%files -n libgupnp-dlna-1_1-3 +%files -n libgupnp-dlna-1_0-2 %defattr(-,root,root) %doc AUTHORS COPYING README TODO # This directory contains DLNA profiles, needed by the library %{_datadir}/%{name}/ -%{_libdir}/lib*.so.3* +%{_libdir}/lib*.so.2* -%files -n typelib-1_0-GUPnPDLNA-1_1 +%files -n typelib-1_0-GUPnPDLNA-1_0 %defattr(-,root,root) -%{_libdir}/girepository-1.0/GUPnPDLNA-1.1.typelib +%{_libdir}/girepository-1.0/GUPnPDLNA-1.0.typelib %files -n libgupnp-dlna-devel %defattr(-,root,root) -%{_includedir}/%{name}-1.1/ +%{_includedir}/%{name}-1.0/ %{_libdir}/lib*.so -%{_libdir}/pkgconfig/gupnp-dlna-1.1.pc -%{_datadir}/gir-1.0/GUPnPDLNA-1.1.gir +%{_libdir}/pkgconfig/gupnp-dlna-1.0.pc +%{_datadir}/gir-1.0/GUPnPDLNA-1.0.gir %doc %{_datadir}/gtk-doc/html/%{name}/ %files -n gupnp-dlna-tools %defattr(-,root,root) -%{_bindir}/gupnp-dlna-info-1.1 -%{_bindir}/gupnp-dlna-ls-profiles-1.1 +%{_bindir}/gupnp-dlna-info +%{_bindir}/gupnp-dlna-ls-profiles %changelog