commit 125607a7ca361669b2a0571fbdfb86b42f3dd403
Author: Jakub Bogusz <[email protected]>
Date: Mon Sep 21 20:56:10 2020 +0200
- updated to 0.40.0
- updated gtk-doc patch
gtk-doc.patch | 58 ++++++++++++++++++++++++++++++++++++++++++------
rygel.spec | 71 ++++++++++++++++++++++++++++++++---------------------------
2 files changed, 89 insertions(+), 40 deletions(-)
---
diff --git a/rygel.spec b/rygel.spec
index 30cef4a..b896de1 100644
--- a/rygel.spec
+++ b/rygel.spec
@@ -1,27 +1,31 @@
+# TODO: split some plugins? (tracker2, tracker3, gstreamer?)
+#
+# Conditional build:
+%bcond_without apidocs # API documentation
+
Summary: Rygel - collection of DLNA (UPnP AV) services
Summary(pl.UTF-8): Rygel - zbiór usług DLNA (UPnP AV)
Name: rygel
-Version: 0.38.4
+Version: 0.40.0
Release: 1
License: LGPL v2+
Group: X11/Applications
-Source0:
http://ftp.gnome.org/pub/GNOME/sources/rygel/0.38/%{name}-%{version}.tar.xz
-# Source0-md5: c104f8994f6d928a20a0119c40c046fd
+Source0:
http://ftp.gnome.org/pub/GNOME/sources/rygel/0.40/%{name}-%{version}.tar.xz
+# Source0-md5: 8526d47477212f7b7e6a1495e9751997
Patch0: gtk-doc.patch
Patch1: %{name}-pc.patch
URL: https://wiki.gnome.org/Projects/Rygel
-BuildRequires: autoconf >= 2.64
-BuildRequires: automake >= 1:1.11.1
BuildRequires: docbook-style-xsl-nons
BuildRequires: gdk-pixbuf2-devel >= 2.0
BuildRequires: gettext-tools >= 0.19.7
-BuildRequires: glib2-devel >= 1:2.44.0
+BuildRequires: glib2-devel >= 1:2.56
BuildRequires: gobject-introspection-devel >= 1.33.4
BuildRequires: gssdp-devel >= 1.2.0
BuildRequires: gstreamer-devel >= 1.12
+BuildRequires: gstreamer-editing-services-devel >= 1.16
BuildRequires: gstreamer-plugins-base-devel >= 1.12
BuildRequires: gtk+3-devel >= 3.22
-BuildRequires: gtk-doc >= 1.0
+%{?with_apidocs:BuildRequires: gtk-doc >= 1.0}
BuildRequires: gupnp-av-devel >= 0.12.8
BuildRequires: gupnp-devel >= 1.2.0
BuildRequires: gupnp-dlna-devel >= 0.9.4
@@ -29,19 +33,23 @@ BuildRequires: gupnp-dlna-gst-devel >= 0.9.4
BuildRequires: libgee-devel >= 0.8.0
BuildRequires: libmediaart2-devel >= 0.7.0
BuildRequires: libsoup-devel >= 2.44.0
-BuildRequires: libtool >= 2:2.2.6
BuildRequires: libunistring-devel
BuildRequires: libuuid-devel >= 1.41.3
BuildRequires: libxml2-devel >= 1:2.7
BuildRequires: libxslt-progs
+BuildRequires: meson >= 0.50.0
+BuildRequires: ninja >= 1.5
BuildRequires: pkgconfig
-BuildRequires: rpmbuild(macros) >= 1.682
+BuildRequires: rpmbuild(macros) >= 1.736
BuildRequires: sqlite3-devel >= 3.5
BuildRequires: tar >= 1:1.22
BuildRequires: tracker-devel >= 2.0
-BuildRequires: vala >= 2:0.36.0
+BuildRequires: tracker3-devel >= 3.0
+BuildRequires: vala >= 2:0.40.10
BuildRequires: vala-gupnp >= 1.2.0
BuildRequires: vala-gupnp-av >= 0.12.8
+BuildRequires: vala-gupnp-dlna >= 0.9.4
+BuildRequires: vala-gupnp-dlna-gst >= 0.9.4
BuildRequires: vala-libgee >= 0.8.0
BuildRequires: vala-libmediaart2 >= 0.7.0
BuildRequires: valadoc >= 0.2
@@ -51,12 +59,14 @@ Requires(post,postun): gtk-update-icon-cache
Requires(post,postun): hicolor-icon-theme
Requires: %{name}-libs = %{version}-%{release}
Requires: gstreamer >= 1.12
+Requires: gstreamer-editing-services >= 1.16
Requires: gtk+3 >= 3.22
Requires: gupnp-dlna >= 0.9.4
Requires: gupnp-dlna-gst >= 0.9.4
Requires: libuuid >= 1.41.3
Requires: systemd-units >= 38
Requires: tracker-libs >= 2.0
+Requires: tracker3-libs >= 3.0
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -71,7 +81,7 @@ zaimplementowany poprzez mechanizm wtyczek.
Summary: Rygel shared libraries
Summary(pl.UTF-8): Biblioteki współdzielone Rygela
Group: Libraries
-Requires: glib2 >= 1:2.44.0
+Requires: glib2 >= 1:2.56
Requires: gssdp >= 1.2.0
Requires: gupnp >= 1.2.0
Requires: gupnp-av >= 0.12.8
@@ -93,7 +103,7 @@ Summary: Rygel header files
Summary(pl.UTF-8): Pliki nagłówkowe bibliotek Rygel
Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
-Requires: glib2-devel >= 1:2.44.0
+Requires: glib2-devel >= 1:2.56
Requires: gstreamer-devel >= 1.12
Requires: gupnp-av-devel >= 0.12.8
Requires: libgee-devel >= 0.8.0
@@ -124,7 +134,7 @@ 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.36.0
+Requires: vala >= 2:0.40.10
Requires: vala-gupnp >= 1.2.0
Requires: vala-gupnp-av >= 0.12.8
Requires: vala-libgee >= 0.8.0
@@ -144,27 +154,18 @@ API języka Vala do bibliotek Rygel.
%patch1 -p1
%build
-%{__gettextize}
-%{__libtoolize}
-%{__aclocal} -I m4
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
- --enable-gst-launch-plugin \
- --disable-silent-rules \
- --with-systemduserunitdir=%{systemduserunitdir}
+%meson build \
+ --default-library=shared \
+ %{?with_apidocs:-Dapi-docs=true} \
+ -Dexamples=false \
+ -Dsystemd-user-units-dir=%{systemduserunitdir}
-%{__make}
+%ninja_build -C build
%install
rm -rf $RPM_BUILD_ROOT
-%{__make} install \
- DESTDIR=$RPM_BUILD_ROOT
-
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/rygel-2.6/*/*.la \
- $RPM_BUILD_ROOT%{_libdir}/*.la
+%ninja_install -C build
%find_lang %{name}
@@ -182,7 +183,7 @@ rm -rf $RPM_BUILD_ROOT
%files -f %{name}.lang
%defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README.md TODO
+%doc AUTHORS COPYING.logo MAINTAINERS NEWS README.md TODO
%attr(755,root,root) %{_bindir}/rygel
%attr(755,root,root) %{_bindir}/rygel-preferences
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/rygel.conf
@@ -205,18 +206,22 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/rygel-2.6/plugins/media-export.plugin
%attr(755,root,root) %{_libdir}/rygel-2.6/plugins/librygel-mpris.so
%{_libdir}/rygel-2.6/plugins/mpris.plugin
+%attr(755,root,root) %{_libdir}/rygel-2.6/plugins/librygel-playbin.so
+%{_libdir}/rygel-2.6/plugins/playbin.plugin
%attr(755,root,root) %{_libdir}/rygel-2.6/plugins/librygel-ruih.so
%{_libdir}/rygel-2.6/plugins/ruih.plugin
%attr(755,root,root) %{_libdir}/rygel-2.6/plugins/librygel-tracker.so
%{_libdir}/rygel-2.6/plugins/tracker.plugin
-%attr(755,root,root) %{_libdir}/rygel-2.6/plugins/librygel-playbin.so
-%{_libdir}/rygel-2.6/plugins/playbin.plugin
+%attr(755,root,root) %{_libdir}/rygel-2.6/plugins/librygel-tracker3.so
+%{_libdir}/rygel-2.6/plugins/tracker3.plugin
%{systemduserunitdir}/rygel.service
%{_desktopdir}/rygel-preferences.desktop
%{_desktopdir}/rygel.desktop
%{_datadir}/dbus-1/services/org.gnome.Rygel1.service
%{_datadir}/rygel
-%{_iconsdir}/hicolor/*/apps/*
+%{_iconsdir}/hicolor/*x*/apps/rygel.png
+%{_iconsdir}/hicolor/scalable/apps/rygel.svg
+%{_iconsdir}/hicolor/scalable/apps/rygel-full.svg
%{_mandir}/man1/rygel.1*
%{_mandir}/man5/rygel.conf.5*
diff --git a/gtk-doc.patch b/gtk-doc.patch
index c1668c8..18cec8a 100644
--- a/gtk-doc.patch
+++ b/gtk-doc.patch
@@ -1,11 +1,55 @@
---- rygel-0.20.0/doc/reference/doc-build.am~ 2013-05-12 17:15:55.000000000
+0200
-+++ rygel-0.20.0/doc/reference/doc-build.am 2013-10-09 19:07:46.751738394
+0200
-@@ -77,7 +77,7 @@
+--- rygel-0.40.0/doc/reference/librygel-core/meson.build.orig 2020-09-13
23:58:05.023098200 +0200
++++ rygel-0.40.0/doc/reference/librygel-core/meson.build 2020-09-21
20:16:35.658638400 +0200
+@@ -49,7 +49,7 @@
+ if get_option('api-docs')
+ install_subdir('gtkdoc/html',
+- install_dir : join_paths(get_option('datadir'),
'gtk-doc/html/librygel-core'),
++ install_dir : join_paths(get_option('datadir'),
'doc/gtk-doc/html/librygel-core'),
+ strip_directory : true)
endif
+ endif
+--- rygel-0.40.0/doc/reference/librygel-db/meson.build.orig 2020-09-13
23:58:05.023098200 +0200
++++ rygel-0.40.0/doc/reference/librygel-db/meson.build 2020-09-21
20:16:46.621912341 +0200
+@@ -56,7 +56,7 @@
--RYGEL_GTKDOC_INSTALL_DIR =
$(DESTDIR)$(datadir)/gtk-doc/html/lib$(RYGEL_DOCBUILD_MODULE)
-+RYGEL_GTKDOC_INSTALL_DIR =
$(DESTDIR)$(datadir)/doc/gtk-doc/html/lib$(RYGEL_DOCBUILD_MODULE)
+ if get_option('api-docs')
+ install_subdir('gtkdoc/html',
+- install_dir : join_paths(get_option('datadir'),
'gtk-doc/html/librygel-db'),
++ install_dir : join_paths(get_option('datadir'),
'doc/gtk-doc/html/librygel-db'),
+ strip_directory : true)
+ endif
- uninstall-hook:
- rm -rf $(RYGEL_GTKDOC_INSTALL_DIR)
+--- rygel-0.40.0/doc/reference/librygel-renderer-gst/meson.build.orig
2020-09-13 23:58:05.023098200 +0200
++++ rygel-0.40.0/doc/reference/librygel-renderer-gst/meson.build
2020-09-21 20:16:56.948523063 +0200
+@@ -60,7 +60,7 @@
+ )
+ if get_option('api-docs')
+ install_subdir('gtkdoc/html',
+- install_dir : join_paths(get_option('datadir'),
'gtk-doc/html/librygel-renderer-gst'),
++ install_dir : join_paths(get_option('datadir'),
'doc/gtk-doc/html/librygel-renderer-gst'),
+ strip_directory : true)
+ endif
+ endif
+--- rygel-0.40.0/doc/reference/librygel-renderer/meson.build.orig
2020-09-13 23:58:05.023098200 +0200
++++ rygel-0.40.0/doc/reference/librygel-renderer/meson.build 2020-09-21
20:17:07.495132594 +0200
+@@ -54,7 +54,7 @@
+ )
+ if get_option('api-docs')
+ install_subdir('gtkdoc/html',
+- install_dir : join_paths(get_option('datadir'),
'gtk-doc/html/librygel-renderer'),
++ install_dir : join_paths(get_option('datadir'),
'doc/gtk-doc/html/librygel-renderer'),
+ strip_directory : true)
+ endif
+ endif
+--- rygel-0.40.0/doc/reference/librygel-server/meson.build.orig
2020-09-13 23:58:05.023098200 +0200
++++ rygel-0.40.0/doc/reference/librygel-server/meson.build 2020-09-21
20:17:17.021747651 +0200
+@@ -55,7 +55,7 @@
+ )
+ if get_option('api-docs')
+ install_subdir('gtkdoc/html',
+- install_dir : join_paths(get_option('datadir'),
'gtk-doc/html/librygel-server'),
++ install_dir : join_paths(get_option('datadir'),
'doc/gtk-doc/html/librygel-server'),
+ strip_directory : true)
+ endif
+ endif
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rygel.git/commitdiff/125607a7ca361669b2a0571fbdfb86b42f3dd403
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
