Hello community, here is the log from the commit of package kdelibs4 for openSUSE:11.4 checked in at Mon Feb 21 23:25:40 CET 2011.
-------- --- old-versions/11.4/all/kdelibs4/kdelibs4-apidocs.changes 2011-02-05 16:34:36.000000000 +0100 +++ 11.4/kdelibs4/kdelibs4-apidocs.changes 2011-02-21 23:25:05.699187000 +0100 @@ -1,0 +2,11 @@ +Thu Feb 17 14:07:35 UTC 2011 - [email protected] + +- call update-mime-database in pre/post install scripts + +------------------------------------------------------------------- +Tue Feb 15 11:05:26 UTC 2011 - [email protected] + +- don't show synthetic volume label when none is really available, + allow kio_sysinfo to fall back to device path (bnc#670426) + +------------------------------------------------------------------- @@ -9,0 +21 @@ +- add patch from 4.6 branch to fix plasma crash on exit --- old-versions/11.4/all/kdelibs4/kdelibs4.changes 2011-02-07 12:46:25.000000000 +0100 +++ 11.4/kdelibs4/kdelibs4.changes 2011-02-17 15:08:21.000000000 +0100 @@ -1,0 +2,11 @@ +Thu Feb 17 14:07:35 UTC 2011 - [email protected] + +- call update-mime-database in pre/post install scripts + +------------------------------------------------------------------- +Tue Feb 15 11:05:26 UTC 2011 - [email protected] + +- don't show synthetic volume label when none is really available, + allow kio_sysinfo to fall back to device path (bnc#670426) + +------------------------------------------------------------------- calling whatdependson for 11.4-i586 New: ---- udisks-no-volume-label.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdelibs4-apidocs.spec ++++++ --- /var/tmp/diff_new_pack.mNRsEu/_old 2011-02-21 23:25:17.000000000 +0100 +++ /var/tmp/diff_new_pack.mNRsEu/_new 2011-02-21 23:25:17.000000000 +0100 @@ -26,7 +26,7 @@ Summary: KDE 4 API documentation Url: http://www.kde.org Version: 4.6.0 -Release: 2 +Release: 3.<RELEASE2> Requires: kde4-filesystem Source0: kdelibs-%version.tar.bz2 Source1: baselibs.conf ++++++ kdelibs4.spec ++++++ --- /var/tmp/diff_new_pack.mNRsEu/_old 2011-02-21 23:25:17.000000000 +0100 +++ /var/tmp/diff_new_pack.mNRsEu/_new 2011-02-21 23:25:17.000000000 +0100 @@ -44,7 +44,7 @@ Summary: KDE Base Libraries Url: http://www.kde.org Version: 4.6.0 -Release: 2 +Release: 6.<RELEASE2> Requires: soprano >= %( echo `rpm -q --queryformat '%{VERSION}' libsoprano-devel`) Recommends: strigi >= %( echo `rpm -q --queryformat '%{VERSION}' strigi-devel`) Requires: kdelibs4-core = %version @@ -74,6 +74,7 @@ Patch24: ksuseinstall.diff Patch25: ksuseinstall_11.2.diff Patch26: 590a1901-plasma-extenderitem-crashfix.diff +Patch27: udisks-no-volume-label.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %requires_ge libqt4-x11 %if 0%{?opensuse_bs} @@ -95,6 +96,8 @@ Requires: udisks Requires: upower %endif +Requires(post): shared-mime-info +Requires(postun): shared-mime-info %description This package contains the basic packages of the K Desktop Environment. @@ -159,6 +162,7 @@ %patch25 %endif %patch26 -p1 +%patch27 -p1 # # define KDE version exactly # @@ -207,9 +211,13 @@ %kde_post_install %fdupes -s $RPM_BUILD_ROOT -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig +%post +/sbin/ldconfig +/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || : + +%postun +/sbin/ldconfig +/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || : %clean rm -rf $RPM_BUILD_ROOT ++++++ udisks-no-volume-label.diff ++++++ diff --git a/solid/solid/backends/udisks/udisksstoragevolume.cpp b/solid/solid/backends/udisks/udisksstoragevolume.cpp index c3c46e5..da93063 100644 --- a/solid/solid/backends/udisks/udisksstoragevolume.cpp +++ b/solid/solid/backends/udisks/udisksstoragevolume.cpp @@ -55,8 +55,6 @@ QString UDisksStorageVolume::label() const QString label = m_device->property("IdLabel").toString(); if (label.isEmpty()) label = m_device->property("PartitionLabel").toString(); - if (label.isEmpty()) - label = QString("%1 %2").arg(m_device->vendor()).arg(m_device->product()); return label; } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
