Accepting request 1324700 from network

Update to 1.13.0

OBS-URL: https://build.opensuse.org/request/show/1324700
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqxmpp?expand=0&rev=43

_multibuild

@@ -1,5 +0,0 @@
-<multibuild>
-  <flavor>qt5</flavor>
-  <flavor>qt6</flavor>
-</multibuild>
-

libqxmpp.changes

@@ -1,3 +1,78 @@
+-------------------------------------------------------------------
+Mon Dec 29 12:04:37 UTC 2025 - Christophe Marin <christophe@krop.fr>
+
+- Update to 1.13.0
+  * Implement XEP-0402: PEP Native Bookmarks
+  * Implement XEP-0421: MUC Occupant IDs
+  * Implement XEP-0486: MUC Avatars
+  * MixManager: New service discovery API, request discovery info
+    and items on our own
+  * HttpUploadManager: Upload component discovery changes
+    * Add support and services properties
+    * Request discovery info and items on our own with new API
+    * Move functionality from UploadRequestManager into
+      HttpUploadManager
+    * Remove dependency on UploadRequestManager
+  * Use new service discovery API in MovedManager,
+    RegistrationManager
+  * Result<T>: Make T QXmpp::Success by default
+  * Result<T>: Add new hasValue/hasError/getValue/getError
+    helper functions
+
+-------------------------------------------------------------------
+Sun Nov 16 09:00:54 UTC 2025 - Christophe Marin <christophe@krop.fr>
+
+- Update to 1.12.0
+  * allManager: Fix use of deprecated requestDiscoInfo()
+  * Fix build with Qt 5
+
+-------------------------------------------------------------------
+Fri Oct 24 10:59:58 UTC 2025 - Christophe Marin <christophe@krop.fr>
+
+- Update to 1.11.3
+  * JmiManager: Fix ID is not set when calling proceed()
+  * HttpUploadManager: Add header containing content type to HTTP
+    request
+  * Fix crash on upload cancellation
+  * Client: e2ee: Fix parsing unencrypted messages as
+    SceSensitive only
+
+-------------------------------------------------------------------
+Wed Sep 17 16:25:49 UTC 2025 - Christophe Marin <christophe@krop.fr>
+
+- Update to 1.11.2
+  * RpcIq: Fix only-whitespace strings are stripped
+  * CMake: Add `BUILD_WITH_QT6` option instead of `QT_VERSION_MAJOR`
+  * JingleIq: Replace reason attribute with optional<Reason>
+  * New voice call example
+  * Implement XEP-0320: Use of DTLS-SRTP in Jingle Sessions
+  * Security and stability improvements by parsing whole stream
+    through QXmlStreamReader internally and creating QDomElements
+    manually
+  * Client/Server: Close connection on unexpected element received
+  * OutgoingClient: Re-create socket on connection errors to avoid
+    race conditions
+  * Big parsing/serialization overhaul
+  * New internal Iq<T> type, separating parsing of IQ and payload
+  * Task: Inline TaskData and use std::optional to avoid
+    additional heap allocation
+  * PubSubIq: Add notify attribute for retraction
+  Breaking changes:
+  * JingleIq::RtpSessionStateMuting: 'isMute' is not initialized
+    by default anymore
+  * ExternalServiceDiscoveryIq: Change port type from `int` to
+    `quint16` to match XEP-0215
+- Stop building the Qt 5 flavor
+
+-------------------------------------------------------------------
+Sun May 25 11:24:59 UTC 2025 - Christophe Marin <christophe@krop.fr>
+
+- Update to 1.10.4
+  * OutgoingClient: Fix not accepting stanzas while enabling SM
+    after bind
+  * OutgoingClient: Include task name in unexpected element
+    received error
+
 -------------------------------------------------------------------
 Tue Apr  1 11:25:21 UTC 2025 - Christophe Marin <christophe@krop.fr>
 

libqxmpp.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package libqxmpp
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2025 SUSE LLC and contributors
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,23 +16,9 @@
 #
 
 
-%global flavor @BUILD_FLAVOR@%{nil}
-%if "%{flavor}" == ""
-ExclusiveArch:  do_not_build
-%endif
-%if "%{flavor}" == "qt5"
-%define qt5 1
-%define pkg_suffix -qt5
-%define lib_suffix Qt5
-%endif
-%if "%{flavor}" == "qt6"
-%define qt6 1
-%define pkg_suffix -qt6
-%define lib_suffix Qt6
-%endif
-%define sover 5
-Name:           libqxmpp%{?pkg_suffix}
-Version:        1.10.3
+%define sover 7
+Name:           libqxmpp
+Version:        1.13.0
 Release:        0
 Summary:        Qt XMPP Library
 License:        LGPL-2.1-or-later
@@ -40,25 +26,9 @@ URL:            https://invent.kde.org/libraries/qxmpp
 Source0:        https://download.kde.org/unstable/qxmpp/qxmpp-%{version}.tar.xz
 Source1:        https://download.kde.org/unstable/qxmpp/qxmpp-%{version}.tar.xz.sig
 Source2:        qxmpp.keyring
-BuildRequires:  cmake
-%if 0%{?qt5}
 BuildRequires:  doxygen
 BuildRequires:  fdupes
-%endif
-# c++-17 is required
-%if 0%{?suse_version} < 1550
-BuildRequires:  gcc13-PIE
-BuildRequires:  gcc13-c++
-%endif
 BuildRequires:  pkgconfig
-%if 0%{?qt5}
-BuildRequires:  cmake(Qca-qt5)
-BuildRequires:  cmake(Qt5Core) >= 5.15.0
-BuildRequires:  cmake(Qt5Gui)
-BuildRequires:  cmake(Qt5Network)
-BuildRequires:  cmake(Qt5Test)
-BuildRequires:  cmake(Qt5Xml)
-%else
 BuildRequires:  cmake(Qca-qt6)
 BuildRequires:  cmake(Qt6Core)
 BuildRequires:  cmake(Qt6Core5Compat)
@@ -66,90 +36,55 @@ BuildRequires:  cmake(Qt6Gui)
 BuildRequires:  cmake(Qt6Network)
 BuildRequires:  cmake(Qt6Test)
 BuildRequires:  cmake(Qt6Xml)
-%endif
 BuildRequires:  pkgconfig(gstreamer-1.0)
 BuildRequires:  pkgconfig(libomemo-c)
 
 %description
 QXmpp is a cross-platform C++ XMPP client library based on Qt and C++.
 
-%package -n libQXmpp%{lib_suffix}-%{sover}
+%package -n libQXmppQt6-%{sover}
 Summary:        Qt XMPP Library
-Provides:       libqxmpp-qt5-0 = %{version}
-Obsoletes:      libqxmpp-qt5-0 < %{version}
-# Renamed in the 1.5.4 release
-%if 0%{?qt5}
-Provides:       libqxmpp4 = %{version}
-Obsoletes:      libqxmpp4 < %{version}
-%endif
 
-%description -n libQXmpp%{lib_suffix}-%{sover}
+%description -n libQXmppQt6-%{sover}
 QXmpp is a cross-platform C++ XMPP client library based on Qt and C++.
 
-%package -n libQXmpp%{lib_suffix}-devel
+%package -n libQXmppQt6-devel
 Summary:        Qxmpp Development Files
-Requires:       libQXmpp%{lib_suffix}-%{sover} = %{version}
-Requires:       libqxmpp-devel = %{version}
+Requires:       libQXmppQt6-%{sover} = %{version}
 Requires:       pkgconfig(gstreamer-1.0)
-%if 0%{?qt5}
-Provides:       libqxmpp-qt5-devel = %{version}
-Obsoletes:      libqxmpp-qt5-devel < %{version}
-%endif
+# Old package for backward compatibility
+Obsoletes:      libqxmpp-devel < %{version}
 
-%description -n libQXmpp%{lib_suffix}-devel
+%description -n libQXmppQt6-devel
 Development package for qxmpp.
 
-%if 0%{?qt5}
-# Backward compatibility module, it can be used for both Qt5 and Qt6 variants
-%package -n libqxmpp-devel
-Summary:        Compatibility helper for libqxmpp
-Requires:       (libQXmppQt5-devel = %{version} if libQt5Core-devel)
-Requires:       (libQXmppQt6-devel = %{version} if qt6-core-devel)
-
-%description -n libqxmpp-devel
-This package provides a backward compatibility helper for CMake users.
-If 'QT_VERSION_MAJOR' is not set in the dependent package, the CMake module
-will try to determine the needed QXmpp variant based on which Qt version was
-already found by CMake.
-
-
-
-
 # No need to build it twice
+
 %package -n libqxmpp-doc
 Summary:        Qxmpp library documentation
 BuildArch:      noarch
 
 %description -n libqxmpp-doc
 This packages provides documentation of Qxmpp library API.
-%endif
 
 %prep
 %autosetup -p1 -n qxmpp-%{version}
 
 %build
-%if 0%{?suse_version} < 1550
-  export CXX=g++-13
-%endif
-
 # Due to the cmake maintainers bad idea, CMAKE_INSTALL_DOCDIR has to be redefined
-%cmake \
+%cmake_qt6 \
   -DWITH_GSTREAMER=ON \
-%if 0%{?qt5}
   -DCMAKE_INSTALL_DOCDIR=%{_datadir}/doc/qxmpp \
   -DBUILD_DOCUMENTATION=ON \
-%endif
   -DBUILD_TESTS=ON \
   -DBUILD_OMEMO=ON
 
-%cmake_build
+%qt6_build
 
 %install
-%cmake_install
+%qt6_install
 
-%if 0%{?qt5}
 %fdupes %{buildroot}%{_datadir}/doc/qxmpp/
-%endif
 
 %check
 export LD_LIBRARY_PATH=%{buildroot}%{_libdir}
@@ -157,31 +92,23 @@ export LD_LIBRARY_PATH=%{buildroot}%{_libdir}
 # Exclude tests needing a network connection
 %{ctest --exclude-regex "tst_(qxmppcallmanager|qxmppiceconnection|qxmppserver|qxmpptransfermanager|qxmppuploadrequestmanager)"}
 
-%ldconfig_scriptlets -n libQXmpp%{lib_suffix}-%{sover}
+%ldconfig_scriptlets -n libQXmppQt6-%{sover}
 
-%files -n libQXmpp%{lib_suffix}-%{sover}
+%files -n libQXmppQt6-%{sover}
 %license LICENSES/*
 %doc AUTHORS CHANGELOG.md README.md
-%{_libdir}/libQXmpp%{lib_suffix}.so.*
-%{_libdir}/libQXmppOmemo%{lib_suffix}.so.*
+%{_libdir}/libQXmppQt6.so.*
+%{_libdir}/libQXmppOmemoQt6.so.*
 
-%files -n libQXmpp%{lib_suffix}-devel
-%{_includedir}/QXmpp%{lib_suffix}/
-%{_libdir}/libQXmpp%{lib_suffix}.so
-%{_libdir}/libQXmppOmemo%{lib_suffix}.so
-%{_libdir}/cmake/QXmpp%{lib_suffix}/
-%{_libdir}/cmake/QXmppOmemo%{lib_suffix}/
-%{_libdir}/pkgconfig/QXmpp%{lib_suffix}.pc
-%if 0%{?qt5}
-%{_libdir}/pkgconfig/qxmpp.pc
-%endif
-
-%if 0%{?qt5}
-%files -n libqxmpp-devel
-%{_libdir}/cmake/QXmpp/
+%files -n libQXmppQt6-devel
+%{_includedir}/QXmppQt6/
+%{_libdir}/cmake/QXmppQt6/
+%{_libdir}/cmake/QXmppOmemoQt6/
+%{_libdir}/libQXmppQt6.so
+%{_libdir}/libQXmppOmemoQt6.so
+%{_libdir}/pkgconfig/QXmppQt6.pc
 
 %files -n libqxmpp-doc
 %{_datadir}/doc/qxmpp/
-%endif
 
 %changelog

qxmpp-1.10.3.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b52eba1c0be650a2b9b0505969db70729a6ded4217f2cc63f609791a77f5efe4
-size 538976

qxmpp-1.10.3.tar.xz.sig

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEA8LRDcl+WwvruPO0RmMjGpGh4nsFAmfkDhsACgkQRmMjGpGh
-4ns8xQ/+M9mxNRhRsKdqzVgUOnX3rqt2qqQK0jUpSdbUj4vVsgTOvA/4sKNDLW62
-SZBhn08qT6DVhSDCLNwR8Bf1OV7VFes+O8pzu5a75i82C1CBn0q4bkDf+P99E0ra
-boK8MhtlRHKSQEWmU1xKYYER8oikZUqHKR0/Y0H2rByilZcEMPiGb7ProSrgi2zv
-fGHXJvh37Wr/11ptv0ZJ7edtVDbbEnOzKgmvfMq6SsZKn50Y1HZiUs9cbfmC+5BO
-ZzVMZ24qyyGYJ1yL3T/LbSni2/S6HhtJx40pGQOmkZwFjc/MvfXSigRxxbrfTMzm
-F+thdmamG6ReQjMdPD2dQRZeMGjD9LPTSwqT1cZo5DZGQFbXKMPJMAaJd/HdrpwS
-IhRzFE4HHkgLth/PP9lYi/fPWVYJr8eP38WFxsGPdwDPT3tL63GqWW0gDVUHPE3q
-XqQ+IXKM67bmtADYf+pX708ShKkw0ZExBF57Kz0zJwLmXzR42z1UMJRQtY8js3zn
-GDzUsoNJd6kITSL7EpiZHCGkMyOKAc8IPx9L2YnqBU67kFGiRWdhDNdMIv1ai+Um
-SE3Qjzs/6vFboxHPC+bEVhPCMsN2wY+wybasfR5NuHPnqV13WDoivOypLVK19W10
-NL6lojSwqRz+nnBtR934BPUEIRloos9c6uCCRbfahWzpz4pizE4=
-=UXbQ
------END PGP SIGNATURE-----

qxmpp-1.13.0.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2aa1fac29e934c15288a22014cae6e3acb0164f908eeddc910bb4f9491dcca75
+size 556712

qxmpp-1.13.0.tar.xz.sig

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEA8LRDcl+WwvruPO0RmMjGpGh4nsFAmlO8KUACgkQRmMjGpGh
+4ntNhA//RGEo52tlIY71TCrFeJQo9aFMSx5Owm0kNuKTN0m8kRIFZZX4/dFsrYU9
+9Jcuf65fvjyTcEGdkEOKMLzNNZdtXSt/xqA736Mm+iXZRN0IXglvj7rJyCZlqxeZ
+lKRhDusgnGkLSllEqe1iluaewq+BoBCbgqaTKdEScWq9RFxrh3T04/asJzjKZ8Ga
+2wHeQjQHL9sUvLYcD6XSZBfZ1bhK1Oz0iQceHVO7FZxOj8u0hC/MKZfM2c/kH+j/
+PVLjQv+I5/PxzBneoSJ2dtgFIDoPybE/ASYfkw/skxrnanWgvPykcPLPPPh0CFvS
+EC/5dXiTXH/oJyn2v4KQZMdhHSUo/uvUtnUIHiVMkAazbhS+Cbo34r30gyHMsnpv
+v+nKqawAt7BZgEawRW9hx+7N4WBdEe75+tsqEdTVzb/LHXRAgNKV944YWLo3u2dK
+qnMTvt/vUNu8QYmoX15kfoatS99Mlw92KznLbUrZWVuNspif2gJ3SVL+6RfV5STJ
+93tvtiLmClaV+hi/L6WR9bxipdKVSSNwUHdpHH9fUOm93uTjy4A4++K7lzCaJyYr
+kMO7Xqkffu9UbgAkjzwmDLyTRv6TMTxc+l4D8X0AmO+Scbtt+a1mjqSMqd9rsDgm
+PdEwvi8yJUCqhC0K2lL1LsK+xhumw1Vfu1ir345XcPc5Rj5QaLI=
+=/V/L
+-----END PGP SIGNATURE-----