Hello community, here is the log from the commit of package kdebase4-session for openSUSE:Factory checked in at 2012-06-25 12:33:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdebase4-session (Old) and /work/SRC/openSUSE:Factory/.kdebase4-session.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdebase4-session", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/kdebase4-session/kdebase4-session.changes 2012-04-17 21:58:45.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdebase4-session.new/kdebase4-session.changes 2012-06-25 12:33:12.000000000 +0200 @@ -1,0 +2,5 @@ +Sat Jun 16 12:08:14 UTC 2012 - [email protected] + +- Reset the DEFAULT_WM value in %post for KDE upgrade compatibility (bnc#763142) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-session.spec ++++++ --- /var/tmp/diff_new_pack.lZp9LV/_old 2012-06-25 12:33:13.000000000 +0200 +++ /var/tmp/diff_new_pack.lZp9LV/_new 2012-06-25 12:33:13.000000000 +0200 @@ -32,6 +32,7 @@ %if 0%{?suse_version} > 1140 Requires: update-desktop-files %endif +Requires(pre): /usr/bin/sed /usr/bin/grep /usr/bin/cut Provides: kdebase3-session = %{version} Obsoletes: kdebase3-session <= 3.5.1 @@ -56,6 +57,23 @@ %clean rm -rf %{buildroot} +%post +# Reset the DEFAULT_WM value for KDE upgrade compatibility +if [ -f /etc/sysconfig/windowmanager ]; then + OLD_DEFAULTWM=`grep "DEFAULT_WM" /etc/sysconfig/windowmanager | cut -d '=' -f 2 | cut -d '"' -f 2` +fi + +if [ -f /var/adm/fillup-templates/sysconfig.windowmanager ]; then + TEMPLATE_DEFAULTWM=`grep "DEFAULT_WM" /var/adm/fillup-templates/sysconfig.windowmanager | cut -d '=' -f 2 | cut -d '"' -f 2` +fi + +# Check the old DEFAULT_WM and whether current DEFAULT_WM exists +if ( [[ $OLD_DEFAULTWM = "startkde4" ]] || [[ $OLD_DEFAULTWM = "startkde" ]] || [[ $OLD_DEFAULTWM = "kde4" ]]); then + if ( [[ -n $TEMPLATE_DEFAULTWM ]] && [[ $OLD_DEFAULTWM != $TEMPLATE_DEFAULTWM ]]); then + sed -i -e "s/^DEFAULT_WM=['\"]\?kde.*/DEFAULT_WM=\"${TEMPLATE_DEFAULTWM}\"/g" /etc/sysconfig/windowmanager + fi +fi + %files %defattr(-,root,root) %if 0%{?suse_version} <= 1140 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
