commit quassel for openSUSE:Factory
Hello community, here is the log from the commit of package quassel for openSUSE:Factory checked in at 2018-04-27 16:07:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/quassel (Old) and /work/SRC/openSUSE:Factory/.quassel.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "quassel" Fri Apr 27 16:07:48 2018 rev:37 rq:600829 version:0.12.5 Changes: -------- --- /work/SRC/openSUSE:Factory/quassel/quassel.changes 2017-11-24 10:56:51.271060789 +0100 +++ /work/SRC/openSUSE:Factory/.quassel.new/quassel.changes 2018-04-27 16:08:02.909094093 +0200 @@ -1,0 +2,9 @@ +Wed Apr 25 07:56:26 UTC 2018 - tchvatal@suse.com + +- Version update to 0.12.4: + * Various small fixes + * Fix for DOS and information leaks bsc#1090495 +- Rebase patch quassel-set-required-libs-and-flags.patch +- Switch from qt5webkit to webengine + +------------------------------------------------------------------- Old: ---- quassel-0.12.4.tar.bz2 New: ---- quassel-0.12.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ quassel.spec ++++++ --- /var/tmp/diff_new_pack.G23SVv/_old 2018-04-27 16:08:03.653066805 +0200 +++ /var/tmp/diff_new_pack.G23SVv/_new 2018-04-27 16:08:03.657066658 +0200 @@ -1,7 +1,7 @@ # # spec file for package quassel # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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 @@ -18,16 +18,15 @@ #Compat macro for new _fillupdir macro introduced in Nov 2017 %if ! %{defined _fillupdir} - %define _fillupdir /var/adm/fillup-templates + %define _fillupdir %{_localstatedir}/adm/fillup-templates %endif - Name: quassel -Version: 0.12.4 +Version: 0.12.5 Release: 0 Summary: Modern, cross-platform, distributed IRC client -License: GPL-2.0 or GPL-3.0 +License: GPL-2.0-only OR GPL-3.0-only Group: Productivity/Networking/IRC -Url: http://quassel-irc.org/ +URL: http://quassel-irc.org/ Source: http://%{name}-irc.org/pub/%{name}-%{version}.tar.bz2 Source1: service.%{name}core Source2: sysconfig.%{name}core @@ -48,22 +47,21 @@ BuildRequires: knotifyconfig-devel BuildRequires: ktextwidgets-devel BuildRequires: kxmlgui-devel -BuildRequires: phonon4qt5-devel +BuildRequires: pkgconfig BuildRequires: snorenotify-qt5-devel >= 0.7 -BuildRequires: systemd BuildRequires: cmake(Qt5LinguistTools) BuildRequires: pkgconfig(Qt5Core) >= 5.2.0 BuildRequires: pkgconfig(Qt5Gui) BuildRequires: pkgconfig(Qt5Network) BuildRequires: pkgconfig(Qt5Script) BuildRequires: pkgconfig(Qt5Sql) -BuildRequires: pkgconfig(Qt5WebKit) -BuildRequires: pkgconfig(Qt5WebKitWidgets) +BuildRequires: pkgconfig(Qt5WebEngine) BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(dbusmenu-qt5) +BuildRequires: pkgconfig(phonon4qt5) BuildRequires: pkgconfig(qca2-qt5) +BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(zlib) -BuildRoot: %{_tmppath}/%{name}-%{version}-build %{?systemd_requires} %description @@ -182,10 +180,10 @@ FAKE_BUILDTIME=$(LC_ALL=C date -r %{_sourcedir}/%{name}.changes '+%%H:%%M:%%S') sed -i "s/__TIME__/\"$FAKE_BUILDTIME\"/" src/common/quassel.cpp -%cmake_kf5 -d build -- -DUSE_QT5=ON -DWITH_WEBKIT=ON -DWITH_KDE=ON +%cmake_kf5 -d build -- -DUSE_QT5=ON -DWITH_WEBENGINE=ON -DWITH_KDE=ON make %{?_smp_mflags} cd .. -%cmake_kf5 -d build-qt5 -- -DUSE_QT5=ON -DWITH_WEBKIT=ON -DWITH_KDE=OFF +%cmake_kf5 -d build-qt5 -- -DUSE_QT5=ON -DWITH_WEBENGINE=ON -DWITH_KDE=OFF make %{?_smp_mflags} %install @@ -227,11 +225,13 @@ %postun core %service_del_postun quasselcore.service +%if 0%{?suse_version} < 1500 %post base %icon_theme_cache_post %postun base %icon_theme_cache_postun +%endif %post client update-alternatives --install %{_bindir}/quasselclient quasselclient %{_bindir}/quasselclient-kde 20 @@ -250,28 +250,24 @@ fi %files mono -%defattr(-,root,root) -%doc AUTHORS ChangeLog README +%doc AUTHORS ChangeLog README.md %{_datadir}/applications/%{name}.desktop %{_bindir}/%{name} %files client -%defattr(-,root,root) -%doc AUTHORS ChangeLog README +%doc AUTHORS ChangeLog README.md %{_bindir}/%{name}client-kde %ghost %{_sysconfdir}/alternatives/quasselclient %{_bindir}/%{name}client %files client-qt5 -%defattr(-,root,root) -%doc AUTHORS ChangeLog README +%doc AUTHORS ChangeLog README.md %{_bindir}/%{name}client-qt5 %ghost %{_sysconfdir}/alternatives/quasselclient %{_bindir}/%{name}client %files core -%defattr(-,root,root) -%doc AUTHORS ChangeLog README +%doc AUTHORS ChangeLog README.md %{_bindir}/%{name}core %{_sbindir}/rc%{name}core %{_unitdir}/%{name}core.service @@ -282,7 +278,7 @@ %{_fillupdir}/sysconfig.%{name}core %files base -%defattr(-,root,root) +%license COPYING %{_datadir}/applications/%{name}client.desktop %{_datadir}/pixmaps/%{name}.png %dir %{_datadir}/%{name} ++++++ quassel-0.12.4.tar.bz2 -> quassel-0.12.5.tar.bz2 ++++++ ++++ 115663 lines of diff (skipped) ++++++ quassel-set-required-libs-and-flags.patch ++++++ --- /var/tmp/diff_new_pack.G23SVv/_old 2018-04-27 16:08:05.780988754 +0200 +++ /var/tmp/diff_new_pack.G23SVv/_new 2018-04-27 16:08:05.788988460 +0200 @@ -1,13 +1,13 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2c29af4..c3a7992 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -427,6 +427,8 @@ endif() +Index: quassel-0.12.5/CMakeLists.txt +=================================================================== +--- quassel-0.12.5.orig/CMakeLists.txt ++++ quassel-0.12.5/CMakeLists.txt +@@ -465,6 +465,8 @@ endif() # a small test program checking the defines. This works for both Qt4 and Qt5. cmake_push_check_state(RESET) set(CMAKE_REQUIRED_INCLUDES ${QT_INCLUDES} ${Qt5Core_INCLUDE_DIRS}) +set(CMAKE_REQUIRED_FLAGS ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}) +set(CMAKE_REQUIRED_LIBRARIES ${Qt5Core_LIBRARIES}) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}") - check_cxx_source_compiles(" - #include \"qglobal.h\" + + if (USE_QT5 AND Qt5_POSITION_INDEPENDENT_CODE)
participants (1)
-
root@hilbert.suse.de