- updated to 0.10.1

- removed obsolete meson patch
- added format patch (missing format string)

diff --git a/gupnp-tools-format.patch b/gupnp-tools-format.patch
new file mode 100644 (file)
index 0000000..344afe3
--- /dev/null
+++ b/gupnp-tools-format.patch
@@ -0,0 +1,11 @@
+--- gupnp-tools-0.10.1/src/universal-cp/main.c.orig    2021-06-21 23:23:20.515533000 +0200
++++ gupnp-tools-0.10.1/src/universal-cp/main.c 2021-06-22 20:30:04.384036023 +0200
+@@ -74,7 +74,7 @@
+                 g_set_error (error,
+                              G_IO_ERROR,
+                              G_IO_ERROR_INVALID_ARGUMENT,
+-                             msg);
++                             "%s", msg);
+                 g_free (msg);
+ 
+                 return FALSE;

diff --git a/gupnp-tools-meson.patch b/gupnp-tools-meson.patch
deleted file mode 100644 (file)
index 9bfae25..0000000
--- a/gupnp-tools-meson.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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,

diff --git a/gupnp-tools.spec b/gupnp-tools.spec
index f2935df3e97fbd82697b2159eec5e28c2612f267..bb118f3b48506a5efe080d178eab6f66d218a111 100644 (file)
--- a/gupnp-tools.spec
+++ b/gupnp-tools.spec
@@ -1,14 +1,14 @@
 Summary:       GUPnP Tools
 Summary(pl.UTF-8):     Narzędzia GUPnP
 Name:          gupnp-tools
-Version:       0.10.0
+Version:       0.10.1
 Release:       1
 License:       GPL v2+
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/gupnp-tools/0.10/%{name}-%{version}.tar.xz
-# Source0-md5: 8c66d4aca756478615761a26ed7c8dba
+Source0:       https://download.gnome.org/sources/gupnp-tools/0.10/%{name}-%{version}.tar.xz
+# Source0-md5: 232c64ec652d3f5888d8c2cdf0d81b86
 Patch0:                %{name}-desktop.patch
-Patch1:                %{name}-meson.patch
+Patch1:                %{name}-format.patch
 URL:           http://gupnp.org/
 BuildRequires: gettext-tools >= 0.19.7
 BuildRequires: glib2-devel >= 1:2.24
@@ -112,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/apps/av-cp.png
-%{_iconsdir}/hicolor/256x256/apps/network-light-256x256.png
-%{_iconsdir}/hicolor/256x256/apps/universal-cp.png
+%{_iconsdir}/hicolor/*x*/apps/av-cp.png
+%{_iconsdir}/hicolor/*x*/apps/network-light.png
+%{_iconsdir}/hicolor/*x*/apps/universal-cp.png