Hello community, here is the log from the commit of package x11-tools for openSUSE:Factory checked in at Mon Aug 2 10:28:20 CEST 2010. -------- --- x11-tools/x11-tools.changes 2009-09-01 19:10:11.000000000 +0200 +++ /mounts/work_src_done/STABLE/x11-tools/x11-tools.changes 2010-07-29 22:11:06.000000000 +0200 @@ -1,0 +2,13 @@ +Thu Jul 29 22:08:07 CEST 2010 - sndirsch@suse.de + +- moved distribution hooks from post-installl to pre-install since + driver installation is expected to fail due to nouveau driver + still active + +------------------------------------------------------------------- +Thu Jul 29 06:44:57 CEST 2010 - sndirsch@suse.de + +- added distribution hook scripts for nvidia-installer to disable + nouveau module and remove it from initrd if required + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- nvidia-post-uninstall nvidia-pre-install ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ x11-tools.spec ++++++ --- /var/tmp/diff_new_pack.8Wohpz/_old 2010-08-02 10:25:52.000000000 +0200 +++ /var/tmp/diff_new_pack.8Wohpz/_new 2010-08-02 10:25:52.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package x11-tools (Version 0.1) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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 @@ -19,14 +19,14 @@ Name: x11-tools -License: GPL v2 or later ; MIT License (or similar) +License: GPLv2+ ; MIT License (or similar) Group: System/X11/Utilities PreReq: %fillup_prereq Provides: xf86tools 3ddiag Obsoletes: xf86tools 3ddiag AutoReqProv: on Version: 0.1 -Release: 171 +Release: 179 Summary: Tools for the X Window System Source2: xf86debug Source3: switch2nv @@ -37,6 +37,8 @@ Source32: xim.template Source33: none Source34: sysconfig.language-%{name} +Source35: nvidia-pre-install +Source36: nvidia-post-uninstall BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -68,6 +70,11 @@ install -c -m0644 $RPM_SOURCE_DIR/sysconfig.language-%{name} $RPM_BUILD_ROOT/var/adm/fillup-templates/ install -m 755 $RPM_SOURCE_DIR/switch2nv $RPM_BUILD_ROOT/usr/bin install -m 755 $RPM_SOURCE_DIR/switch2nvidia $RPM_BUILD_ROOT/usr/bin +mkdir -p $RPM_BUILD_ROOT/usr/lib/nvidia +install -m 755 $RPM_SOURCE_DIR/nvidia-pre-install \ + $RPM_BUILD_ROOT/usr/lib/nvidia/pre-install +install -m 755 $RPM_SOURCE_DIR/nvidia-post-uninstall \ + $RPM_BUILD_ROOT/usr/lib/nvidia/post-uninstall %post %{fillup_only -an language} @@ -75,11 +82,14 @@ %files %defattr(-, root, root) %dir /etc/X11/xim.d +%dir /usr/lib/nvidia /usr/bin/xf86debug /usr/bin/wmlist /usr/bin/kroot /usr/bin/switch2nv /usr/bin/switch2nvidia +/usr/lib/nvidia/pre-install +/usr/lib/nvidia/post-uninstall /etc/X11/xim /etc/X11/xim.d/* /etc/skel/.xim.template ++++++ nvidia-post-uninstall ++++++ #!/bin/sh rm /etc/modprobe.d/nvidia.conf ++++++ nvidia-pre-install ++++++ #!/bin/sh echo "blacklist nouveau" > /etc/modprobe.d/nvidia.conf # recreate initrd without KMS, if the use of KMS is enabled in initrd if grep -q NO_KMS_IN_INITRD=\"no\" /etc/sysconfig/kernel; then sed -i 's/NO_KMS_IN_INITRD.*/NO_KMS_IN_INITRD="yes"/g' /etc/sysconfig/kernel mkinitrd fi ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org