Accepting request 1002666 from GNOME:Next

GNOME 43.rc - let's get this into Staging to see what we break (e.g meson:test seems to be an issue already) OBS-URL: https://build.opensuse.org/request/show/1002666 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gupnp?expand=0&rev=126
2022-09-13 07:35:27 +00:00 · 2022-09-13 07:35:27 +00:00 · aff6c2dc93
commit aff6c2dc93
parent 166b142e06
6 changed files with 139 additions and 30 deletions
--- a/baselibs.conf
+++ b/baselibs.conf
@ -1 +1 @@
-libgupnp-1_2-1
+libgupnp-1_6-0
--- a/gupnp-1.4.3.tar.xz
+++ b/gupnp-1.4.3.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:14eda777934da2df743d072489933bd9811332b7b5bf41626b8032efb28b33ba
-size 154812
--- a/gupnp-1.5.4.tar.xz
+++ b/gupnp-1.5.4.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:988329157c351252ae07baad8aaebf10a7cb55a642c22d613aa85ba74c051b78
+size 2211932
--- a/gupnp-build-man-pages.patch
+++ b/gupnp-build-man-pages.patch
@ -1,10 +0,0 @@
--- orig-gupnp-1.4.2/doc/meson.build	2022-01-08 11:01:21.196516000 +0100
-+++ gupnp-1.4.2/doc/meson.build	2022-01-08 13:13:33.498056150 +0100
-@@ -66,7 +66,6 @@
-             xsltproc,
-             xlstproc_flags,
-             '--noout',
-            '--nowrite',
-             stylesheet,
-             'gupnp-binding-tool.xml'
-         ]
--- a/gupnp.changes
+++ b/gupnp.changes
@ -1,3 +1,112 @@
+-------------------------------------------------------------------
+Sat Sep  3 13:34:03 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 1.5.4:
+  + Fix build against libsoup 3.1.2 or later
+  + Do not rely on a log message from libsoup in tests
+  + Use Docbook 4.5 for manpage
+  + Do not use env in binding generator
+  + Add missing libxml2 dependency for test
+- Drop 1296d10eda308792d2924f141d72b8b6818878bd.patch: Fixed
+  upstream.
+
+-------------------------------------------------------------------
+Sat Aug 27 18:55:45 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 1.5.3:
+  + Linux context manager: Do not filter out v6 global addresses
+  + Context: Add new convenience constructors
+  + Examples: Fix browse.js for new API
+  + NetworkManager: Create v4 and v6 contexts if no family is
+    specified
+  + Connman: Create v4 and v6 contexts if no family is specified
+- Changes from version 1.5.2:
+  + Minor doc improvements
+  + Minor example fixes
+  + Fix pkg-config dependencies
+  + Fix issues found by coverity
+  + Deprecate internal UUID generator function
+  + Set log domains everywhere
+  + Support IPv6 in all context managers (Windows still broken)
+  + ServiceProxy:
+    - Fix error handling in sync call
+    - Fix a memory leak in subscribe()
+    - Change subscribtion timeout handling
+  + ServiceInfo: Remove deprecated callback
+  + ContextFilter:
+    - Fix it
+    - Notify only if content changes
+  + DeviceInfo: Set task names
+  + ContextManager:
+    - Add tests for filtering
+    - Fix behaviour of filter. Now the filter acts as if the
+      context is appearing/disappearing
+  + Vala: Fix ownership of XML doc
+  + Bugs fixed: glgo#GNOME#gupnp#10, glgo#GNOME#gupnp#10,
+    glgo#GNOME#gupnp#10, glgo#GNOME#gupnp#36, glgo#GNOME#gupnp#37,
+    glgo#GNOME#gupnp#70.
+- Changes from version 1.5.1:
+  + Minor doc fixes
+  + Remove left-overs from WhiteList renaming
+  + Make tests a little friendlier if there is no ipv6
+  + Fix a couple of issues from scan-build
+  + DeviceInfo:
+    - Make DeviceInfo:document accessible
+    - Offer convenience function DeviceInfo:get_icon_async to
+      combine icon lookup and icon download
+  + ServiceAction:
+    - Potential fix for running g_clear_pointer on an uninitialized
+      value
+    - Fix getting parameters from action
+  + ServiceInfo:
+    - Do not free an error that was propagated
+    - Fix introspection on IPv6 devices
+  + Service: Fix critical if Soup error other than
+    G_IO_ERROR_CANCELLED occured
+- Changes from version 1.5.0:
+  + Port to libsoup3
+  + API bump (1.6)
+  + Improved test coverage
+  + All _valist functions have been removed
+  + The documentation is now provided by gi-docgen
+  + All API that was marked as deprecated up until 1.4 has been
+    removed
+  + ServiceIntrospection: is now a GInitable
+  + Context:
+    - Uses GSSDP.Client:port
+    - Fix reference leak when using ACL
+  + DeviceInfo: The get_device() and get_service() virtual
+    functions have been renamed
+  + ServiceAction:
+    - ServiceAction::return() was renamed to
+      ServiceAction::return_success() to avoid issues with
+      languages such as python.
+  + ServiceInfo: Non-gio style introspection functions are now
+    deprecated
+  + Service: Returns a proper error instead of calling g_error when
+    autoconnect fails
+  + ServiceProxy:
+    - Fixes an issue with M-POST fall-back if POST calls failed
+    - There is no need anymore to call ServiceProxyAction::get() to
+      get SOAP transport errors; those will now be already
+      presented by the ServiceProxy::call_action_finish() call.
+  + Bugs fixed: glgo#GNOME#gupnp#58, glgo#GNOME#gupnp#42,
+    glgo#GNOME#gupnp#52, glgo#GNOME#gupnp#53, glgo#GNOME#gupnp#54,
+    glgo#GNOME#gupnp#58, glgo#GNOME#gupnp#60, glgo#GNOME#gupnp#61,
+    glgo#GNOME#gupnp#63.
+- Replace gtk-doc, pkgconfig(gssdp-1.2) and pkgconfig(libsoup-2.4)
+  with docbook-xsl-stylesheets, xsltproc, pkgconfig(gi-docgen),
+  pkgconfig(gssdp-1.6) and pkgconfig(libsoup-3.0) BuildRequires
+  following upstream changes.
+- Bump soname and sover following upstream changes, also in
+  baselibs.conf.
+- Use ldconfig_scriptlets macro for post(un) handling.
+- Drop gupnp-build-man-pages.patch: Fixed upstream.
+- Add 1296d10eda308792d2924f141d72b8b6818878bd.patch: Fix build
+  against Soup 3.1.2 and later
+- Package docs in default docdir ref openSUSE standard and split it
+  out in a doc subpackage.
+
 -------------------------------------------------------------------
 Fri Jan 14 17:40:58 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>

--- a/gupnp.spec
+++ b/gupnp.spec
@ -17,31 +17,31 @@


 # When bumping soname, do not forget to bump in baselibs.conf too.
-%define soname 1_2-1
-%define sover 1.2
+%define soname 1_6-0
+%define sover 1.6

 Name:           gupnp
-Version:        1.4.3
+Version:        1.5.4
 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/
-Source0:        https://download.gnome.org/sources/gupnp/1.4/%{name}-%{version}.tar.xz
+Source0:        https://download.gnome.org/sources/gupnp/1.5/%{name}-%{version}.tar.xz
 Source1:        baselibs.conf
-# PATCH-FIX-UPSTREAM gupnp-build-man-pages.patch -- Build and install the manpage
-Patch0:         gupnp-build-man-pages.patch

-BuildRequires:  gtk-doc
+BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  meson >= 0.54.0
 BuildRequires:  pkgconfig
+BuildRequires:  xsltproc
+BuildRequires:  pkgconfig(gi-docgen)
 BuildRequires:  pkgconfig(gio-2.0) >= 2.66
 BuildRequires:  pkgconfig(glib-2.0) >= 2.66
 BuildRequires:  pkgconfig(gmodule-2.0) >= 2.66
 BuildRequires:  pkgconfig(gobject-2.0) >= 2.66
 BuildRequires:  pkgconfig(gobject-introspection-1.0) >= 0.6.4
-BuildRequires:  pkgconfig(gssdp-1.2) >= 1.3.0
-BuildRequires:  pkgconfig(libsoup-2.4) >= 2.48.0
+BuildRequires:  pkgconfig(gssdp-1.6)
+BuildRequires:  pkgconfig(libsoup-3.0)
 BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(uuid)
 BuildRequires:  pkgconfig(vapigen)
@ -82,6 +82,13 @@ libraries utilizing the GUPnP framework.

 This package provides the GObject Introspection bindings for GUPnP.

+%package doc
+Summary:        Documentation for %{name}
+BuildArch:      noarch
+
+%description doc
+Documentation for GUPnP.
+
 %package -n libgupnp-devel
 Summary:        Implementation of the UPnP specification - Development Files
 Group:          Development/Libraries/C and C++
@ -98,7 +105,7 @@ libraries utilizing the GUPnP framework.

 %prep
 %autosetup -p1
-sed -i 's|env python3|python3|' tools/gupnp-binding-tool-1.2
+sed -i 's|env python3|python3|' tools/gupnp-binding-tool

 %build
 %meson \
@ -112,9 +119,12 @@ sed -i 's|env python3|python3|' tools/gupnp-binding-tool-1.2

 %install
 %meson_install
+# Make default docdir ref openSUSE standard
+mkdir -p %{buildroot}%{_docdir}/%{name}-%{sover}
+# Move docs from upstream docdir to openSUSE docdir standard
+mv %{buildroot}%{_datadir}/doc/%{name}-%{sover} %{buildroot}%{_docdir}

-%post -n libgupnp-%{soname} -p /sbin/ldconfig
-%postun -n libgupnp-%{soname} -p /sbin/ldconfig
+%ldconfig_scriptlets -n libgupnp-%{soname}

 %files -n libgupnp-%{soname}
 %license COPYING
@ -124,16 +134,16 @@ sed -i 's|env python3|python3|' tools/gupnp-binding-tool-1.2
 %files -n typelib-1_0-GUPnP-1_0
 %{_libdir}/girepository-1.0/GUPnP-%{sover}.typelib

+%files doc
+%doc %{_docdir}/%{name}-%{sover}
+
 %files -n libgupnp-devel
-%{_mandir}/man1/gupnp-binding-tool-1.2.1%{?ext_man}
+%{_mandir}/man1/gupnp-binding-tool-1.6.1%{?ext_man}
 %{_bindir}/gupnp-binding-tool-%{sover}
 %{_includedir}/%{name}-%{sover}
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
 %{_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-%{sover}.deps
 %{_datadir}/vala/vapi/gupnp-%{sover}.vapi