From d172a856d8dd7f63ce639127ae47d994f304c244e87d22dfcc30b5d16417e4a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 25 Apr 2018 07:59:34 +0000 Subject: [PATCH 1/3] - Version update to 0.12.4: * Various small fixes * Fix for DOS and information leaks bsc#1090495 OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/quassel?expand=0&rev=54 --- quassel-0.12.4.tar.bz2 | 3 --- quassel-0.12.5.tar.bz2 | 3 +++ quassel.changes | 7 +++++++ quassel.spec | 23 +++++++++-------------- 4 files changed, 19 insertions(+), 17 deletions(-) delete mode 100644 quassel-0.12.4.tar.bz2 create mode 100644 quassel-0.12.5.tar.bz2 diff --git a/quassel-0.12.4.tar.bz2 b/quassel-0.12.4.tar.bz2 deleted file mode 100644 index ecaa105..0000000 --- a/quassel-0.12.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:93e4e54cb3743cbe2e5684c2fcba94fd2bc2cd739f7672dee14341b49c29444d -size 3742639 diff --git a/quassel-0.12.5.tar.bz2 b/quassel-0.12.5.tar.bz2 new file mode 100644 index 0000000..54f383a --- /dev/null +++ b/quassel-0.12.5.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1894574dfd79654152a5b7427e7df592b055ae908230504f98a4cb48961e74e2 +size 3747392 diff --git a/quassel.changes b/quassel.changes index dd83b34..e610d64 100644 --- a/quassel.changes +++ b/quassel.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +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 + ------------------------------------------------------------------- Thu Nov 23 13:53:34 UTC 2017 - rbrown@suse.com diff --git a/quassel.spec b/quassel.spec index 26a7f69..9a692ba 100644 --- a/quassel.spec +++ b/quassel.spec @@ -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 @@ -49,6 +48,7 @@ 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) @@ -63,7 +63,6 @@ BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(dbusmenu-qt5) BuildRequires: pkgconfig(qca2-qt5) BuildRequires: pkgconfig(zlib) -BuildRoot: %{_tmppath}/%{name}-%{version}-build %{?systemd_requires} %description @@ -183,10 +182,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 -make %{?_smp_mflags} +%make_build cd .. %cmake_kf5 -d build-qt5 -- -DUSE_QT5=ON -DWITH_WEBKIT=ON -DWITH_KDE=OFF -make %{?_smp_mflags} +%make_build %install %kf5_makeinstall -C build @@ -250,27 +249,23 @@ if [ $1 -eq 0 ] ; then fi %files mono -%defattr(-,root,root) %doc AUTHORS ChangeLog README %{_datadir}/applications/%{name}.desktop %{_bindir}/%{name} %files client -%defattr(-,root,root) %doc AUTHORS ChangeLog README %{_bindir}/%{name}client-kde %ghost %{_sysconfdir}/alternatives/quasselclient %{_bindir}/%{name}client %files client-qt5 -%defattr(-,root,root) %doc AUTHORS ChangeLog README %{_bindir}/%{name}client-qt5 %ghost %{_sysconfdir}/alternatives/quasselclient %{_bindir}/%{name}client %files core -%defattr(-,root,root) %doc AUTHORS ChangeLog README %{_bindir}/%{name}core %{_sbindir}/rc%{name}core @@ -282,7 +277,7 @@ fi %{_fillupdir}/sysconfig.%{name}core %files base -%defattr(-,root,root) +%license COPYING %{_datadir}/applications/%{name}client.desktop %{_datadir}/pixmaps/%{name}.png %dir %{_datadir}/%{name} From d75b7d9b955cafdeb50602713c46caa7be243b5476ac92b3d3b4881ee3f9a90a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 25 Apr 2018 08:21:39 +0000 Subject: [PATCH 2/3] - Rebase patch quassel-set-required-libs-and-flags.patch - Switch from qt5webkit to webengine OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/quassel?expand=0&rev=55 --- quassel-set-required-libs-and-flags.patch | 14 +++++++------- quassel.changes | 2 ++ quassel.spec | 21 +++++++++++---------- 3 files changed, 20 insertions(+), 17 deletions(-) diff --git a/quassel-set-required-libs-and-flags.patch b/quassel-set-required-libs-and-flags.patch index 62a827e..c950b94 100644 --- a/quassel-set-required-libs-and-flags.patch +++ b/quassel-set-required-libs-and-flags.patch @@ -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) diff --git a/quassel.changes b/quassel.changes index e610d64..b055030 100644 --- a/quassel.changes +++ b/quassel.changes @@ -4,6 +4,8 @@ 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 ------------------------------------------------------------------- Thu Nov 23 13:53:34 UTC 2017 - rbrown@suse.com diff --git a/quassel.spec b/quassel.spec index 9a692ba..63d46da 100644 --- a/quassel.spec +++ b/quassel.spec @@ -47,21 +47,20 @@ BuildRequires: knotifications-devel 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) %{?systemd_requires} @@ -181,10 +180,10 @@ sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" src/common/quassel.cpp 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_build 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_build %install @@ -226,11 +225,13 @@ install -D -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2. %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 @@ -249,24 +250,24 @@ if [ $1 -eq 0 ] ; then fi %files mono -%doc AUTHORS ChangeLog README +%doc AUTHORS ChangeLog README.md %{_datadir}/applications/%{name}.desktop %{_bindir}/%{name} %files client -%doc AUTHORS ChangeLog README +%doc AUTHORS ChangeLog README.md %{_bindir}/%{name}client-kde %ghost %{_sysconfdir}/alternatives/quasselclient %{_bindir}/%{name}client %files client-qt5 -%doc AUTHORS ChangeLog README +%doc AUTHORS ChangeLog README.md %{_bindir}/%{name}client-qt5 %ghost %{_sysconfdir}/alternatives/quasselclient %{_bindir}/%{name}client %files core -%doc AUTHORS ChangeLog README +%doc AUTHORS ChangeLog README.md %{_bindir}/%{name}core %{_sbindir}/rc%{name}core %{_unitdir}/%{name}core.service From ce35547a8a8a17010e0efecb187af1314b6c6fac8c4a53fa8d269eed77b3e6c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 25 Apr 2018 08:27:37 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/quassel?expand=0&rev=56 --- quassel.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/quassel.spec b/quassel.spec index 63d46da..5f95b9d 100644 --- a/quassel.spec +++ b/quassel.spec @@ -181,10 +181,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_WEBENGINE=ON -DWITH_KDE=ON -%make_build +make %{?_smp_mflags} cd .. %cmake_kf5 -d build-qt5 -- -DUSE_QT5=ON -DWITH_WEBENGINE=ON -DWITH_KDE=OFF -%make_build +make %{?_smp_mflags} %install %kf5_makeinstall -C build