Hello community,
here is the log from the commit of package kdelibs4
checked in at Mon Sep 29 17:50:55 CEST 2008.
--------
--- KDE/kdelibs4/kdelibs4.changes 2008-09-13 13:15:48.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdelibs4/kdelibs4.changes 2008-09-29 08:02:51.000000000 +0200
@@ -1,0 +2,17 @@
+Thu Sep 25 18:59:04 CEST 2008 - dmueller@suse.de
+
+- update to 4.1.2
+ * see http://kde.org/announcements/changelogs/changelog4_1_1to4_1_2.php
+
+-------------------------------------------------------------------
+Thu Sep 25 15:27:24 CEST 2008 - schwab@suse.de
+
+- Mark register stack in collector.
+
+-------------------------------------------------------------------
+Mon Sep 15 15:14:54 CEST 2008 - llunak@suse.cz
+
+- read .desktop file translations from .mo files if not present
+ (fate#300461)
+
+-------------------------------------------------------------------
Old:
----
kdelibs-4.1.1.tar.bz2
New:
----
desktop-translations.diff
kdelibs-4.1.2.tar.bz2
kjs-mark-register-stack.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdelibs4.spec ++++++
--- /var/tmp/diff_new_pack.Oo6717/_old 2008-09-29 17:50:09.000000000 +0200
+++ /var/tmp/diff_new_pack.Oo6717/_new 2008-09-29 17:50:09.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kdelibs4 (Version 4.1.1)
+# spec file for package kdelibs4 (Version 4.1.2)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -32,9 +32,13 @@
Group: System/GUI/KDE
Summary: KDE Base Libraries
Url: http://www.kde.org
-Version: 4.1.1
-Release: 12
+Version: 4.1.2
+Release: 1
+%if %suse_version > 1010
Requires: libqt4-x11 >= %( echo `rpm -q --queryformat '%{VERSION}' libqt4-x11`)
+%else
+Requires: qt-x11 >= %( echo `rpm -q --queryformat '%{VERSION}' qt-x11`)
+%endif
Requires: libstrigi0 >= %( echo `rpm -q --queryformat '%{VERSION}' strigi-devel`)
Requires: soprano >= %( echo `rpm -q --queryformat '%{VERSION}' libsoprano-devel`)
Recommends: strigi >= %( echo `rpm -q --queryformat '%{VERSION}' strigi-devel`)
@@ -57,6 +61,8 @@
Patch9: kdesu-settings.diff
Patch10: kdebug-areas-update.diff
Patch11: display-key-support.diff
+Patch12: desktop-translations.diff
+Patch13: kjs-mark-register-stack.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?opensuse_bs}
%define debug_package_requires %name = %version libqt4-debuginfo
@@ -87,9 +93,9 @@
%patch8
%patch9
%patch10
-%if %suse_version > 1100
%patch11
-%endif
+%patch12
+%patch13
#
# define KDE version exactly
#
@@ -305,7 +311,12 @@
Requires: kdelibs4 = %version
Requires: kdelibs4-doc = %version
Requires: libkde4 = %version libkdecore4-devel = %version
-Requires: libqt4-devel libxslt-devel libattr-devel aspell-devel libtiff-devel pcre-devel
+Requires: libxslt-devel libattr-devel aspell-devel libtiff-devel pcre-devel
+%if %suse_version > 1010
+Requires: libqt4-devel
+%else
+Requires: qt-devel
+%endif
Requires: giflib-devel alsa-devel cups-devel
%if %suse_version > 1020
Requires: avahi-compat-mDNSResponder-devel
@@ -367,6 +378,14 @@
/usr/share/mime/packages/kde.xml
%changelog
+* Thu Sep 25 2008 dmueller@suse.de
+- update to 4.1.2
+ * see http://kde.org/announcements/changelogs/changelog4_1_1to4_1_2.php
+* Thu Sep 25 2008 schwab@suse.de
+- Mark register stack in collector.
+* Mon Sep 15 2008 llunak@suse.cz
+- read .desktop file translations from .mo files if not present
+ (fate#300461)
* Sat Sep 13 2008 stbinner@suse.de
- actually apply patch from last commit
* Fri Sep 12 2008 llunak@suse.cz
++++++ 4_1_BRANCH.diff ++++++
++++ 3565 lines (skipped)
++++ between KDE/kdelibs4/4_1_BRANCH.diff
++++ and /mounts/work_src_done/STABLE/kdelibs4/4_1_BRANCH.diff
++++++ desktop-translations.diff ++++++
Subject: Read .desktop file translations from .mo files if not present
From: Lubos Lunak
Fate: #300461
Patch-upstream: no
Relates: kdelibs3/desktop-translations.diff
--- kdecore/services/kservicegroup.cpp.sav 2008-09-15 14:43:32.000000000 +0200
+++ kdecore/services/kservicegroup.cpp 2008-09-15 15:03:12.000000000 +0200
@@ -57,9 +57,9 @@ void KServiceGroupPrivate::load(const QS
const KConfigGroup config = desktopFile.desktopGroup();
- m_strCaption = config.readEntry( "Name" );
- m_strIcon = config.readEntry( "Icon" );
- m_strComment = config.readEntry( "Comment" );
+ m_strCaption = desktopFile.readName();
+ m_strIcon = desktopFile.readIcon();
+ m_strComment = desktopFile.readComment();
deleted = config.readEntry("Hidden", false );
m_bNoDisplay = desktopFile.noDisplay();
m_strBaseGroupName = config.readEntry( "X-KDE-BaseGroup" );
--- kdecore/config/kconfigdata.h.sav 2008-09-15 14:43:32.000000000 +0200
+++ kdecore/config/kconfigdata.h 2008-09-15 15:03:12.000000000 +0200
@@ -174,6 +174,19 @@ class KEntryMap : public QMap
participants (1)
-
root@Hilbert.suse.de