[packages/gupnp-tools] - updated to 0.10.0 (for gssdp/gupnp 1.2.x) - added meson patch

qboosh qboosh at pld-linux.org
Wed Apr 17 17:28:42 CEST 2019


commit 6dd974c4d91348de1e0b7b60293324b920d7f5a3
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Apr 17 17:28:51 2019 +0200

    - updated to 0.10.0 (for gssdp/gupnp 1.2.x)
    - added meson patch

 gupnp-tools-meson.patch | 12 ++++++++++++
 gupnp-tools.spec        | 30 ++++++++++++++++--------------
 2 files changed, 28 insertions(+), 14 deletions(-)
---
diff --git a/gupnp-tools.spec b/gupnp-tools.spec
index 87cdc87..f2935df 100644
--- a/gupnp-tools.spec
+++ b/gupnp-tools.spec
@@ -1,36 +1,37 @@
 Summary:	GUPnP Tools
 Summary(pl.UTF-8):	Narzędzia GUPnP
 Name:		gupnp-tools
-Version:	0.8.15
+Version:	0.10.0
 Release:	1
 License:	GPL v2+
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/gupnp-tools/0.8/%{name}-%{version}.tar.xz
-# Source0-md5:	c3ea447a682a3431494093efa419b00a
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gupnp-tools/0.10/%{name}-%{version}.tar.xz
+# Source0-md5:	8c66d4aca756478615761a26ed7c8dba
 Patch0:		%{name}-desktop.patch
+Patch1:		%{name}-meson.patch
 URL:		http://gupnp.org/
 BuildRequires:	gettext-tools >= 0.19.7
 BuildRequires:	glib2-devel >= 1:2.24
-BuildRequires:	gssdp-devel >= 0.14
+BuildRequires:	gssdp-devel >= 1.2.0
 BuildRequires:	gtk+3-devel >= 3.10.0
 BuildRequires:	gtksourceview4-devel >= 4
 BuildRequires:	gupnp-av-devel >= 0.5.5
-BuildRequires:	gupnp-devel >= 0.20.14
+BuildRequires:	gupnp-devel >= 1.2.0
 BuildRequires:	libsoup-devel >= 2.42
 BuildRequires:	libuuid-devel
 BuildRequires:	libxml2-devel >= 2.0
 BuildRequires:	meson
-BuildRequires:	ninja
+BuildRequires:	ninja >= 1.5
 BuildRequires:	pkgconfig
-BuildRequires:	rpmbuild(macros) >= 1.727
+BuildRequires:	rpmbuild(macros) >= 1.736
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	xz
 Requires:	adwaita-icon-theme
 Requires:	glib2 >= 1:2.24
-Requires:	gssdp >= 0.14
+Requires:	gssdp >= 1.2.0
 Requires:	gtk+3 >= 3.10.0
 Requires:	gupnp-av >= 0.5.5
-Requires:	gupnp >= 0.20.14
+Requires:	gupnp >= 1.2.0
 Requires:	libsoup >= 2.42
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -82,16 +83,17 @@ UPnP:
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %meson build
 
-%meson_build -C build
+%ninja_build -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%meson_install -C build
+%ninja_install -C build
 
 %find_lang %{name}
 
@@ -110,6 +112,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_desktopdir}/gupnp-av-cp.desktop
 %{_desktopdir}/gupnp-network-light.desktop
 %{_desktopdir}/gupnp-universal-cp.desktop
-%{_iconsdir}/hicolor/256x256/av-cp.png
-%{_iconsdir}/hicolor/256x256/network-light-256x256.png
-%{_iconsdir}/hicolor/256x256/universal-cp.png
+%{_iconsdir}/hicolor/256x256/apps/av-cp.png
+%{_iconsdir}/hicolor/256x256/apps/network-light-256x256.png
+%{_iconsdir}/hicolor/256x256/apps/universal-cp.png
diff --git a/gupnp-tools-meson.patch b/gupnp-tools-meson.patch
new file mode 100644
index 0000000..9bfae25
--- /dev/null
+++ b/gupnp-tools-meson.patch
@@ -0,0 +1,12 @@
+--- gupnp-tools-0.10.0/src/common/meson.build.orig	2019-03-29 20:09:19.000000000 +0100
++++ gupnp-tools-0.10.0/src/common/meson.build	2019-04-17 17:14:21.022029404 +0200
+@@ -1,7 +1,8 @@
+ util_resource = gnome.compile_resources('common-resource',
+     join_paths(resource_data, 'org.gupnp.Tools.Common.gresource.xml'),
+     source_dir : resource_data,
+-    extra_args : ['--manual-register', '--c-name', 'gupnp_tools_common']
++    extra_args : ['--manual-register'],
++    c_name: 'gupnp_tools_common'
+ )
+ 
+ libutil = static_library('util', ['icons.c', 'icons.h', 'pretty-print.c', 'pretty-print.h'] + util_resource,
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gupnp-tools.git/commitdiff/6dd974c4d91348de1e0b7b60293324b920d7f5a3



More information about the pld-cvs-commit mailing list