Hello community, here is the log from the commit of package libqxmpp for openSUSE:Factory checked in at 2019-05-07 23:19:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqxmpp (Old) and /work/SRC/openSUSE:Factory/.libqxmpp.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libqxmpp" Tue May 7 23:19:13 2019 rev:13 rq:701209 version:1.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libqxmpp/libqxmpp.changes 2015-03-18 13:06:18.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libqxmpp.new.5148/libqxmpp.changes 2019-05-07 23:19:14.928954828 +0200 @@ -1,0 +2,24 @@ +Tue May 7 06:26:41 UTC 2019 - Jan Engelhardt <jengelh@inai.de> + +- Fix SRPM group. + +------------------------------------------------------------------- +Fri May 3 13:21:42 UTC 2019 - Christophe Giboudeaux <christophe@krop.fr> + +- Update to 1.0.0. Changes since 0.8.3: + * Drop Qt4 support + * Fix phone numbers incorrectly read from / written to vCard + * Make QXmppStream handle end of incoming stream + * Allow QXmppJingleIq to have multiple contents. + * Fix QXmppTransferManagerFix convering filename to a QUrl. + * Do not ignore SSL errors by default + * CMake based build system + * Use C++11 compiler standard + Check the CHANGELOG.md file for the complete list of changes +- Drop libqxmpp-qt5 +- Run spec-cleaner +- Drop obsolete patch: libqxmpp-qt5.patch +- Trim marketing filler wording from description. +- Update the license tag to LGPL-2.1-or-later + +------------------------------------------------------------------- Old: ---- libqxmpp-qt5.changes libqxmpp-qt5.patch libqxmpp-qt5.spec v0.8.3.tar.gz New: ---- libqxmpp-1.0.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqxmpp.spec ++++++ --- /var/tmp/diff_new_pack.NfFrFW/_old 2019-05-07 23:19:15.484955996 +0200 +++ /var/tmp/diff_new_pack.NfFrFW/_new 2019-05-07 23:19:15.484955996 +0200 @@ -1,7 +1,7 @@ # # spec file for package libqxmpp # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,77 +12,55 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # -%define build_qt4 1 -%define build_qt5 0 - +%define sover 0 Name: libqxmpp -Version: 0.8.3 +Version: 1.0.0 Release: 0 Summary: Qt XMPP Library -License: LGPL-2.0+ -Group: System/Libraries -Url: http://qxmpp.org -Source0: https://github.com/qxmpp-project/qxmpp/archive/v%{version}.tar.gz +License: LGPL-2.1-or-later +Group: Development/Libraries/C and C++ +URL: https://github.com/qxmpp-project/qxmpp/ +Source0: https://github.com/qxmpp-project/qxmpp/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Source1: baselibs.conf -# PATCH-FEATURE-OPENSUSE to make Qt5 build. -Patch0: libqxmpp-qt5.patch - +BuildRequires: cmake +BuildRequires: doxygen BuildRequires: fdupes -%if %build_qt4 -BuildRequires: pkgconfig(QtCore) -%endif -%if %build_qt5 -BuildRequires: pkgconfig(Qt5Network) -BuildRequires: pkgconfig(Qt5Xml) -%endif +BuildRequires: pkgconfig +BuildRequires: cmake(Qt5Core) +BuildRequires: cmake(Qt5Gui) +BuildRequires: cmake(Qt5Network) +BuildRequires: cmake(Qt5Test) +BuildRequires: cmake(Qt5Xml) BuildRequires: pkgconfig(opus) BuildRequires: pkgconfig(speex) BuildRequires: pkgconfig(theora) BuildRequires: pkgconfig(vpx) %description -QXmpp is a cross-platform C++ XMPP client library. It is based on Qt and C++. - -QXmpp is pretty intuitive and easy to use. It uses Qt extensively. Qt is the only -third party library it is dependent on. Users need to a have working knowledge of -C++ and Qt basics (Signals and Slots and Qt data types). The underlying TCP socket -and the XMPP RFCs (RFC3920 and RFC3921) have been encapsulated into classes and -functions. Therefore the user would not be bothered with these details. But it is -always recommended to the advanced users to read and enjoy the low level details. +QXmpp is a cross-platform C++ XMPP client library based on Qt and C++. -%package -n %{name}0 +%package -n %{name}%{sover} Summary: Qt XMPP Library Group: System/Libraries +Provides: libqxmpp-qt5-0 = %{version} +Obsoletes: libqxmpp-qt5-0 < %{version} -%description -n %{name}0 -QXmpp is a cross-platform C++ XMPP client library. It is based on Qt and C++. - -QXmpp is pretty intuitive and easy to use. It uses Qt extensively. Qt is the only -third party library it is dependent on. Users need to a have working knowledge of -C++ and Qt basics (Signals and Slots and Qt data types). The underlying TCP socket -and the XMPP RFCs (RFC3920 and RFC3921) have been encapsulated into classes and -functions. Therefore the user would not be bothered with these details. But it is -always recommended to the advanced users to read and enjoy the low level details. +%description -n %{name}%{sover} +QXmpp is a cross-platform C++ XMPP client library based on Qt and C++. %package -n %{name}-devel - Summary: Qxmpp Development Files Group: Development/Libraries/C and C++ -%if %build_qt4 -Requires: %{name}0 = %{version} -%endif -%if %build_qt5 -Requires: %{name}-0 = %{version} -%endif +Requires: %{name}%{sover} = %{version} +Provides: libqxmpp-qt5-devel = %{version} +Obsoletes: libqxmpp-qt5-devel < %{version} %description -n %{name}-devel -It's a development package for qxmpp. - -QXmpp is a cross-platform C++ XMPP client library. It is based on Qt and C++. +Development package for qxmpp. %package doc Summary: Qxmpp library documentation @@ -94,61 +72,47 @@ %prep %setup -q -n qxmpp-%{version} -%if %build_qt5 -%patch0 -p1 -%endif -# A hack vs. "E: arch-independent-package-contains-binary-or-object" -# after %%check. -cp -r examples doc/ +# Disable tests needing a network connection +sed -i 's,add_simple_test(qxmppserver),#add_simple_test(qxmppserver),' tests/CMakeLists.txt +sed -i 's,add_simple_test(qxmppcallmanager),#add_simple_test(qxmppcallmanager),' tests/CMakeLists.txt +sed -i 's,add_simple_test(qxmppiceconnection),#add_simple_test(qxmppiceconnection),' tests/CMakeLists.txt +sed -i 's,add_subdirectory(qxmpptransfermanager),#add_subdirectory(qxmpptransfermanager),' tests/CMakeLists.txt %build -%if %build_qt4 -qmake \ -%endif -%if %build_qt5 -qmake-qt5 \ -%endif - PREFIX=%{_prefix} \ - LIBDIR=%{_lib} \ - QMAKE_STRIP="" \ - QMAKE_CXXFLAGS+="%{optflags}" \ - QXMPP_USE_OPUS=1 \ - QXMPP_USE_SPEEX=1 \ - QXMPP_USE_THEORA=1 \ - QXMPP_USE_VPX=1 +%cmake \ + -DWITH_SPEEX=ON \ + -DWITH_OPUS=ON \ + -DWITH_THEORA=ON \ + -DWITH_VPX=ON \ + -DBUILD_DOCUMENTATION=ON \ + -DBUILD_EXAMPLES=ON \ + -DBUILD_TESTS=ON -make V=1 %{?_smp_mflags} +%cmake_build %install -%makeinstall INSTALL_ROOT=%{buildroot} +%cmake_install %fdupes %{buildroot}%{_datadir}/doc/qxmpp/ %check -make V=1 %{?_smp_mflags} check - -%post -n %{name}0 -p /sbin/ldconfig +export LD_LIBRARY_PATH=%{buildroot}%{_libdir} +%ctest -%postun -n %{name}0 -p /sbin/ldconfig +%post -n %{name}%{sover} -p /sbin/ldconfig +%postun -n %{name}%{sover} -p /sbin/ldconfig -%files -n %{name}0 -%defattr(-,root,root) -%doc AUTHORS CHANGELOG LICENSE.LGPL README* +%files -n %{name}%{sover} +%license LICENSE.LGPL +%doc AUTHORS CHANGELOG.md README.md %{_libdir}/%{name}.so.* %files -n %{name}-devel -%defattr(-,root,root) +%{_includedir}/qxmpp/ %{_libdir}/%{name}.so -%if %build_qt4 -%{_includedir}/qxmpp +%{_libdir}/cmake/qxmpp/ %{_libdir}/pkgconfig/qxmpp.pc -%endif -%if %build_qt5 -%{_includedir}/qxmpp-qt5 -%{_libdir}/pkgconfig/qxmpp-qt5.pc -%endif %files doc -%defattr(-,root,root) -%doc doc/examples +%{_datadir}/doc/qxmpp/ %changelog