[packages/rygel] - updated to 0.22.0 (note: new sonames) - added valadoc-workaround patch (disable programlisting tag
qboosh
qboosh at pld-linux.org
Wed Apr 2 21:35:37 CEST 2014
commit 3c25e0f95cc6ad799b3458b4b4970d350ae0951a
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Wed Apr 2 21:37:06 2014 +0200
- updated to 0.22.0 (note: new sonames)
- added valadoc-workaround patch (disable programlisting tags incorrectly handled by current valadoc)
rygel-valadoc-workaround.patch | 14 ++++
rygel.spec | 143 +++++++++++++++++++++--------------------
2 files changed, 88 insertions(+), 69 deletions(-)
---
diff --git a/rygel.spec b/rygel.spec
index 8aabf5c..75dd102 100644
--- a/rygel.spec
+++ b/rygel.spec
@@ -1,57 +1,60 @@
Summary: Rygel - collection of DLNA (UPnP AV) services
Summary(pl.UTF-8): Rygel - zbiór usług DLNA (UPnP AV)
Name: rygel
-Version: 0.20.3
+Version: 0.22.0
Release: 1
License: LGPL v2+
Group: X11/Applications
-Source0: http://ftp.gnome.org/pub/GNOME/sources/rygel/0.20/%{name}-%{version}.tar.xz
-# Source0-md5: 90abca08b806182d0713149d29fd2cc9
+Source0: http://ftp.gnome.org/pub/GNOME/sources/rygel/0.22/%{name}-%{version}.tar.xz
+# Source0-md5: 5d9b818d7bbc6c201b69d9194ee0dfa8
Source1: git-version-gen
Patch0: gtk-doc.patch
+Patch1: %{name}-valadoc-workaround.patch
URL: http://live.gnome.org/Rygel
BuildRequires: autoconf >= 2.64
BuildRequires: automake >= 1:1.11.1
BuildRequires: gettext-devel
-BuildRequires: glib2-devel >= 1:2.31.13
+BuildRequires: glib2-devel >= 1:2.34.0
BuildRequires: gssdp-devel >= 0.13.0
BuildRequires: gstreamer-devel >= 1.0.0
BuildRequires: gstreamer-plugins-base-devel >= 1.0.0
BuildRequires: gtk+3-devel >= 3.0.0
-BuildRequires: gupnp-av-devel >= 0.11.4
+BuildRequires: gupnp-av-devel >= 0.12.4
BuildRequires: gupnp-devel >= 0.19.0
BuildRequires: gupnp-dlna-devel >= 0.9.4
BuildRequires: gupnp-dlna-gst-devel >= 0.9.4
BuildRequires: intltool >= 0.40.0
BuildRequires: libgee-devel >= 0.8.0
-BuildRequires: libsoup-devel >= 2.34.0
+BuildRequires: libsoup-devel >= 2.42.0
BuildRequires: libtool >= 2:2.2.6
+BuildRequires: libunistring-devel
BuildRequires: libuuid-devel >= 1.41.3
BuildRequires: libxslt-progs
BuildRequires: libxml2-devel >= 1:2.7
BuildRequires: pkgconfig
BuildRequires: sqlite3-devel >= 3.5
-BuildRequires: vala >= 2:0.20.0
+BuildRequires: vala >= 2:0.22.0
BuildRequires: vala-gupnp >= 0.19.0
-BuildRequires: vala-gupnp-av >= 0.11.4
-BuildRequires: tracker-devel >= 0.16.0
+BuildRequires: vala-gupnp-av >= 0.12.4
+BuildRequires: valadoc >= 0.2
+BuildRequires: tracker-devel >= 1.0
Requires(post,postun): /sbin/ldconfig
Requires(post,postun): gtk-update-icon-cache
Requires(post,postun): hicolor-icon-theme
-Requires: glib2 >= 1:2.31.13
+Requires: glib2 >= 1:2.34.0
Requires: gssdp >= 0.13.0
Requires: gstreamer >= 1.0.0
Requires: gtk+3 >= 3.0.0
Requires: gupnp >= 0.19.0
-Requires: gupnp-av >= 0.11.4
+Requires: gupnp-av >= 0.12.4
Requires: gupnp-dlna >= 0.9.4
Requires: gupnp-dlna-gst >= 0.9.4
Requires: libgee >= 0.8.0
-Requires: libsoup >= 2.34.0
+Requires: libsoup >= 2.42.0
Requires: libuuid >= 1.41.3
Requires: libxml2 >= 1:2.7
Requires: sqlite3 >= 3.5
-Requires: tracker-libs >= 0.16.0
+Requires: tracker-libs >= 1.0
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -67,9 +70,9 @@ Summary: Rygel header files
Summary(pl.UTF-8): Pliki nagłówkowe bibliotek Rygel
Group: X11/Development/Libraries
Requires: %{name} = %{version}-%{release}
-Requires: glib2-devel >= 1:2.31.13
+Requires: glib2-devel >= 1:2.34.0
Requires: gstreamer-devel >= 1.0.0
-Requires: gupnp-av-devel >= 0.11.4
+Requires: gupnp-av-devel >= 0.12.4
Requires: libgee-devel >= 0.8.0
Requires: libuuid-devel >= 1.41.3
@@ -95,10 +98,10 @@ Summary: Vala API for Rygel libraries
Summary(pl.UTF-8): API języka Vala do bibliotek Rygel
Group: Development/Libraries
Requires: %{name}-devel = %{version}-%{release}
-Requires: vala >= 2:0.20.0
+Requires: vala >= 2:0.22.0
Requires: vala-libgee >= 0.8.0
Requires: vala-gupnp >= 0.19.0
-Requires: vala-gupnp-av >= 0.11.4
+Requires: vala-gupnp-av >= 0.12.4
%description -n vala-rygel
Vala API for Rygel libraries.
@@ -109,6 +112,7 @@ API języka Vala do bibliotek Rygel.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
#install -m755 %{SOURCE1} build-aux/git-version-gen
%build
@@ -121,7 +125,8 @@ API języka Vala do bibliotek Rygel.
%configure \
--enable-gst-launch-plugin \
--enable-mediathek-plugin \
- --disable-silent-rules
+ --disable-silent-rules \
+ --disable-valadoc
%{__make}
@@ -131,7 +136,7 @@ rm -rf $RPM_BUILD_ROOT
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/rygel-2.0/*/*.la \
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/rygel-2.2/*/*.la \
$RPM_BUILD_ROOT%{_libdir}/*.la
%find_lang %{name}
@@ -153,35 +158,35 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/rygel
%attr(755,root,root) %{_bindir}/rygel-preferences
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/rygel.conf
-%attr(755,root,root) %{_libdir}/librygel-core-2.0.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/librygel-core-2.0.so.1
-%attr(755,root,root) %{_libdir}/librygel-renderer-2.0.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/librygel-renderer-2.0.so.1
-%attr(755,root,root) %{_libdir}/librygel-renderer-gst-2.0.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/librygel-renderer-gst-2.0.so.1
-%attr(755,root,root) %{_libdir}/librygel-server-2.0.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/librygel-server-2.0.so.1
-%dir %{_libdir}/rygel-2.0
-%dir %{_libdir}/rygel-2.0/engines
-%attr(755,root,root) %{_libdir}/rygel-2.0/engines/librygel-media-engine-gst.so
-%{_libdir}/rygel-2.0/engines/media-engine-gst.plugin
-%attr(755,root,root) %{_libdir}/rygel-2.0/engines/librygel-media-engine-simple.so
-%{_libdir}/rygel-2.0/engines/media-engine-simple.plugin
-%dir %{_libdir}/rygel-2.0/plugins
-%attr(755,root,root) %{_libdir}/rygel-2.0/plugins/librygel-external.so
-%{_libdir}/rygel-2.0/plugins/external.plugin
-%attr(755,root,root) %{_libdir}/rygel-2.0/plugins/librygel-gst-launch.so
-%{_libdir}/rygel-2.0/plugins/gst-launch.plugin
-%attr(755,root,root) %{_libdir}/rygel-2.0/plugins/librygel-media-export.so
-%{_libdir}/rygel-2.0/plugins/media-export.plugin
-%attr(755,root,root) %{_libdir}/rygel-2.0/plugins/librygel-mediathek.so
-%{_libdir}/rygel-2.0/plugins/mediathek.plugin
-%attr(755,root,root) %{_libdir}/rygel-2.0/plugins/librygel-mpris.so
-%{_libdir}/rygel-2.0/plugins/mpris.plugin
-%attr(755,root,root) %{_libdir}/rygel-2.0/plugins/librygel-tracker.so
-%{_libdir}/rygel-2.0/plugins/tracker.plugin
-%attr(755,root,root) %{_libdir}/rygel-2.0/plugins/librygel-playbin.so
-%{_libdir}/rygel-2.0/plugins/playbin.plugin
+%attr(755,root,root) %{_libdir}/librygel-core-2.2.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/librygel-core-2.2.so.2
+%attr(755,root,root) %{_libdir}/librygel-renderer-2.2.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/librygel-renderer-2.2.so.2
+%attr(755,root,root) %{_libdir}/librygel-renderer-gst-2.2.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/librygel-renderer-gst-2.2.so.2
+%attr(755,root,root) %{_libdir}/librygel-server-2.2.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/librygel-server-2.2.so.2
+%dir %{_libdir}/rygel-2.2
+%dir %{_libdir}/rygel-2.2/engines
+%attr(755,root,root) %{_libdir}/rygel-2.2/engines/librygel-media-engine-gst.so
+%{_libdir}/rygel-2.2/engines/media-engine-gst.plugin
+%attr(755,root,root) %{_libdir}/rygel-2.2/engines/librygel-media-engine-simple.so
+%{_libdir}/rygel-2.2/engines/media-engine-simple.plugin
+%dir %{_libdir}/rygel-2.2/plugins
+%attr(755,root,root) %{_libdir}/rygel-2.2/plugins/librygel-external.so
+%{_libdir}/rygel-2.2/plugins/external.plugin
+%attr(755,root,root) %{_libdir}/rygel-2.2/plugins/librygel-gst-launch.so
+%{_libdir}/rygel-2.2/plugins/gst-launch.plugin
+%attr(755,root,root) %{_libdir}/rygel-2.2/plugins/librygel-media-export.so
+%{_libdir}/rygel-2.2/plugins/media-export.plugin
+%attr(755,root,root) %{_libdir}/rygel-2.2/plugins/librygel-mediathek.so
+%{_libdir}/rygel-2.2/plugins/mediathek.plugin
+%attr(755,root,root) %{_libdir}/rygel-2.2/plugins/librygel-mpris.so
+%{_libdir}/rygel-2.2/plugins/mpris.plugin
+%attr(755,root,root) %{_libdir}/rygel-2.2/plugins/librygel-tracker.so
+%{_libdir}/rygel-2.2/plugins/tracker.plugin
+%attr(755,root,root) %{_libdir}/rygel-2.2/plugins/librygel-playbin.so
+%{_libdir}/rygel-2.2/plugins/playbin.plugin
%{_desktopdir}/rygel-preferences.desktop
%{_desktopdir}/rygel.desktop
%{_datadir}/dbus-1/services/org.gnome.Rygel1.service
@@ -192,30 +197,30 @@ rm -rf $RPM_BUILD_ROOT
%files devel
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/librygel-core-2.0.so
-%attr(755,root,root) %{_libdir}/librygel-renderer-2.0.so
-%attr(755,root,root) %{_libdir}/librygel-renderer-gst-2.0.so
-%attr(755,root,root) %{_libdir}/librygel-server-2.0.so
-%dir %{_includedir}/rygel-2.0
-%{_includedir}/rygel-2.0/rygel-core.h
-%{_includedir}/rygel-2.0/rygel-renderer-gst.h
-%{_includedir}/rygel-2.0/rygel-renderer.h
-%{_includedir}/rygel-2.0/rygel-server.h
-%{_pkgconfigdir}/rygel-core-2.0.pc
-%{_pkgconfigdir}/rygel-renderer-2.0.pc
-%{_pkgconfigdir}/rygel-renderer-gst-2.0.pc
-%{_pkgconfigdir}/rygel-server-2.0.pc
+%attr(755,root,root) %{_libdir}/librygel-core-2.2.so
+%attr(755,root,root) %{_libdir}/librygel-renderer-2.2.so
+%attr(755,root,root) %{_libdir}/librygel-renderer-gst-2.2.so
+%attr(755,root,root) %{_libdir}/librygel-server-2.2.so
+%dir %{_includedir}/rygel-2.2
+%{_includedir}/rygel-2.2/rygel-core.h
+%{_includedir}/rygel-2.2/rygel-renderer-gst.h
+%{_includedir}/rygel-2.2/rygel-renderer.h
+%{_includedir}/rygel-2.2/rygel-server.h
+%{_pkgconfigdir}/rygel-core-2.2.pc
+%{_pkgconfigdir}/rygel-renderer-2.2.pc
+%{_pkgconfigdir}/rygel-renderer-gst-2.2.pc
+%{_pkgconfigdir}/rygel-server-2.2.pc
%files -n vala-rygel
%defattr(644,root,root,755)
-%{_datadir}/vala/vapi/rygel-core-2.0.deps
-%{_datadir}/vala/vapi/rygel-core-2.0.vapi
-%{_datadir}/vala/vapi/rygel-renderer-2.0.deps
-%{_datadir}/vala/vapi/rygel-renderer-2.0.vapi
-%{_datadir}/vala/vapi/rygel-renderer-gst-2.0.deps
-%{_datadir}/vala/vapi/rygel-renderer-gst-2.0.vapi
-%{_datadir}/vala/vapi/rygel-server-2.0.deps
-%{_datadir}/vala/vapi/rygel-server-2.0.vapi
+%{_datadir}/vala/vapi/rygel-core-2.2.deps
+%{_datadir}/vala/vapi/rygel-core-2.2.vapi
+%{_datadir}/vala/vapi/rygel-renderer-2.2.deps
+%{_datadir}/vala/vapi/rygel-renderer-2.2.vapi
+%{_datadir}/vala/vapi/rygel-renderer-gst-2.2.deps
+%{_datadir}/vala/vapi/rygel-renderer-gst-2.2.vapi
+%{_datadir}/vala/vapi/rygel-server-2.2.deps
+%{_datadir}/vala/vapi/rygel-server-2.2.vapi
%files apidocs
%defattr(644,root,root,755)
diff --git a/rygel-valadoc-workaround.patch b/rygel-valadoc-workaround.patch
new file mode 100644
index 0000000..bfa2a9a
--- /dev/null
+++ b/rygel-valadoc-workaround.patch
@@ -0,0 +1,14 @@
+--- rygel-0.22.0/src/librygel-core/rygel-plugin-information.vala.orig 2014-03-01 15:46:31.000000000 +0100
++++ rygel-0.22.0/src/librygel-core/rygel-plugin-information.vala 2014-04-02 19:40:46.689425216 +0200
+@@ -28,11 +28,9 @@
+ *
+ * A minimal file for the plugin librygel-sompelugin.so looks like this:
+ *
+- * {{{
+ * [Plugin]
+ * Name = SomeNameForThePlugin
+ * Module = someplugin
+- * }}}
+ *
+ * Name must not contain any whitespaces.
+ */
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rygel.git/commitdiff/3c25e0f95cc6ad799b3458b4b4970d350ae0951a
More information about the pld-cvs-commit
mailing list