Hello community, here is the log from the commit of package kdelibs4 for openSUSE:Factory checked in at 2012-04-17 21:58:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdelibs4 (Old) and /work/SRC/openSUSE:Factory/.kdelibs4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdelibs4", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/kdelibs4/kdelibs4-apidocs.changes 2012-04-12 09:32:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdelibs4.new/kdelibs4-apidocs.changes 2012-04-17 21:59:01.000000000 +0200 @@ -1,0 +2,15 @@ +Sun Apr 15 17:07:24 UTC 2012 - [email protected] + +- Make XF86Calculator key work (bnc#726550, kde#257900) + +------------------------------------------------------------------- +Sat Apr 14 08:20:02 UTC 2012 - [email protected] + +- fix build on older distributions + +------------------------------------------------------------------- +Sun Apr 1 17:40:36 UTC 2012 - [email protected] + +- Remove wrongly added %kde_runtime_requires macro + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/kdelibs4/kdelibs4.changes 2012-04-12 09:32:01.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdelibs4.new/kdelibs4.changes 2012-04-17 21:59:01.000000000 +0200 @@ -1,0 +2,10 @@ +Sun Apr 15 17:07:24 UTC 2012 - [email protected] + +- Make XF86Calculator key work (bnc#726550, kde#257900) + +------------------------------------------------------------------- +Sat Apr 14 08:20:02 UTC 2012 - [email protected] + +- fix build on older distributions + +------------------------------------------------------------------- New: ---- fix_kcalc_shortcut.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdelibs4.spec ++++++ --- /var/tmp/diff_new_pack.pJANhR/_old 2012-04-17 21:59:03.000000000 +0200 +++ /var/tmp/diff_new_pack.pJANhR/_new 2012-04-17 21:59:03.000000000 +0200 @@ -52,7 +52,9 @@ BuildRequires: libdbusmenu-qt-devel BuildRequires: libgssglue-devel BuildRequires: libjasper-devel +%if %{?suse_version} > 1120 BuildRequires: libpolkit-qt-1-devel +%endif BuildRequires: libqca2-devel BuildRequires: libsoprano-devel BuildRequires: libudev-devel @@ -84,6 +86,9 @@ %if %suse_version == 1210 %define brandingversion 12.1 %endif +%if %suse_version < 1130 +%define brandingversion 11.1 +%endif Summary: KDE Base Libraries License: LGPL-2.1+ Group: System/GUI/KDE @@ -108,13 +113,16 @@ Patch18: plasma-libs.diff Patch20: ignore-inline-menu.diff Patch24: ksuseinstall.diff +Patch25: fix_kcalc_shortcut.diff PreReq: permissions Requires: soprano >= %( echo `rpm -q --queryformat '%{VERSION}' libsoprano-devel`) Recommends: strigi >= %( echo `rpm -q --queryformat '%{VERSION}' strigi-devel`) Requires: kdelibs4-core = %{version} Requires: libkde4 = %{version} +%if %{suse_version} > 1130 Requires: udisks Requires: upower +%endif Requires(post): shared-mime-info Requires(postun): shared-mime-info @@ -171,6 +179,7 @@ %patch18 %patch20 %patch24 +%patch25 # # define KDE version exactly @@ -308,7 +317,9 @@ Group: System/GUI/KDE Requires: kde4-filesystem >= %{_kde_platform_version} Requires: libkdecore4 = %{version} +%if %{?suse_version} > 1120 %requires_ge libpolkit-qt-1-1 +%endif %description -n kdelibs4-core This package contains the basic packages of the K Desktop Environment. @@ -448,7 +459,9 @@ Requires: libidn-devel Requires: libkde4 = %{version} Requires: libkdecore4-devel = %{version} +%if %{?suse_version} > 1120 Requires: libpolkit-qt-1-devel +%endif Requires: libsoprano-devel Requires: libxslt-devel Requires: pcre-devel @@ -482,7 +495,12 @@ %files -f filelists/exclude %defattr(-,root,root) +# not all rpm versions handle "caps" +%if %suse_version > 1120 %verify(not mode caps) %attr(4755,root,root) %{_kde4_libexecdir}/start_kdeinit +%else +%verify(not mode) %attr(755,root,root) %{_kde4_libexecdir}/start_kdeinit +%endif %{_kde4_configdir}/* %config %{_kde4_sysconfdir}/xdg/menus/applications.menu.kde4 ++++++ fix_kcalc_shortcut.diff ++++++ Subject: Make XF86Calculator key work From: [email protected] Signed-Off-By: Christian Trippe, [email protected] Bug: bnc#726550, kde#257900 Patch-upstream: no --- kdeui/util/kkeyserver_x11.cpp 2012-02-25 18:53:49.480771132 -0200 +++ kdeui/util/kkeyserver_x11.cpp 2012-02-25 18:20:38.912403430 -0200 @@ -355,7 +355,7 @@ { Qt::Key_MediaRecord, XF86XK_AudioRecord }, { Qt::Key_LaunchMail, XF86XK_Mail }, { Qt::Key_Launch0, XF86XK_MyComputer }, - { Qt::Key_Calculator, XF86XK_Calculator }, + { Qt::Key_Launch1, XF86XK_Calculator }, { Qt::Key_Memo, XF86XK_Memo }, { Qt::Key_ToDoList, XF86XK_ToDoList }, { Qt::Key_Calendar, XF86XK_Calendar }, -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
