pool/x11-tools
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 44210 from home:sndirsch:branches:X11:Utilities

Browse Source 
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
This commit is contained in:
Stefan Dirsch 2010-07-29 20:12:02 +00:00 committed by Git OBS Bridge
parent 46b54b9b76
commit d2688a56cd
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
nvidia-post-install → nvidia-pre-install
View File

7
x11-tools.changes
View File

@ -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 Thu Jul 29 06:44:57 CEST 2010 - sndirsch@suse.de

12
x11-tools.spec
View File

@ -37,7 +37,7 @@ Source31: xim
Source32: xim.template Source32: xim.template
Source33: none Source33: none
Source34: sysconfig.language-%{name} Source34: sysconfig.language-%{name}
Source35: nvidia-post-install Source35: nvidia-pre-install
Source36: nvidia-post-uninstall Source36: nvidia-post-uninstall
BuildArch: noarch BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build 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/switch2nv $RPM_BUILD_ROOT/usr/bin
install -m 755 $RPM_SOURCE_DIR/switch2nvidia $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 mkdir -p $RPM_BUILD_ROOT/usr/lib/nvidia
install -m 755 $RPM_SOURCE_DIR/nvidia-post-install \ install -m 755 $RPM_SOURCE_DIR/nvidia-pre-install \
$RPM_BUILD_ROOT/usr/lib/nvidia $RPM_BUILD_ROOT/usr/lib/nvidia/pre-install
install -m 755 $RPM_SOURCE_DIR/nvidia-post-uninstall \ install -m 755 $RPM_SOURCE_DIR/nvidia-post-uninstall \
$RPM_BUILD_ROOT/usr/lib/nvidia $RPM_BUILD_ROOT/usr/lib/nvidia/post-uninstall
%post %post
%{fillup_only -an language} %{fillup_only -an language}
@ -88,8 +88,8 @@ install -m 755 $RPM_SOURCE_DIR/nvidia-post-uninstall \
/usr/bin/kroot /usr/bin/kroot
/usr/bin/switch2nv /usr/bin/switch2nv
/usr/bin/switch2nvidia /usr/bin/switch2nvidia
/usr/lib/nvidia/nvidia-post-install /usr/lib/nvidia/pre-install
/usr/lib/nvidia/nvidia-post-uninstall /usr/lib/nvidia/post-uninstall
/etc/X11/xim /etc/X11/xim
/etc/X11/xim.d/* /etc/X11/xim.d/*
/etc/skel/.xim.template /etc/skel/.xim.template