diff --git a/.gitignore b/.gitignore index 6b901c6..0705f18 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /gupnp-igd-0.*.tar.xz +/gupnp-igd-1.2.0.tar.xz diff --git a/gupnp-igd.spec b/gupnp-igd.spec index 66c40f7..9d2c03a 100644 --- a/gupnp-igd.spec +++ b/gupnp-igd.spec @@ -1,19 +1,17 @@ Name: gupnp-igd -Version: 0.2.5 -Release: 10%{?dist} +Version: 1.2.0 +Release: 1%{?dist} Summary: Library to handle UPnP IGD port mapping License: LGPLv2+ URL: https://wiki.gnome.org/Projects/GUPnP -Source0: https://download.gnome.org/sources/%{name}/0.2/%{name}-%{version}.tar.xz -# https://gitlab.gnome.org/GNOME/gupnp-igd/-/merge_requests/1 -Patch0: switch-to-gupnp-1-2-api.patch +Source0: https://download.gnome.org/sources/%{name}/1.2/%{name}-%{version}.tar.xz BuildRequires: glib2-devel BuildRequires: gobject-introspection-devel +BuildRequires: gtk-doc BuildRequires: gupnp-devel -# for patch0 -BuildRequires: autoconf automake libtool +BuildRequires: meson Provides: %{name}-python = %{version}-%{release} Provides: %{name}-python%{?_isa} = %{version}-%{release} @@ -25,6 +23,7 @@ Obsoletes: %{name}-python2 < %{version}-%{release} %description %{name} is a library to handle UPnP IGD port mapping. + %package devel Summary: Development files for %{name} Requires: %{name}%{?_isa} = %{version}-%{release} @@ -38,23 +37,14 @@ developing applications that use %{name}. %prep %autosetup -p1 -# for patch0 -autoreconf -fi - %build -%configure --disable-static --disable-python --enable-introspection=yes -# quite rpmlint error about unused-direct-shlib-dependency -sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool -LDFLAGS="$RPM_LD_FLAGS -lgobject-2.0" make %{?_smp_mflags} +%meson -Dgtk_doc=true +%meson_build %install -make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" -find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' - - -%ldconfig_scriptlets +%meson_install %files @@ -73,6 +63,10 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %changelog +* Sat Sep 19 2020 Kalev Lember - 1.2.0-1 +- Update to 1.2.0 +- Switch to meson build system + * Tue Jul 28 2020 Fedora Release Engineering - 0.2.5-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index f60387b..b63d318 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gupnp-igd-0.2.5.tar.xz) = 3d2af29d10c2939a81c8745a50d9cc20be53f97a2112cec6e45bf05373d807d86404b61c776fea34b15ac341f9b7bfff2f3c48901dd241e64e18b5bc7e614cc8 +SHA512 (gupnp-igd-1.2.0.tar.xz) = 0129e743b09cc773b997e0f09d7ab84481d114d52ab273b1e9957960e6a47d686d600492b916970f3b2d3d30c36b68e1e4d049eb7be5d44101a56b90dd5f0af9 diff --git a/switch-to-gupnp-1-2-api.patch b/switch-to-gupnp-1-2-api.patch deleted file mode 100644 index c70bf6f..0000000 --- a/switch-to-gupnp-1-2-api.patch +++ /dev/null @@ -1,99 +0,0 @@ -From 63531558a16ac2334a59f627b2fca5576dcfbb2e Mon Sep 17 00:00:00 2001 -From: Jens Georg -Date: Sat, 1 Dec 2018 21:33:21 +0100 -Subject: [PATCH] Swtich to new GUPnP API - ---- - configure.ac | 2 +- - gupnp-igd-1.0-uninstalled.pc.in | 2 +- - gupnp-igd-1.0.pc.in | 2 +- - libgupnp-igd/Makefile.am | 2 +- - tests/gtest/gupnp-simple-igd.c | 6 ++++-- - 5 files changed, 8 insertions(+), 6 deletions(-) - -diff --git a/configure.ac b/configure.ac -index f03921f..aa7f0ca 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -11,7 +11,7 @@ AC_STDC_HEADERS - AC_PROG_LIBTOOL - AC_FUNC_MMAP - --PKG_CHECK_MODULES(LIBGUPNP, glib-2.0 >= 2.26 gobject-2.0 >= 2.26 gssdp-1.0 gupnp-1.0 >= 0.18 gthread-2.0) -+PKG_CHECK_MODULES(LIBGUPNP, glib-2.0 >= 2.26 gobject-2.0 >= 2.26 gssdp-1.2 gupnp-1.2 >= 0.18 gthread-2.0) - - # glib-genmarshal - GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0` -diff --git a/gupnp-igd-1.0-uninstalled.pc.in b/gupnp-igd-1.0-uninstalled.pc.in -index 483956f..6db3bee 100644 ---- a/gupnp-igd-1.0-uninstalled.pc.in -+++ b/gupnp-igd-1.0-uninstalled.pc.in -@@ -5,7 +5,7 @@ includedir=${pcfiledir}/ - - Name: gupnp-igd-1.0 - Description: GUPnP Simple IGD library --Requires: gupnp-1.0 -+Requires: gupnp-1.2 - Version: @VERSION@ - Libs: ${libdir}/libgupnp-av-1.0.la - Cflags: -I${includedir} -diff --git a/gupnp-igd-1.0.pc.in b/gupnp-igd-1.0.pc.in -index 6660d63..aa74ed3 100644 ---- a/gupnp-igd-1.0.pc.in -+++ b/gupnp-igd-1.0.pc.in -@@ -5,7 +5,7 @@ includedir=@includedir@ - - Name: gupnp-igd-1.0 - Description: GUPnP Simple IGD library --Requires: gupnp-1.0 -+Requires: gupnp-1.2 - Version: @VERSION@ - Libs: -L${libdir} -lgupnp-igd-1.0 - Cflags: -I${includedir}/gupnp-igd-1.0 -diff --git a/libgupnp-igd/Makefile.am b/libgupnp-igd/Makefile.am -index fe020b5..e10d857 100644 ---- a/libgupnp-igd/Makefile.am -+++ b/libgupnp-igd/Makefile.am -@@ -60,7 +60,7 @@ GUPnPIgd_1_0_gir_VERSION = 1.0 - GUPnPIgd_1_0_gir_LIBS = $(lib_LTLIBRARIES) - GUPnPIgd_1_0_gir_FILES = $(libgupnp_igd_1_0_la_SOURCES) $(libgupnp_igd_inc_HEADERS) - GUPnPIgd_1_0_gir_INCLUDES=GObject-2.0 --GUPnPIgd_1_0_gir_PACKAGES=gupnp-1.0 -+GUPnPIgd_1_0_gir_PACKAGES=gupnp-1.2 - GUPnPIgd_1_0_gir_CFLAGS=-I$(srcdir) -I$(top_srcdir) - - if HAVE_INTROSPECTION -diff --git a/tests/gtest/gupnp-simple-igd.c b/tests/gtest/gupnp-simple-igd.c -index 9b32b2a..d051d13 100644 ---- a/tests/gtest/gupnp-simple-igd.c -+++ b/tests/gtest/gupnp-simple-igd.c -@@ -273,13 +273,14 @@ run_gupnp_simple_igd_test (GMainContext *mainctx, GUPnPSimpleIgd *igd, - GUPnPDeviceInfo *subdev1; - GUPnPDeviceInfo *subdev2; - const gchar *xml_path = "."; -+ GError *error = NULL; - - g_signal_connect (igd, "context-available", - G_CALLBACK (ignore_non_localhost), NULL); - - if (mainctx) - g_main_context_push_thread_default (mainctx); -- context = gupnp_context_new (NULL, "lo", 0, NULL); -+ context = gupnp_context_new ("lo", 0, NULL); - g_assert (context); - - if (g_getenv ("XML_PATH")) -@@ -293,8 +294,9 @@ run_gupnp_simple_igd_test (GMainContext *mainctx, GUPnPSimpleIgd *igd, - gupnp_context_host_path (context, "WANPPPConnection.xml", "/WANPPPConnection.xml"); - */ - -- dev = gupnp_root_device_new (context, "InternetGatewayDevice.xml", xml_path); -+ dev = gupnp_root_device_new (context, "InternetGatewayDevice.xml", xml_path, &error); - g_assert (dev); -+ g_assert (error == NULL); - - subdev1 = gupnp_device_info_get_device (GUPNP_DEVICE_INFO (dev), - "urn:schemas-upnp-org:device:WANDevice:1"); --- -2.24.1 -