From d2688a56cda29591717ff5870b49d5134170b5419ec139a578839f7046b9bdce Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Thu, 29 Jul 2010 20:12:02 +0000
Subject: [PATCH] Accepting request 44210 from
 home:sndirsch:branches:X11:Utilities

Copy from home:sndirsch:branches:X11:Utilities/x11-tools via accept of submit request 44210 revision 2.
Request was accepted with message:
accepted

OBS-URL: https://build.opensuse.org/request/show/44210
OBS-URL: https://build.opensuse.org/package/show/X11:Utilities/x11-tools?expand=0&rev=6
---
 nvidia-post-install => nvidia-pre-install |  0
 x11-tools.changes                         |  7 +++++++
 x11-tools.spec                            | 12 ++++++------
 3 files changed, 13 insertions(+), 6 deletions(-)
 rename nvidia-post-install => nvidia-pre-install (100%)

diff --git a/nvidia-post-install b/nvidia-pre-install
similarity index 100%
rename from nvidia-post-install
rename to nvidia-pre-install
diff --git a/x11-tools.changes b/x11-tools.changes
index 64449f4..a31e672 100644
--- a/x11-tools.changes
+++ b/x11-tools.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+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
 
diff --git a/x11-tools.spec b/x11-tools.spec
index df08143..a99698d 100644
--- a/x11-tools.spec
+++ b/x11-tools.spec
@@ -37,7 +37,7 @@ Source31:       xim
 Source32:       xim.template
 Source33:       none
 Source34:       sysconfig.language-%{name}
-Source35:       nvidia-post-install
+Source35:       nvidia-pre-install
 Source36:       nvidia-post-uninstall
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -71,10 +71,10 @@ install -c -m0644 $RPM_SOURCE_DIR/sysconfig.language-%{name} $RPM_BUILD_ROOT/var
 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-post-install \
-  $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
+  $RPM_BUILD_ROOT/usr/lib/nvidia/post-uninstall
 
 %post
 %{fillup_only -an language}
@@ -88,8 +88,8 @@ install -m 755 $RPM_SOURCE_DIR/nvidia-post-uninstall \
 /usr/bin/kroot
 /usr/bin/switch2nv
 /usr/bin/switch2nvidia
-/usr/lib/nvidia/nvidia-post-install
-/usr/lib/nvidia/nvidia-post-uninstall
+/usr/lib/nvidia/pre-install
+/usr/lib/nvidia/post-uninstall
 /etc/X11/xim
 /etc/X11/xim.d/*
 /etc/skel/.xim.template