Hello community,
here is the log from the commit of package kdebase3 for openSUSE:Factory
checked in at Tue Jun 7 09:19:04 CEST 2011.
--------
--- KDE/kdebase3/kdebase3.changes 2010-09-23 00:18:14.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdebase3/kdebase3.changes 2011-06-01
11:42:50.000000000 +0200
@@ -1,0 +2,15 @@
+Wed Jun 1 09:41:05 UTC 2011 - an...@opensuse.org
+
+- make hal usage conditional on the project
+
+-------------------------------------------------------------------
+Tue May 31 12:41:04 UTC 2011 - co...@novell.com
+
+- remove hal support for 12.1 and some cleanup for long gone distributions
+
+-------------------------------------------------------------------
+Thu Mar 10 08:49:11 UTC 2011 - neptu...@mail.ru
+
+- fix build
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
kdm-session-names.diff
ksmserver-suspend_legacy-10.1.diff
old-liblazy-api.diff
New:
----
taskbar.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebase3.spec ++++++
--- /var/tmp/diff_new_pack.51Gbjn/_old 2011-06-07 09:16:19.000000000 +0200
+++ /var/tmp/diff_new_pack.51Gbjn/_new 2011-06-07 09:16:19.000000000 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package kdebase3 (Version 3.5.10.1)
+# spec file for package kdebase3
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 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
@@ -19,33 +19,19 @@
Name: kdebase3
-BuildRequires: OpenEXR-devel cups-devel db-devel doxygen graphviz hal-devel
kdelibs3-devel krb5-devel libsmbclient-devel mDNSResponder-devel openldap2
openldap2-devel openmotif openmotif-devel openslp-devel openssh pam-devel
pcsc-lite-devel qt3-devel-doc samba-client utempter xorg-x11
-%if %suse_version > 1010
+BuildRequires: OpenEXR-devel cups-devel db-devel doxygen graphviz
kdelibs3-devel krb5-devel libsmbclient-devel mDNSResponder-devel openldap2
openldap2-devel openmotif openmotif-devel openslp-devel openssh pam-devel
pcsc-lite-devel qt3-devel-doc samba-client utempter xorg-x11
BuildRequires: xorg-x11-libfontenc-devel
-%endif
-%if %suse_version > 1030
BuildRequires: liblazy-devel
-%else
-%if %suse_version > 1010
-BuildRequires: liblazy
-%else
-BuildRequires: powersave-devel
+%if %suse_version < 1210 || "%{_project}" == "KDE:KDE3"
+BuildRequires: hal-devel
+Provides: kdebase3-with-hal-enabled
%endif
-%endif
-%if %suse_version > 1010
%if %suse_version < 1140
BuildRequires: libbeagle-devel
%endif
-%endif
-%if %suse_version > 1020
BuildRequires: fdupes libbz2-devel
-%endif
%ifnarch s390 s390x
-%if %suse_version > 1030
BuildRequires: libsensors4-devel
-%else
-BuildRequires: sensors
-%endif
%endif
%define qt_path /usr/lib/qt3
%define kde_path /opt/kde3
@@ -56,11 +42,6 @@
Obsoletes: kdebase3-64bit
%endif
#
-%if %suse_version < 1031
-Requires: kdebase3-ksysguardd
-#%else
-#Requires: kdebase4-workspace-ksysguardd
-%endif
Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}'
kdelibs3`)
Requires: xorg-x11 misc-console-font
Recommends: kdelibs3_doc
@@ -82,7 +63,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Url: http://www.kde.org/
Version: 3.5.10.1
-Release: 11
+Release: 16
%define kde_version 3.5.10
Requires: kdebase3-runtime == %{version}
Source0: kdebase-%{kde_version}.tar.bz2
@@ -145,7 +126,6 @@
Patch70: kdm-aliasing.diff
Patch71: kdm-mark_autologin.diff
Patch72: kdm-all-users-nopass.diff
-Patch73: kdm-session-names.diff
Patch74: kdm-sysconfig-values.diff
# svn diff $BASE/branches/KDE/3.5/kdebase/kdm@599257
$BASE/branches/work/coolos_kdm | sed -e "s,^+++ ,+++ kdm/,"
Patch75: kdm-make_it_cool.diff
@@ -157,7 +137,6 @@
Patch81: ksmserver-defaulttohalt.diff
Patch82: fix-lockup-from-gnome-apps.diff
Patch83: ksmserver-suspend.diff
-Patch1083: ksmserver-suspend_legacy-10.1.diff
Patch84: default-kdeprintfax.diff
Patch85: ksmserver-tooltips.diff
Patch88: hide-only-showin-entries.diff
@@ -232,7 +211,6 @@
Patch218: kdm-align-userlist-labels.diff
Patch219: kxkb-include-latin-layout.diff
Patch220: mediamanager-mount-point-utf8.diff
-Patch221: old-liblazy-api.diff
Patch222: khelpcenter-delayed-indexcheck.cpp
Patch225: system-folder_man.diff
Patch227: arts-start-on-demand.diff
@@ -251,6 +229,7 @@
Patch240: bnc584223.diff
Patch241: openssl1.patch
Patch242: nsplugin-init-gtk.diff
+Patch243: taskbar.patch
%description
This package contains kdebase, one of the basic packages of the K
@@ -306,6 +285,7 @@
Requires: kdebase3 == %{version}
Provides: kdebase3:/opt/kde3/bin/kicker
Recommends: kdebase3-ksysguardd == %{version}
+Requires: kdebase3-with-hal-enabled
%description workspace
This package contains the wrkspace components of kdebase3 like
@@ -509,7 +489,7 @@
Summary: Set and list fileshares
Group: System/Management
Version: 2.0
-Release: 576
+Release: 577
%description -n fileshareset
This package contains the the fileshareset utility to allow users to
@@ -571,9 +551,6 @@
# default-to-halt
%patch81
%patch82
-%if %suse_version == 1010
-%patch1083
-%endif
%if %suse_version > 1010
%patch83
%patch77
@@ -666,15 +643,10 @@
pushd kcontrol
%patch216
popd
-%if %suse_version > 1010
%patch217
-%endif
%patch218
%patch219
%patch220
-%if %suse_version == 1020
-%patch221
-%endif
%patch222
%patch225
%patch197
@@ -704,6 +676,7 @@
%patch240 -p1
%patch241 -p0
%patch242 -p0
+%patch243
rm -rf kappfinder
rm pics/crystalsvg/cr??-*emacs.png
cp %SOURCE17 l10n/tw/flag.png
@@ -880,7 +853,7 @@
ln -s pics-default $RPM_BUILD_ROOT/opt/kde3/share/apps/ksplash/pics
chmod 0755 $RPM_BUILD_ROOT/%{fileshare_prefix}/bin/fileshareset
%suse_update_desktop_file kate TextEditor
-%suse_update_desktop_file -u kwrite TextEditor
+%suse_update_desktop_file kwrite TextEditor
%suse_update_desktop_file Help Documentation Viewer
%suse_update_desktop_file Home System FileManager core
%suse_update_desktop_file KControl X-SuSE-core
@@ -935,6 +908,7 @@
cp %SOURCE19 $RPM_BUILD_ROOT/%_mandir/man8
# don't conflict with man pages from KDE4 packages
rm $RPM_BUILD_ROOT/%_mandir/man1/kate.*
+rm $RPM_BUILD_ROOT/%_mandir/man1/kdesu.*
rm $RPM_BUILD_ROOT/%_mandir/man1/kbookmarkmerger.*
rm $RPM_BUILD_ROOT/%_mandir/man1/kfind.*
kde_post_install
@@ -1015,6 +989,9 @@
%postun runtime -p /sbin/ldconfig
%post workspace -p /sbin/ldconfig
+%if %suse_version > 1130 && "%{_project}" == "KDE:KDE3"
+chkconfig haldaemon on
+%endif
%postun workspace -p /sbin/ldconfig
@@ -1023,7 +1000,7 @@
%postun apps -p /sbin/ldconfig
%clean
-rm -rf $RPM_BUILD_ROOT}
+rm -rf $RPM_BUILD_ROOT
%files -n misc-console-font
%defattr(-,root,root)
@@ -1152,7 +1129,9 @@
/opt/kde3/%_lib/kde3/kded_homedirnotify.so
/opt/kde3/%_lib/kde3/kded_medianotifier.la
/opt/kde3/%_lib/kde3/kded_medianotifier.so
+%if %suse_version < 1210 || "%{_project}" == "KDE:KDE3"
/opt/kde3/%_lib/kde3/media_propsdlgplugin.*
+%endif
/opt/kde3/%_lib/kde3/kcm_kded.*
/opt/kde3/%_lib/kde3/kcm_kdnssd.*
/opt/kde3/%_lib/kde3/kcm_keyboard.*
@@ -1244,7 +1223,7 @@
/opt/kde3/share/apps/kdeprint*
/opt/kde3/share/apps/kdewizard
/opt/kde3/share/apps/kdisplay
-%exclude /opt/kde3/share/apps/khelpcenter/searchhandlers/docbook.desktop
+/opt/kde3/share/apps/khelpcenter/searchhandlers/docbook.desktop
/opt/kde3/share/apps/khelpcenter
/opt/kde3/share/apps/kio*
/opt/kde3/share/apps/kjobviewer
@@ -1262,7 +1241,9 @@
/opt/kde3/share/mimelnk/inode/system_directory.desktop
/opt/kde3/share/services/kded/remotedirnotify.desktop
/opt/kde3/share/services/kded/systemdirnotify.desktop
+%if %suse_version < 1210 || "%{_project}" == "KDE:KDE3"
/opt/kde3/share/services/media_propsdlgplugin.desktop
+%endif
%config(noreplace) /opt/kde3/share/config/kshorturifilterrc
%config(noreplace) /opt/kde3/share/config/kxkb_groups
/opt/kde3/share/desktop-directories
++++++ media-teardown_crypto.diff ++++++
--- /var/tmp/diff_new_pack.51Gbjn/_old 2011-06-07 09:16:21.000000000 +0200
+++ /var/tmp/diff_new_pack.51Gbjn/_new 2011-06-07 09:16:21.000000000 +0200
@@ -1,7 +1,7 @@
Index: kioslave/media/mediamanager/halbackend.cpp
===================================================================
---- kioslave/media/mediamanager/halbackend.cpp.orig
-+++ kioslave/media/mediamanager/halbackend.cpp
+--- kioslave/media/mediamanager/halbackend.cpp.orig 2011-05-31
13:41:55.000000000 +0200
++++ kioslave/media/mediamanager/halbackend.cpp 2011-05-31 13:42:48.317334543
+0200
@@ -1379,4 +1379,54 @@ QString HALBackend::unmount(const QStrin
return QString();
}
@@ -59,8 +59,8 @@
#include "halbackend.moc"
Index: kioslave/media/mediamanager/halbackend.h
===================================================================
---- kioslave/media/mediamanager/halbackend.h.orig
-+++ kioslave/media/mediamanager/halbackend.h
+--- kioslave/media/mediamanager/halbackend.h.orig 2011-05-31
13:39:05.000000000 +0200
++++ kioslave/media/mediamanager/halbackend.h 2011-05-31 13:42:48.317334543
+0200
@@ -85,6 +85,7 @@ public:
QString mount(const QString &id);
QString mount(const Medium *medium);
@@ -71,9 +71,9 @@
Index: kioslave/media/mediamanager/mediamanager.cpp
===================================================================
---- kioslave/media/mediamanager/mediamanager.cpp.orig
-+++ kioslave/media/mediamanager/mediamanager.cpp
-@@ -232,6 +232,19 @@ QString MediaManager::unmount(const QStr
+--- kioslave/media/mediamanager/mediamanager.cpp.orig 2011-05-31
13:39:05.000000000 +0200
++++ kioslave/media/mediamanager/mediamanager.cpp 2011-05-31
13:43:07.916484054 +0200
+@@ -232,6 +232,17 @@ QString MediaManager::unmount(const QStr
#endif
}
@@ -84,9 +84,7 @@
+ return false;
+ return m_halbackend->teardown(name);
+#else
-+ if ( !m_fstabbackend ) // lying :)
-+ return false;
-+ return m_fstabbackend->teardown( name );
++ return false;
+#endif
+}
+
@@ -95,8 +93,8 @@
const QPtrList<Medium> media = m_mediaList.list();
Index: kioslave/media/mediamanager/mediamanager.h
===================================================================
---- kioslave/media/mediamanager/mediamanager.h.orig
-+++ kioslave/media/mediamanager/mediamanager.h
+--- kioslave/media/mediamanager/mediamanager.h.orig 2011-05-31
13:39:05.000000000 +0200
++++ kioslave/media/mediamanager/mediamanager.h 2011-05-31 13:42:48.318334448
+0200
@@ -47,6 +47,7 @@ k_dcop:
QString mount(const QString &uid);
@@ -107,8 +105,8 @@
ASYNC setUserLabel(const QString &name, const QString &label);
Index: kioslave/media/mounthelper/kio_media_mounthelper.h
===================================================================
---- kioslave/media/mounthelper/kio_media_mounthelper.h.orig
-+++ kioslave/media/mounthelper/kio_media_mounthelper.h
+--- kioslave/media/mounthelper/kio_media_mounthelper.h.orig 2007-01-15
12:31:31.000000000 +0100
++++ kioslave/media/mounthelper/kio_media_mounthelper.h 2011-05-31
13:42:48.318334448 +0200
@@ -40,6 +40,8 @@ private:
QString m_errorStr;
QString m_device;
@@ -120,8 +118,8 @@
void ejectFinished(KProcess* proc);
Index: kioslave/media/mounthelper/kio_media_mounthelper.cpp
===================================================================
---- kioslave/media/mounthelper/kio_media_mounthelper.cpp.orig
-+++ kioslave/media/mounthelper/kio_media_mounthelper.cpp
+--- kioslave/media/mounthelper/kio_media_mounthelper.cpp.orig 2007-05-14
09:55:40.000000000 +0200
++++ kioslave/media/mounthelper/kio_media_mounthelper.cpp 2011-05-31
13:42:48.319334353 +0200
@@ -27,6 +27,7 @@
#include <dcopclient.h>
#include <dcopref.h>
++++++ taskbar.patch ++++++
--- kicker/taskbar/taskcontainer.cpp.orig 2011-02-12 00:40:57.060389620
+0300
+++ kicker/taskbar/taskcontainer.cpp 2011-02-12 02:03:08.345389684 +0300
@@ -576,9 +576,9 @@
// draw button background
if (drawButton)
{
- style().drawPrimitive(QStyle::PE_HeaderSection, p,
- QRect(0, 0, width(), height()),
- colors);
+ style().drawPrimitive(QStyle::PE_HeaderSection, p,
+ QRect(1, 1, width()-2, height()-2),
+ colors, sunken ? QStyle::Style_Down :
QStyle::Style_Raised);
}
// shift button label on sunken buttons
@@ -674,11 +674,11 @@
}
else
{
- textPen = p->pen();
+ textPen = QPen(colors.buttonText()); //textPen = p->pen();
}
}
- int availableWidth = width() - (br.x() * 2) - textPos;
+ int availableWidth = width() - (br.x() * 2) - textPos - 4;
if (m_filteredTasks.count() > 1)
{
availableWidth -= 8;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
