Hello community, here is the log from the commit of package compiz-manager for openSUSE:Factory checked in at Wed Dec 16 17:38:36 CET 2009. -------- --- compiz-manager/compiz-manager.changes 2009-11-23 18:11:27.000000000 +0100 +++ /mounts/work_src_done/STABLE/compiz-manager/compiz-manager.changes 2009-12-16 10:57:33.000000000 +0100 @@ -1,0 +2,8 @@ +Wed Dec 16 10:55:13 CET 2009 - dimstar@opensuse.org + +- Add compiz-manager-bnc564536.patch: + + Properly detect loaded drivers also on x86_64 systems + + Fix regex - there are sometimes double-/ in paths + + Run lspci from /sbin. /sbin is not in $PATH for regular users. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- compiz-manager-bnc564536.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ compiz-manager.spec ++++++ --- /var/tmp/diff_new_pack.XI06O5/_old 2009-12-16 17:37:01.000000000 +0100 +++ /var/tmp/diff_new_pack.XI06O5/_new 2009-12-16 17:37:01.000000000 +0100 @@ -19,8 +19,8 @@ Name: compiz-manager Version: 0.6.0 -Release: 2 -License: GPL v2 or later +Release: 3 +License: GPLv2+ Summary: A wrapper script to launch Compiz with proper options Url: http://opencompositing.org Group: System/X11/Utilities @@ -38,6 +38,8 @@ Patch9: compiz-manager-dry_run.patch # PATCH-FIX-UPSTREAM compiz-manager-fallback_xterm.patch -- Have one last fallback to xterm if nothing else works, taken from upstream git Patch10: compiz-manager-fallback_xterm.patch +# PATCH-FIX-UPSTREAM compiz-manager-bnc564536.patch bnc#564536 dimstar@opensuse.org -- Account for lib64 and double slashes in paths. +Patch11: compiz-manager-bnc564536.patch PreReq: %fillup_prereq Requires: compiz BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -58,6 +60,7 @@ %patch8 -p0 %patch9 -p1 %patch10 -p1 +%patch11 -p0 %build ++++++ compiz-manager-bnc564536.patch ++++++ --- /usr/bin/compiz-manager 2009-11-25 17:12:41.000000000 +0100 +++ compiz-manager 2009-12-16 10:32:08.000000000 +0100 @@ -53,7 +53,7 @@ NVIDIA_SETTINGS="nvidia-settings" # Assume it's in the path by default # For detecting what driver is in use, the + is for one or more /'s -XORG_DRIVER_PATH="/usr/lib/xorg/modules/drivers/+" +XORG_DRIVER_PATH="/usr/+lib[6][4]/+xorg/+modules/+drivers/+" FALLBACKWM="xterm" if [ x"$KDE_FULL_SESSION" = x"true" ]; then FALLBACKWM="${KWIN}"; @@ -297,14 +297,14 @@ # check pciid blacklist have_blacklisted_pciid() { - OUTPUT=$(lspci -n) + OUTPUT=$(/sbin/lspci -n) for ID in ${BLACKLIST_PCIIDS}; do if echo "$OUTPUT" | egrep -q "$ID"; then verbose "Blacklisted PCIID '$ID' found \n" return 0 fi done - OUTPUT=$(lspci -vn | grep -i VGA) + OUTPUT=$(/sbin/lspci -vn | grep -i VGA) verbose "Detected PCI ID for VGA: $OUTPUT\n" return 1 } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org