[packages/rygel] - updated to 0.40.1 - updated gtk-doc patch

qboosh qboosh at pld-linux.org
Wed Feb 24 19:05:36 CET 2021


commit a2520b20ed20d3bf8e9bd76dc3d85c3b303a58e1
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Feb 24 19:06:07 2021 +0100

    - updated to 0.40.1
    - updated gtk-doc patch

 gtk-doc.patch | 68 +++++++++++++++++++++++++++++------------------------------
 rygel.spec    | 16 ++++++--------
 2 files changed, 40 insertions(+), 44 deletions(-)
---
diff --git a/rygel.spec b/rygel.spec
index b896de1..e47f367 100644
--- a/rygel.spec
+++ b/rygel.spec
@@ -6,12 +6,12 @@
 Summary:	Rygel - collection of DLNA (UPnP AV) services
 Summary(pl.UTF-8):	Rygel - zbiór usług DLNA (UPnP AV)
 Name:		rygel
-Version:	0.40.0
+Version:	0.40.1
 Release:	1
 License:	LGPL v2+
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/rygel/0.40/%{name}-%{version}.tar.xz
-# Source0-md5:	8526d47477212f7b7e6a1495e9751997
+Source0:	https://download.gnome.org/sources/rygel/0.40/%{name}-%{version}.tar.xz
+# Source0-md5:	d86ea1458ee6fda890dec3cfbda94372
 Patch0:		gtk-doc.patch
 Patch1:		%{name}-pc.patch
 URL:		https://wiki.gnome.org/Projects/Rygel
@@ -40,7 +40,7 @@ BuildRequires:	libxslt-progs
 BuildRequires:	meson >= 0.50.0
 BuildRequires:	ninja >= 1.5
 BuildRequires:	pkgconfig
-BuildRequires:	rpmbuild(macros) >= 1.736
+BuildRequires:	rpmbuild(macros) >= 1.752
 BuildRequires:	sqlite3-devel >= 3.5
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	tracker-devel >= 2.0
@@ -119,9 +119,7 @@ Pliki nagłówkowe bibliotek Rygel.
 Summary:	API documentation for Rygel libraries
 Summary(pl.UTF-8):	Dokumentacja API bibliotek Rygel
 Group:		Documentation
-%if "%{_rpmversion}" >= "4.6"
-BuildArch:	noarch
-%endif
+%{?noarchpackage}
 
 %description apidocs
 API documentation for Rygel libraries.
@@ -138,9 +136,7 @@ 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
-%if "%{_rpmversion}" >= "4.6"
-BuildArch:	noarch
-%endif
+%{?noarchpackage}
 
 %description -n vala-rygel
 Vala API for Rygel libraries.
diff --git a/gtk-doc.patch b/gtk-doc.patch
index 18cec8a..9de5a4a 100644
--- a/gtk-doc.patch
+++ b/gtk-doc.patch
@@ -1,55 +1,55 @@
---- 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
+--- rygel-0.40.1/doc/reference/librygel-core/meson.build.orig	2021-02-24 18:37:51.893633337 +0100
++++ rygel-0.40.1/doc/reference/librygel-core/meson.build	2021-02-24 18:49:14.819933608 +0100
 @@ -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)
+     meson.add_install_script(install_doc, gtkdoc_core_target,
+-                   join_paths(get_option('datadir'), 'gtk-doc/html/librygel-core'))
++                   join_paths(get_option('datadir'), 'doc/gtk-doc/html/librygel-core'))
  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 @@
+ endif
+--- rygel-0.40.1/doc/reference/librygel-db/meson.build.orig	2021-02-24 18:37:51.896966653 +0100
++++ rygel-0.40.1/doc/reference/librygel-db/meson.build	2021-02-24 18:49:33.213167297 +0100
+@@ -55,7 +55,7 @@
  
  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)
+     meson.add_install_script(install_doc, gtkdoc_db_target,
+-                   join_paths(get_option('datadir'), 'gtk-doc/html/librygel-db'))
++                   join_paths(get_option('datadir'), 'doc/gtk-doc/html/librygel-db'))
  endif
  
---- 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 @@
+ endif
+--- rygel-0.40.1/doc/reference/librygel-renderer/meson.build.orig	2021-02-24 18:37:51.896966653 +0100
++++ rygel-0.40.1/doc/reference/librygel-renderer/meson.build	2021-02-24 18:49:43.473111714 +0100
+@@ -53,7 +53,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)
+     meson.add_install_script(install_doc, gtkdoc_renderer_target,
+-                   join_paths(get_option('datadir'), 'gtk-doc/html/librygel-renderer'))
++                   join_paths(get_option('datadir'), 'doc/gtk-doc/html/librygel-renderer'))
  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 @@
+ endif
+--- rygel-0.40.1/doc/reference/librygel-renderer-gst/meson.build.orig	2021-02-24 18:37:51.896966653 +0100
++++ rygel-0.40.1/doc/reference/librygel-renderer-gst/meson.build	2021-02-24 18:49:55.489713281 +0100
+@@ -59,7 +59,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)
+     meson.add_install_script(install_doc, gtkdoc_renderer_gst_target,
+-                   join_paths(get_option('datadir'), 'gtk-doc/html/librygel-renderer-gst'))
++                   join_paths(get_option('datadir'), 'doc/gtk-doc/html/librygel-renderer-gst'))
  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 @@
+ endif
+--- rygel-0.40.1/doc/reference/librygel-server/meson.build.orig	2021-02-24 18:37:51.896966653 +0100
++++ rygel-0.40.1/doc/reference/librygel-server/meson.build	2021-02-24 18:50:08.569642421 +0100
+@@ -54,7 +54,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)
+     meson.add_install_script(install_doc, gtkdoc_server_target,
+-                   join_paths(get_option('datadir'), 'gtk-doc/html/librygel-server'))
++                   join_paths(get_option('datadir'), 'doc/gtk-doc/html/librygel-server'))
+ endif
  endif
  endif
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rygel.git/commitdiff/a2520b20ed20d3bf8e9bd76dc3d85c3b303a58e1



More information about the pld-cvs-commit mailing list