Hello community, here is the log from the commit of package appmenu-qt for openSUSE:Factory checked in at 2014-02-02 18:08:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/appmenu-qt (Old) and /work/SRC/openSUSE:Factory/.appmenu-qt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "appmenu-qt" Changes: -------- --- /work/SRC/openSUSE:Factory/appmenu-qt/appmenu-qt.changes 2013-01-20 11:56:21.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.appmenu-qt.new/appmenu-qt.changes 2014-02-02 18:08:13.000000000 +0100 @@ -1,0 +2,10 @@ +Sat Feb 1 17:18:21 UTC 2014 - hrvoje.senjan@gmail.com + +- Update to 0.2.7~daily13.05.02 + * Qt 5 support +- Drop patches merged upstream: check-if-service-is-valid.diff, + do-not-force-menubar-to-be-shown-when-registrar-is-deleted.diff and + async-dbus-calls.diff +- Explicitly enable Qt4, and disable Qt5 builds via cmake flags + +------------------------------------------------------------------- Old: ---- appmenu-qt-0.2.6.tar.bz2 async-dbus-calls.diff check-if-service-is-valid.diff do-not-force-menubar-to-be-shown-when-registrar-is-deleted.diff New: ---- appmenu-qt_0.2.7daily13.05.02.orig.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ appmenu-qt.spec ++++++ --- /var/tmp/diff_new_pack.eJGeNN/_old 2014-02-02 18:08:14.000000000 +0100 +++ /var/tmp/diff_new_pack.eJGeNN/_new 2014-02-02 18:08:14.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package appmenu-qt # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,20 +16,16 @@ # +%define rversion 0.2.7daily13.05.02 + Name: appmenu-qt -Version: 0.2.6 +Version: 0.2.7~daily13.05.02 Release: 0 Summary: Application Menu for Qt License: LGPL-3.0 Group: System/GUI/KDE Url: https://launchpad.net/appmenu-qt/ -Source0: https://launchpad.net/appmenu-qt/trunk/%{version}/+download/%{name}-%{version}.tar.bz2 -# PATCH-FIX-UPSTREAM async-dbus-calls.diff [lp#1096008] -Patch0: async-dbus-calls.diff -# PATCH-FIX-UPSTREAM check-if-service-is-valid.diff [lp#1096008] -Patch1: check-if-service-is-valid.diff -# PATCH-FIX-UPSTREAM do-not-force-menubar-to-be-shown-when-registrar-is-deleted.diff [lp#1099357] -Patch2: do-not-force-menubar-to-be-shown-when-registrar-is-deleted.diff +Source0: http://archive.ubuntu.com/ubuntu/pool/main/a/%{name}/%{name}_%{rversion}.orig.tar.gz BuildRequires: cmake >= 2.8.0 BuildRequires: libdbusmenu-qt-devel >= 0.9.0 BuildRequires: libqt4-devel >= 4.8.0 @@ -44,10 +40,7 @@ This projects adds support for application menu to Qt. %prep -%setup -q -%patch0 -%patch1 -%patch2 +%setup -q -n %{name}-%{rversion} %build export CFLAGS=$RPM_OPT_FLAGS @@ -55,6 +48,8 @@ mkdir build && cd build && \ cmake -DCMAKE_SKIP_RPATH=ON \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DUSE_QT4=ON \ + -DUSE_QT5=OFF \ -DCMAKE_BUILD_TYPE=release .. make %{?_smp_mflags} -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org