From aaecbc906e59dba3ac19175b2f310c435e2b036e7cea09662056e294223d7079 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Tue, 11 Jun 2019 08:47:26 +0000 Subject: [PATCH] Accepting request 708467 from GNOME:Next - Update to version 1.2.1: + Fix a deadlock when cancelling an action. + Do not call-back a cancelled action. + Fix public dependencies. - Update to version 1.2.0: + Stable release version bump. - Update to version 1.1.2: + Use python3 in binding tool. + Avoid a static buffer in the linux context manager. + Add UDA version and address family to linux context manager. + Implement ssdp:update in context manager. + Update documentation. + Introduce new sync/async service proxy call API. - Update to version 1.1.1: + Fix issue when building VAPI. + Pass on network mask from linux CM. + Properly rewrite v6 link-local urls when accessing. + Minor introspection annotation fixes. + Properly filter v6 scopes in linux CM. + Fix compile issues with linux CM when there is no wireless.h. + Fix doble-free in linux CM. + Simplify build tests a bit. - Changes from version 1.1.0: + Bump API and ABI version. + GUPnPRootDevice implements GInitable. + Clean-up functions added for GObject-Introspection compatibility. + Remove all deprecated functions from GUPnP 1.0 API. + Switch build to Meson. + Port everything to new GLib type macros. + Add IPv6 support to Linux context manager. + Fix IPv6 LL support for context. + Add gupnp_context_manager_create_full for specifying the socket family. + Bugs fixed: bgo#654446, bgo#770318, bgo#777491, bgo#780640, bgo#780715, bgo#793955. - Switch to meson buildsystem, add meson and gtk-doc BuildRequires and macros. - Add pkgconfig(gio-2.0), pkgconfig(glib-2.0), pkgconfig(gmodule-2.0) and pkgconfig(gobject-2.0) BuildRequires: align with what meson checks for. - Replace pkgconfig(gssdp-1.0) with pkgconfig(gssdp-1.2) BuildRequires following upstreams changes. - Add soname and sover defines and set them to 1_2-0 and 1.2, make future API and ABI bumps easier. OBS-URL: https://build.opensuse.org/request/show/708467 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gupnp?expand=0&rev=105 --- baselibs.conf | 2 +- gupnp-1.0.4.tar.xz | 3 --- gupnp-1.2.1.tar.xz | 3 +++ gupnp.changes | 61 ++++++++++++++++++++++++++++++++++++++++++++++ gupnp.spec | 61 ++++++++++++++++++++++++++++------------------ 5 files changed, 102 insertions(+), 28 deletions(-) delete mode 100644 gupnp-1.0.4.tar.xz create mode 100644 gupnp-1.2.1.tar.xz diff --git a/baselibs.conf b/baselibs.conf index 42af5f9..25c034c 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1 +1 @@ -libgupnp-1_0-4 \ No newline at end of file +libgupnp-1_2-0 diff --git a/gupnp-1.0.4.tar.xz b/gupnp-1.0.4.tar.xz deleted file mode 100644 index 42fc7ed..0000000 --- a/gupnp-1.0.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8b0992650c6ef8566d2d0c9198c8a669106dc2c73aa908fcc4a4d043a8c0b544 -size 427616 diff --git a/gupnp-1.2.1.tar.xz b/gupnp-1.2.1.tar.xz new file mode 100644 index 0000000..2eeb5dc --- /dev/null +++ b/gupnp-1.2.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a9aa557eff415598e05999d0ab122f202a978ff827688d3f951023117a315f5e +size 135276 diff --git a/gupnp.changes b/gupnp.changes index 5b52c44..fba5702 100644 --- a/gupnp.changes +++ b/gupnp.changes @@ -1,3 +1,64 @@ +------------------------------------------------------------------- +Thu May 30 01:02:01 UTC 2019 - bjorn.lie@gmail.com + +- Update to version 1.2.1: + + Fix a deadlock when cancelling an action. + + Do not call-back a cancelled action. + + Fix public dependencies. + +------------------------------------------------------------------- +Thu May 30 01:02:00 UTC 2019 - bjorn.lie@gmail.com + +- Update to version 1.2.0: + + Stable release version bump. + +------------------------------------------------------------------- +Thu May 30 01:01:02 UTC 2019 - bjorn.lie@gmail.com + +- Update to version 1.1.2: + + Use python3 in binding tool. + + Avoid a static buffer in the linux context manager. + + Add UDA version and address family to linux context manager. + + Implement ssdp:update in context manager. + + Update documentation. + + Introduce new sync/async service proxy call API. + +------------------------------------------------------------------- +Thu May 30 01:01:01 UTC 2019 - bjorn.lie@gmail.com + +- Update to version 1.1.1: + + Fix issue when building VAPI. + + Pass on network mask from linux CM. + + Properly rewrite v6 link-local urls when accessing. + + Minor introspection annotation fixes. + + Properly filter v6 scopes in linux CM. + + Fix compile issues with linux CM when there is no wireless.h. + + Fix doble-free in linux CM. + + Simplify build tests a bit. +- Changes from version 1.1.0: + + Bump API and ABI version. + + GUPnPRootDevice implements GInitable. + + Clean-up functions added for GObject-Introspection + compatibility. + + Remove all deprecated functions from GUPnP 1.0 API. + + Switch build to Meson. + + Port everything to new GLib type macros. + + Add IPv6 support to Linux context manager. + + Fix IPv6 LL support for context. + + Add gupnp_context_manager_create_full for specifying the socket + family. + + Bugs fixed: bgo#654446, bgo#770318, bgo#777491, bgo#780640, + bgo#780715, bgo#793955. +- Switch to meson buildsystem, add meson and gtk-doc BuildRequires + and macros. +- Add pkgconfig(gio-2.0), pkgconfig(glib-2.0), + pkgconfig(gmodule-2.0) and pkgconfig(gobject-2.0) BuildRequires: + align with what meson checks for. +- Replace pkgconfig(gssdp-1.0) with pkgconfig(gssdp-1.2) + BuildRequires following upstreams changes. +- Add soname and sover defines and set them to 1_2-0 and 1.2, make + future API and ABI bumps easier. + ------------------------------------------------------------------- Wed May 29 20:28:24 UTC 2019 - Bjørn Lie diff --git a/gupnp.spec b/gupnp.spec index c24ddb3..4125b06 100644 --- a/gupnp.spec +++ b/gupnp.spec @@ -16,21 +16,30 @@ # +# When bumping soname, do not forget to bump in baselibs.conf too. +%define soname 1_2-0 +%define sover 1.2 + Name: gupnp -Version: 1.0.4 +Version: 1.2.1 Release: 0 Summary: Implementation of the UPnP specification License: LGPL-2.0-or-later Group: Development/Libraries/C and C++ URL: http://www.gupnp.org/ -Source: http://download.gnome.org/sources/gupnp/1.0/%{name}-%{version}.tar.xz +Source0: https://download.gnome.org/sources/gupnp/1.2/%{name}-%{version}.tar.xz Source1: baselibs.conf + +BuildRequires: gtk-doc +BuildRequires: meson BuildRequires: pkgconfig -# Needed for the GTest -BuildRequires: pkgconfig(glib-2.0) >= 2.40.0 +BuildRequires: pkgconfig(gio-2.0) >= 2.44 +BuildRequires: pkgconfig(glib-2.0) >= 2.44 +BuildRequires: pkgconfig(gmodule-2.0) >= 2.44 +BuildRequires: pkgconfig(gobject-2.0) >= 2.44 BuildRequires: pkgconfig(gobject-introspection-1.0) >= 0.6.4 -BuildRequires: pkgconfig(gssdp-1.0) >= 0.14.15 -BuildRequires: pkgconfig(libsoup-2.4) >= 2.28.2 +BuildRequires: pkgconfig(gssdp-1.2) >= 1.1.3 +BuildRequires: pkgconfig(libsoup-2.4) >= 2.48.0 BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(uuid) BuildRequires: pkgconfig(vapigen) @@ -43,11 +52,11 @@ does not include helpers for construction or control of specific standardized resources (e.g. MediaServer); this is left for higher level libraries utilizing the GUPnP framework. -%package -n libgupnp-1_0-4 +%package -n libgupnp-%{soname} Summary: Implementation of the UPnP specification Group: Development/Libraries/C and C++ -%description -n libgupnp-1_0-4 +%description -n libgupnp-%{soname} GUPnP implements the UPnP specification: resource announcement and discovery, description, control, event notification, and presentation (GUPnP includes basic web server functionality through libsoup). GUPnP @@ -72,7 +81,7 @@ This package provides the GObject Introspection bindings for GUPnP. %package -n libgupnp-devel Summary: Implementation of the UPnP specification - Development Files Group: Development/Libraries/C and C++ -Requires: libgupnp-1_0-4 = %{version} +Requires: libgupnp-%{soname} = %{version} Requires: typelib-1_0-GUPnP-1_0 = %{version} %description -n libgupnp-devel @@ -84,38 +93,42 @@ standardized resources (e.g. MediaServer); this is left for higher level libraries utilizing the GUPnP framework. %prep -%setup -q +%autosetup -p1 %build -%configure --disable-static \ - --with-context-manager=network-manager -make %{?_smp_mflags} +%meson \ + -Dcontext_manager=network-manager \ + -Dintrospection=true \ + -Dvapi=true \ + -Dgtk_doc=true \ + -Dexamples=false \ + %{nil} +%meson_build %install -%make_install -find %{buildroot} -type f -name "*.la" -delete -print +%meson_install -%post -n libgupnp-1_0-4 -p /sbin/ldconfig -%postun -n libgupnp-1_0-4 -p /sbin/ldconfig +%post -n libgupnp-%{soname} -p /sbin/ldconfig +%postun -n libgupnp-%{soname} -p /sbin/ldconfig -%files -n libgupnp-1_0-4 +%files -n libgupnp-%{soname} %license COPYING %doc AUTHORS NEWS README %{_libdir}/*.so.* %files -n typelib-1_0-GUPnP-1_0 -%{_libdir}/girepository-1.0/GUPnP-1.0.typelib +%{_libdir}/girepository-1.0/GUPnP-%{sover}.typelib %files -n libgupnp-devel -%{_bindir}/gupnp-binding-tool -%{_includedir}/%{name}-1.0 +%{_bindir}/gupnp-binding-tool-%{sover} +%{_includedir}/%{name}-%{sover} %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc -%{_datadir}/gir-1.0/GUPnP-1.0.gir +%{_datadir}/gir-1.0/GUPnP-%{sover}.gir %dir %{_datadir}/gtk-doc %dir %{_datadir}/gtk-doc/html %{_datadir}/gtk-doc/html/%{name} -%{_datadir}/vala/vapi/gupnp-1.0.deps -%{_datadir}/vala/vapi/gupnp-1.0.vapi +%{_datadir}/vala/vapi/gupnp-%{sover}.deps +%{_datadir}/vala/vapi/gupnp-%{sover}.vapi %changelog