Hello community,
here is the log from the commit of package kdebase3
checked in at Mon Jul 14 18:18:37 CEST 2008.
--------
--- KDE/kdebase3/kdebase3.changes 2008-06-11 16:08:57.000000000 +0200
+++ kdebase3/kdebase3.changes 2008-07-14 11:09:37.000000000 +0200
@@ -1,0 +2,5 @@
+Mon Jul 14 00:27:15 CEST 2008 - dmueller@suse.de
+
+- fix suspend/hibernate buttons for 11.0 and newer (bnc#290917)
+
+-------------------------------------------------------------------
Old:
----
ksmserver-suspend_legacy.diff
mach_blass_legacy.diff
no-media-backend-hack.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebase3.spec ++++++
--- /var/tmp/diff_new_pack.hp8971/_old 2008-07-14 18:17:19.000000000 +0200
+++ /var/tmp/diff_new_pack.hp8971/_new 2008-07-14 18:17:19.000000000 +0200
@@ -49,14 +49,10 @@
%endif
Requires: kdelibs3 >= %( echo `rpm -q --queryformat '%{VERSION}' kdelibs3`)
Requires: xorg-x11 misc-console-font
-%if %suse_version > 1000
Recommends: kdelibs3_doc
Recommends: gdb
PreReq: fileshareset
%define fileshare_prefix %{_prefix}
-%else
-%define fileshare_prefix /opt/kde3
-%endif
Conflicts: kdebase3-SuSE <= 9.0
PreReq: /bin/sh fileutils permissions
License: GPL v2 or later
@@ -65,7 +61,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Url: http://www.kde.org/
Version: 3.5.9
-Release: 69
+Release: 74
%define kde_version 3.5.9
Requires: kdebase3-runtime == %{version}
Source0: kdebase-%{kde_version}.tar.bz2
@@ -138,14 +134,12 @@
Patch81: ksmserver-defaulttohalt.diff
Patch82: fix-lockup-from-gnome-apps.diff
Patch83: ksmserver-suspend.diff
-Patch983: ksmserver-suspend_legacy.diff
Patch1083: ksmserver-suspend_legacy-10.1.diff
Patch84: default-kdeprintfax.diff
Patch85: ksmserver-tooltips.diff
Patch88: hide-only-showin-entries.diff
Patch92: kcminit-ignore-arts.diff
Patch94: mach_blass.diff
-Patch994: mach_blass_legacy.diff
Patch96: khelpcenter-gnome-support.patch
Patch996: khelpcenter-gnome-support-legacy.patch
Patch98: workaround-pdf-on64bit-nsplugin-bug.diff
@@ -197,7 +191,6 @@
Patch198: konsole-schema-update.diff
Patch199: media-cryptosupport.diff
Patch200: kdm-use-rpmoptflags.diff
-Patch202: no-media-backend-hack.diff
Patch203: show-konqueror-in-menu.diff
Patch204: fix-desktop-icons.diff
Patch205: kcmkdm-default-grub.diff
@@ -443,14 +436,13 @@
The KDE Team
%endif
-%if %suse_version > 1000
%package -n fileshareset
License: GPL v2 or later
Summary: Set and list fileshares
Group: System/Management
Version: 2.0
-Release: 505
+Release: 510
%description -n fileshareset
This package contains the the fileshareset utility to allow users to
@@ -463,7 +455,6 @@
--------
Uwe Gansert
-%endif
%define sysconfdir /etc
%prep
@@ -484,9 +475,7 @@
%patch17
%patch20
%patch21
-%if %suse_version > 1000
%patch85
-%endif
%patch39
%patch40
%patch44
@@ -496,20 +485,14 @@
%patch63
%patch60
%patch64
-%if %suse_version > 1000
%patch94
-%else
-%patch994
-%endif
%patch98
# all the kdm changes
%patch75
%patch70
%patch71
%patch72
-%if %suse_version >1000
%patch74
-%endif
%if %suse_version <1010
%patch65
%endif
@@ -520,9 +503,6 @@
%patch81
%patch82
%ifarch %ix86 x86_64
-%if %suse_version == 1000
-%patch983
-%endif
%if %suse_version == 1010
%patch1083
%endif
@@ -532,9 +512,7 @@
%endif
%endif
%patch200
-%if %suse_version > 1000
%patch215
-%endif
%patch84
%patch61
%patch120
@@ -560,12 +538,10 @@
%patch114
%patch116
%patch117
-%if %suse_version > 1000
%patch123
%patch126
%patch131
%patch141 -p1
-%endif
%patch127
%patch144
%patch145
@@ -589,9 +565,7 @@
tar xvfj %SOURCE20
%endif
%patch163
-%if %suse_version > 1000
%patch125
-%endif
%patch169
%patch170
%patch171
@@ -609,9 +583,6 @@
%patch198
%patch199
%endif
-%if %suse_version < 1010
-%patch202
-%endif
%patch203
%patch204
%patch205
@@ -638,9 +609,7 @@
%patch197
%patch206
%patch227
-%if %suse_version > 1000
%patch228
-%endif
%if %suse_version > 1030
%patch229
%patch230
@@ -785,10 +754,8 @@
rm $RPM_BUILD_ROOT/opt/kde3/share/apps/kdesktop/DesktopLinks/Home.desktop
rm $RPM_BUILD_ROOT/opt/kde3/share/apps/kdesktop/DesktopLinks/System.desktop
rm $RPM_BUILD_ROOT/opt/kde3/share/icons/*/*/apps/kvirc.*
-%if %suse_version > 1000
- mkdir -p $RPM_BUILD_ROOT/usr/share
- mv $RPM_BUILD_ROOT/opt/kde3/share/wallpapers $RPM_BUILD_ROOT/usr/share
-%endif
+mkdir -p $RPM_BUILD_ROOT/usr/share
+mv $RPM_BUILD_ROOT/opt/kde3/share/wallpapers $RPM_BUILD_ROOT/usr/share
cd ../fileshareset2/src
rm -f $RPM_BUILD_ROOT/opt/kde3/bin/fileshare{set,list}
make DESTDIR=$RPM_BUILD_ROOT install
@@ -860,11 +827,7 @@
$RPM_BUILD_ROOT/opt/kde3/share/apps/kicker/*/*.desktop \
$RPM_BUILD_ROOT/opt/kde3/share/apps/kicker/*/*/*.desktop \
$RPM_BUILD_ROOT/opt/kde3/share/apps/kicker/*/*/*.desktop \
-%if %suse_version > 1000
$RPM_BUILD_ROOT/usr/share/wallpapers/*.desktop \
-%else
- $RPM_BUILD_ROOT/opt/kde3/share/wallpapers/*.desktop \
-%endif
$RPM_BUILD_ROOT/opt/kde3/share/apps/konqsidebartng/virtual_folders/services/*.desktop; do
[ "`sed -n '/^\[Desktop Entry\]/,/^\[/ s,NoDisplay=\(.*\),\1,p' "$i"`" = "true" ] && continue
[ "`sed -n '/^\[Desktop Entry\]/,/^\[/ s,Hidden=\(.*\),\1,p' "$i"`" = "true" ] && continue
@@ -880,12 +843,10 @@
ln "$i" "${i%/*}/wilber-icon.png"
done
mkdir -p -m 755 $RPM_BUILD_ROOT/%_mandir/man8
-%if %suse_version > 1000
cp %SOURCE18 $RPM_BUILD_ROOT/%_mandir/man8
-%endif
cp %SOURCE19 $RPM_BUILD_ROOT/%_mandir/man8
kde_post_install
-%if %suse_version > 1000
+%if %suse_version > 1020
%fdupes $RPM_BUILD_ROOT/opt/kde3/share
%endif
# move konqueror.desktop back to old position (#281572)
@@ -915,7 +876,6 @@
%post kdm
%{fillup_only -an windowmanager-kdebase3}
/opt/kde3/bin/genkdmconf
-%if %suse_version > 1000
if test -f /etc/sysconfig/displaymanager ; then
. /etc/sysconfig/displaymanager
fi
@@ -931,12 +891,9 @@
;;
esac
fi
-%endif
-%if %suse_version > 1000
%post -n fileshareset
%run_permissions
-%endif
%postun kdm
%insserv_cleanup
@@ -1146,9 +1103,7 @@
/opt/kde3/%_lib/kde3/kded_homedirnotify.so
/opt/kde3/%_lib/kde3/kded_medianotifier.la
/opt/kde3/%_lib/kde3/kded_medianotifier.so
-%if %suse_version > 1000
/opt/kde3/%_lib/kde3/media_propsdlgplugin.*
-%endif
/opt/kde3/share/applications/kde/khtml_filter.desktop
/opt/kde3/share/applications/kde/media.desktop
/opt/kde3/share/applications/kde/joystick.desktop
@@ -1300,9 +1255,7 @@
/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 > 1000
/opt/kde3/share/services/media_propsdlgplugin.desktop
-%endif
/opt/kde3/share/autostart/*
%config(noreplace) /opt/kde3/share/config/kdesktop_custom_menu*
%config(noreplace) /opt/kde3/share/config/klipperrc
@@ -1453,11 +1406,7 @@
%endif
/opt/kde3/share/sounds
/opt/kde3/share/templates
-%if %suse_version > 1000
/usr/share/wallpapers
-%else
-/opt/kde3/share/wallpapers
-%endif
/opt/kde3/share/services/khelpcenter.desktop
/opt/kde3/bin/keditbookmarks
/opt/kde3/bin/kfm*
@@ -1628,7 +1577,6 @@
/opt/kde3/%_lib/kde3/kickoffsearch_beagle.*
/opt/kde3/share/services/kickoffsearch_beagle.desktop
%endif
-%if %suse_version > 1000
%files -n fileshareset
%defattr(-,root,root)
@@ -1636,7 +1584,6 @@
%{_bindir}/filesharelist
%verify(not mode) %{_bindir}/fileshareset
%{_mandir}/man8/fileshareset.8.gz
-%endif
%files runtime
%defattr(-,root,root)
@@ -1677,6 +1624,8 @@
/opt/kde3/share/icons/*/*/*/personal.*
%changelog
+* Mon Jul 14 2008 dmueller@suse.de
+- fix suspend/hibernate buttons for 11.0 and newer (bnc#290917)
* Wed Jun 11 2008 dmueller@suse.de
- remove kdebase3-nsplugins64 package and add nspluginwrapper
dependency
++++++ kickoff.diff ++++++
--- /var/tmp/diff_new_pack.hp8971/_old 2008-07-14 18:17:22.000000000 +0200
+++ /var/tmp/diff_new_pack.hp8971/_new 2008-07-14 18:17:22.000000000 +0200
@@ -6603,11 +6603,11 @@
+ else
+ suspend_disk = false;
+
-+ if (liblazy_hal_is_caller_privileged("hal-power-hibernate") != 1)
++ if (liblazy_hal_is_caller_privileged("org.freedesktop.hal.power-management.hibernate") != 1)
+ suspend_disk = false;
-+ if (liblazy_hal_is_caller_privileged("hal-power-suspend") != 1)
++ if (liblazy_hal_is_caller_privileged("org.freedesktop.hal.power-management.suspend") != 1)
+ suspend_ram = false;
-+ if (liblazy_hal_is_caller_privileged("hal-power-standby") != 1)
++ if (liblazy_hal_is_caller_privileged("org.freedesktop.hal.power-management.standby") != 1)
+ standby = false;
+
+ if ( ! ( standby + suspend_ram + suspend_disk ) )
++++++ ksmserver-suspend.diff ++++++
--- /var/tmp/diff_new_pack.hp8971/_old 2008-07-14 18:17:23.000000000 +0200
+++ /var/tmp/diff_new_pack.hp8971/_new 2008-07-14 18:17:23.000000000 +0200
@@ -93,11 +93,11 @@
+ else
+ suspend_disk = false;
+
-+ if (liblazy_hal_is_caller_privileged("hal-power-hibernate") != 1)
++ if (liblazy_hal_is_caller_privileged("org.freedesktop.hal.power-management.hibernate") != 1)
+ suspend_disk = false;
-+ if (liblazy_hal_is_caller_privileged("hal-power-suspend") != 1)
++ if (liblazy_hal_is_caller_privileged("org.freedesktop.hal.power-management.suspend") != 1)
+ suspend_ram = false;
-+ if (liblazy_hal_is_caller_privileged("hal-power-standby") != 1)
++ if (liblazy_hal_is_caller_privileged("org.freedesktop.hal.power-management.standby") != 1)
+ standby = false;
+
+ int sum = standby + suspend_ram + suspend_disk;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org