Hello community, here is the log from the commit of package kdebase3 for openSUSE:Factory checked in at 2014-12-01 14:01:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdebase3 (Old) and /work/SRC/openSUSE:Factory/.kdebase3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdebase3" Changes: -------- --- /work/SRC/openSUSE:Factory/kdebase3/kdebase3.changes 2014-10-25 11:12:11.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdebase3.new/kdebase3.changes 2014-12-01 14:01:24.000000000 +0100 @@ -1,0 +2,10 @@ +Sat Nov 29 21:47:00 UTC 2014 - Led <led...@gmail.com> + +- fix bashisms kde3 and startkde scripts +- update patches: + * startkde.diff + * kde3-session-restore.diff +- add patches: + * kdebase-3.5.10-fix-bashisms.patch + +------------------------------------------------------------------- New: ---- kdebase-3.5.10-fix-bashisms.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase3.spec ++++++ --- /var/tmp/diff_new_pack.MrNdsp/_old 2014-12-01 14:01:27.000000000 +0100 +++ /var/tmp/diff_new_pack.MrNdsp/_new 2014-12-01 14:01:27.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package kdebase3 # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 @@ -129,6 +129,7 @@ Source25: kdm3 Patch0: kdebase-svn-merge-diff.patch Patch3: startkde.diff +Patch4: kdebase-3.5.10-fix-bashisms.patch Patch5: media-iPod.diff Patch6: ksysguardd-openslp.diff Patch7: fix-kio-smb-auth.diff @@ -491,6 +492,7 @@ %setup -q -b 8 -b 13 -n kdebase-%{kde_version} %patch0 -p1 %patch3 +%patch4 -p1 %patch5 %if 0%{?with_hal} == 0 %patch280 -p1 ++++++ kde3-session-restore.diff ++++++ --- /var/tmp/diff_new_pack.MrNdsp/_old 2014-12-01 14:01:28.000000000 +0100 +++ /var/tmp/diff_new_pack.MrNdsp/_new 2014-12-01 14:01:28.000000000 +0100 @@ -6,7 +6,7 @@ # and make sure this script is in $PATH (e.g. make a symlink if necessary). # -+PATH=/opt/kde3/bin:${PATH/:\/opt\/kde3\/bin} ++PATH=/opt/kde3/bin:$((echo "$PATH" | sed 's|:/opt/kde3/bin||g)) +export PATH + exec "$@" ++++++ kdebase-3.5.10-fix-bashisms.patch ++++++ diff -Ndur kdebase-3.5.10/startkde kdebase-3.5.10-fix-bashisms/startkde --- kdebase-3.5.10/startkde 2008-08-19 22:56:42.000000000 +0300 +++ kdebase-3.5.10-fix-bashisms/startkde 2014-11-29 23:43:54.429507492 +0200 @@ -337,6 +337,7 @@ KDE_FULL_SESSION=true export KDE_FULL_SESSION xprop -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true +[ -n "$UID" ] || UID="$(id -ru)" KDE_SESSION_UID=$UID export KDE_SESSION_UID ++++++ startkde.diff ++++++ --- /var/tmp/diff_new_pack.MrNdsp/_old 2014-12-01 14:01:28.000000000 +0100 +++ /var/tmp/diff_new_pack.MrNdsp/_new 2014-12-01 14:01:28.000000000 +0100 @@ -6,7 +6,7 @@ # DEFAULT KDE STARTUP SCRIPT ( KDE-3.5.10 ) # -+PATH=/opt/kde3/bin:${PATH/:\/opt\/kde3\/bin} ++PATH=/opt/kde3/bin:$((echo "$PATH" | sed 's|:/opt/kde3/bin||g)) +export PATH +test -x /usr/bin/xrandr && /usr/bin/xrandr --auto # When the X server dies we get a HUP signal from xinit. We must ignore it -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org