Hello community, here is the log from the commit of package psi+ for openSUSE:Factory checked in at 2015-05-02 21:41:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/psi+ (Old) and /work/SRC/openSUSE:Factory/.psi+.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "psi+" Changes: -------- --- /work/SRC/openSUSE:Factory/psi+/psi+.changes 2015-04-21 10:54:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.psi+.new/psi+.changes 2015-05-02 21:41:14.000000000 +0200 @@ -1,0 +2,8 @@ +Fri Apr 24 14:34:21 UTC 2015 - [email protected] + +- update to 20150423 + * updated translations + * some bugfixes +- removed kill-Q_WS_X11.patch (in upstream) + +------------------------------------------------------------------- Old: ---- kill-Q_WS_X11.patch psi+-20150227.tar.xz New: ---- psi+-20150423.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ psi+.spec ++++++ --- /var/tmp/diff_new_pack.ntjJ1P/_old 2015-05-02 21:41:15.000000000 +0200 +++ /var/tmp/diff_new_pack.ntjJ1P/_new 2015-05-02 21:41:15.000000000 +0200 @@ -15,33 +15,34 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %if 0%{?suse_version} > 1320 #%%define with_qt5 1 %endif Name: psi+ Url: http://code.google.com/p/psi-dev/ -Version: 20150227 +Version: 20150423 Release: 0 Summary: Jabber client using Qt License: GPL-2.0+ Group: Productivity/Networking/Talk/Clients Source0: psi+-%{version}.tar.xz Source1: psi-plus-l10n-1.tar.xz -Patch0: kill-Q_WS_X11.patch Patch1: proper-activate.patch Patch2: qt55-build-fixes.patch Patch100: qca-qt5.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: aspell-devel BuildRequires: fdupes +BuildRequires: gcc-c++ BuildRequires: gdb BuildRequires: libidn-devel -BuildRequires: libproxy-devel BuildRequires: libotr-devel -BuildRequires: gcc-c++ +BuildRequires: libproxy-devel %if 0%{?with_qt5} -BuildRequires: pkgconfig(qca2-qt5) +BuildRequires: libqt5-linguist +BuildRequires: qconf BuildRequires: pkgconfig(Qt5Concurrent) BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5DBus) @@ -53,11 +54,10 @@ BuildRequires: pkgconfig(Qt5WebKitWidgets) BuildRequires: pkgconfig(Qt5X11Extras) BuildRequires: pkgconfig(Qt5Xml) -BuildRequires: libqt5-linguist -BuildRequires: qconf +BuildRequires: pkgconfig(qca2-qt5) %else -BuildRequires: libqca2-devel BuildRequires: libQtWebKit-devel +BuildRequires: libqca2-devel BuildRequires: libqt4-devel >= 4.7.0 %endif BuildRequires: libtidy-devel @@ -334,7 +334,6 @@ %prep %setup -q -b 1 -%patch0 -p1 %patch1 -p1 %patch2 -p1 ++++++ psi+-20150227.tar.xz -> psi+-20150423.tar.xz ++++++ /work/SRC/openSUSE:Factory/psi+/psi+-20150227.tar.xz /work/SRC/openSUSE:Factory/.psi+.new/psi+-20150423.tar.xz differ: char 26, line 1 ++++++ qca-qt5.patch ++++++ --- /var/tmp/diff_new_pack.ntjJ1P/_old 2015-05-02 21:41:15.000000000 +0200 +++ /var/tmp/diff_new_pack.ntjJ1P/_new 2015-05-02 21:41:15.000000000 +0200 @@ -1,4 +1,5 @@ From: Jiri Slaby <[email protected]> +Subject: use qca-qt5 for qt5 qca for qt5 is named qca-qt5, not qca. Fix this. --- ++++++ qt55-build-fixes.patch ++++++ --- /var/tmp/diff_new_pack.ntjJ1P/_old 2015-05-02 21:41:15.000000000 +0200 +++ /var/tmp/diff_new_pack.ntjJ1P/_new 2015-05-02 21:41:15.000000000 +0200 @@ -1,11 +1,9 @@ --- - src/activeprofiles.h | 1 + - src/capabilities/capsregistry.h | 1 + - src/libpsi/tools/simplecli/simplecli.h | 2 ++ - src/plugins/generic/cleanerplugin/optionsparser.h | 1 + - src/plugins/generic/juickplugin/juickparser.cpp | 1 + - src/plugins/include/stanzasendinghost.h | 2 ++ - 6 files changed, 8 insertions(+) + src/activeprofiles.h | 1 + + src/capabilities/capsregistry.h | 1 + + src/libpsi/tools/simplecli/simplecli.h | 2 ++ + src/plugins/include/stanzasendinghost.h | 2 ++ + 4 files changed, 6 insertions(+) --- a/src/activeprofiles.h +++ b/src/activeprofiles.h @@ -39,26 +37,6 @@ #include <QStringList> class SimpleCli : public QObject ---- a/src/plugins/generic/cleanerplugin/optionsparser.h -+++ b/src/plugins/generic/cleanerplugin/optionsparser.h -@@ -23,6 +23,7 @@ - - #include <QDomElement> - #include <QMap> -+#include <QObject> - #include <QStringList> - - class OptionsParser : public QObject ---- a/src/plugins/generic/juickplugin/juickparser.cpp -+++ b/src/plugins/generic/juickplugin/juickparser.cpp -@@ -19,6 +19,7 @@ - */ - - #include <QDateTime> -+#include <QObject> - #include "juickparser.h" - - static const QString juickLink("http://juick.com/%1";); --- a/src/plugins/include/stanzasendinghost.h +++ b/src/plugins/include/stanzasendinghost.h @@ -1,6 +1,8 @@
