Hello community,
here is the log from the commit of package kdebase3
checked in at Sun Apr 20 16:25:22 CEST 2008.
--------
--- KDE/kdebase3/kdebase3.changes 2008-04-14 18:11:13.000000000 +0200
+++ kdebase3/kdebase3.changes 2008-04-17 11:36:28.000000000 +0200
@@ -1,0 +2,6 @@
+Thu Apr 17 11:35:35 CEST 2008 - stbinner@suse.de
+
+- don't build kdebase3-ksysguardd package for 11.0 but require/use
+ kdebase4-workspace-ksysguardd (bnc#379351)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebase3.spec ++++++
--- /var/tmp/diff_new_pack.j31988/_old 2008-04-20 16:24:45.000000000 +0200
+++ /var/tmp/diff_new_pack.j31988/_new 2008-04-20 16:24:45.000000000 +0200
@@ -42,7 +42,11 @@
%define kde_path /opt/kde3
Provides: windowmanager kfontinst kdebase3-konqueror kdialog kdebase3-khotkeys
Obsoletes: kfontinst kdebase3-konqueror kdialog kdebase3-khotkeys
+%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
%if %suse_version > 1000
@@ -61,7 +65,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Url: http://www.kde.org/
Version: 3.5.9
-Release: 34
+Release: 37
%define kde_version 3.5.9
Requires: kdebase3-runtime == %{version}
Source0: kdebase-%{kde_version}.tar.bz2
@@ -386,6 +390,7 @@
The KDE Team
%endif
+%if %suse_version < 1031
%package ksysguardd
License: GPL v2 or later
@@ -405,6 +410,8 @@
--------
The KDE Team
+%endif
+
%package session
License: GPL v2 or later
Summary: The KDE Session
@@ -459,7 +466,7 @@
Summary: Set and list fileshares
Group: System/Management
Version: 2.0
-Release: 470
+Release: 473
%description -n fileshareset
This package contains the the fileshareset utility to allow users to
@@ -743,8 +750,13 @@
ln -fs /opt/kde3/bin/startkde $RPM_BUILD_ROOT/usr/X11R6/bin/kde
%endif
ln -sf rcxdm ${RPM_BUILD_ROOT}/usr/sbin/rckdm
+%if %suse_version > 1030
+rm ${RPM_BUILD_ROOT}/opt/kde3/bin/ksysguardd
+rm ${RPM_BUILD_ROOT}/etc/ksysguarddrc
+%else
mv ${RPM_BUILD_ROOT}/opt/kde3/bin/ksysguardd ${RPM_BUILD_ROOT}/usr/bin/ksysguardd
ln -sf /usr/bin/ksysguardd ${RPM_BUILD_ROOT}/opt/kde3/bin/ksysguardd
+%endif
install -d ${RPM_BUILD_ROOT}/opt/kde3/env
%if %suse_version < 1001
install -m 0755 %SOURCE3 ${RPM_BUILD_ROOT}/opt/kde3/env
@@ -758,12 +770,16 @@
mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates
mkdir -p $RPM_BUILD_ROOT/etc/init.d/
install -m 0644 %SOURCE9 ${RPM_BUILD_ROOT}/opt/kde3/share/apps/kdewizard/pics/wizard_small.png
+%if %suse_version < 1031
install -m 0744 %SOURCE6 $RPM_BUILD_ROOT/etc/init.d/ksysguardd
+%endif
mkdir -p $RPM_BUILD_ROOT/opt/kde3/share/apps/kdm/faces/
ln -s ../pics/users/root1.png $RPM_BUILD_ROOT/opt/kde3/share/apps/kdm/faces/root.face.icon
ln -s ../pics/users/default2.png $RPM_BUILD_ROOT/opt/kde3/share/apps/kdm/faces/.default.face.icon
+%if %suse_version < 1031
ln -sf /etc/init.d/ksysguardd $RPM_BUILD_ROOT/usr/sbin/rcksysguardd
install -D -m 644 %SOURCE15 $RPM_BUILD_ROOT/etc/slp.reg.d/ksysguardd.reg
+%endif
# even if we use smbro
install -D -m 644 kioslave/smb/smb-network.desktop $RPM_BUILD_ROOT/opt/kde3/share/apps/konqueror/dirtree/remote/smb-network.desktop
#
@@ -941,6 +957,7 @@
%postun
%insserv_cleanup
/sbin/ldconfig
+%if %suse_version < 1031
%post ksysguardd
%{fillup_and_insserv -sn kdebase3-ksysguardd ksysguardd RUN_KSYSGUARDD}
@@ -955,6 +972,7 @@
%preun ksysguardd
%stop_on_removal ksysguardd
+%endif
%post runtime -p /sbin/ldconfig
@@ -1607,6 +1625,7 @@
%files devel
%defattr(-,root,root)
/opt/kde3/include/*
+%if %suse_version < 1031
%files ksysguardd
%defattr(-,root,root)
@@ -1616,6 +1635,7 @@
/usr/sbin/rcksysguardd
%config(noreplace) /etc/slp.reg.d/*
%config(noreplace) /etc/ksysguarddrc
+%endif
%if %suse_version > 1010
%files beagle
@@ -1661,6 +1681,9 @@
%verify(not mode) %attr(4755,root,shadow) /opt/kde3/bin/kcheckpass
%changelog
+* Thu Apr 17 2008 stbinner@suse.de
+- don't build kdebase3-ksysguardd package for 11.0 but require/use
+ kdebase4-workspace-ksysguardd (bnc#379351)
* Mon Apr 14 2008 llunak@suse.cz
- improve the low-disk-space dialog (bnc#199054)
- GUI for selecting the WM (bnc#332079)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org