rpms/openafs/EL-6 - New directory
by Jack Neely
Author: jjneely
Update of /cvs/free/rpms/openafs/EL-6
In directory se02.es.rpmfusion.net:/tmp/cvs-serv6645/EL-6
Log Message:
Directory /cvs/free/rpms/openafs/EL-6 added to the repository
13 years, 5 months
rpms/openafs/devel afs.conf,1.1,1.2 openafs.spec,1.3,1.4
by Jack Neely
Author: jjneely
Update of /cvs/free/rpms/openafs/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv5436
Modified Files:
afs.conf openafs.spec
Log Message:
* Thu Nov 04 2010 Jack Neely <jjneely(a)ncsu.edu> 0:1.4.12.1-5
- RHEL 6 doesn't have a "redhat-release" package and the afs.conf
script that generates the sysnames needed correcting as it references
that package
Index: afs.conf
===================================================================
RCS file: /cvs/free/rpms/openafs/devel/afs.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- afs.conf 10 Jun 2010 21:14:05 -0000 1.1
+++ afs.conf 4 Nov 2010 21:29:09 -0000 1.2
@@ -23,7 +23,7 @@
_KERN=`uname -r | sed 's/\([0-9]\+\)\.\([0-9]\+\)\..*/\1\2/'`
_DIST=""
-for d in fedora redhat centos ; do
+for d in fedora centos redhat ; do
if [ -f "/etc/$d-release" ] ; then
_DIST=$d
break
@@ -32,7 +32,7 @@
# What version of the distribution are we? Cut off the Client|Server
# mess from RHEL
-_REL=`/bin/rpm -q --qf '%{version}\n' ${_DIST}-release | sed 's/\([0-9]\+\)[a-zA-Z]\+/\1/'`
+_REL=`/bin/rpm -qf --qf '%{version}\n' /etc/${_DIST}-release | sed 's/\([0-9]\+\)[a-zA-Z]\+/\1/'`
# Sysname list. The order here is from specific to general. This
# will be used as the sysname search path.
Index: openafs.spec
===================================================================
RCS file: /cvs/free/rpms/openafs/devel/openafs.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- openafs.spec 15 Jul 2010 17:06:52 -0000 1.3
+++ openafs.spec 4 Nov 2010 21:29:09 -0000 1.4
@@ -13,7 +13,7 @@
Summary: Enterprise Network File System
Name: openafs
Version: 1.4.12.1
-Release: 4%{?dist}
+Release: 5%{?dist}
License: IBM
Group: System Environment/Daemons
URL: http://www.openafs.org
@@ -298,6 +298,11 @@
%changelog
+* Thu Nov 04 2010 Jack Neely <jjneely(a)ncsu.edu> 0:1.4.12.1-5
+- RHEL 6 doesn't have a "redhat-release" package and the afs.conf
+ script that generates the sysnames needed correcting as it references
+ that package
+
* Thu Jul 15 2010 Jack Neely <jjneely(a)ncsu.edu> 0:1.4.12.1-4
- RPMFusion Bug #1333
13 years, 5 months
rpms/openafs/F-14 afs.conf,1.1,1.2 openafs.spec,1.3,1.4
by Jack Neely
Author: jjneely
Update of /cvs/free/rpms/openafs/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv5360
Modified Files:
afs.conf openafs.spec
Log Message:
* Thu Nov 04 2010 Jack Neely <jjneely(a)ncsu.edu> 0:1.4.12.1-5
- RHEL 6 doesn't have a "redhat-release" package and the afs.conf
script that generates the sysnames needed correcting as it references
that package
Index: afs.conf
===================================================================
RCS file: /cvs/free/rpms/openafs/F-14/afs.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- afs.conf 10 Jun 2010 21:14:05 -0000 1.1
+++ afs.conf 4 Nov 2010 21:28:02 -0000 1.2
@@ -23,7 +23,7 @@
_KERN=`uname -r | sed 's/\([0-9]\+\)\.\([0-9]\+\)\..*/\1\2/'`
_DIST=""
-for d in fedora redhat centos ; do
+for d in fedora centos redhat ; do
if [ -f "/etc/$d-release" ] ; then
_DIST=$d
break
@@ -32,7 +32,7 @@
# What version of the distribution are we? Cut off the Client|Server
# mess from RHEL
-_REL=`/bin/rpm -q --qf '%{version}\n' ${_DIST}-release | sed 's/\([0-9]\+\)[a-zA-Z]\+/\1/'`
+_REL=`/bin/rpm -qf --qf '%{version}\n' /etc/${_DIST}-release | sed 's/\([0-9]\+\)[a-zA-Z]\+/\1/'`
# Sysname list. The order here is from specific to general. This
# will be used as the sysname search path.
Index: openafs.spec
===================================================================
RCS file: /cvs/free/rpms/openafs/F-14/openafs.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- openafs.spec 15 Jul 2010 17:06:52 -0000 1.3
+++ openafs.spec 4 Nov 2010 21:28:02 -0000 1.4
@@ -13,7 +13,7 @@
Summary: Enterprise Network File System
Name: openafs
Version: 1.4.12.1
-Release: 4%{?dist}
+Release: 5%{?dist}
License: IBM
Group: System Environment/Daemons
URL: http://www.openafs.org
@@ -298,6 +298,11 @@
%changelog
+* Thu Nov 04 2010 Jack Neely <jjneely(a)ncsu.edu> 0:1.4.12.1-5
+- RHEL 6 doesn't have a "redhat-release" package and the afs.conf
+ script that generates the sysnames needed correcting as it references
+ that package
+
* Thu Jul 15 2010 Jack Neely <jjneely(a)ncsu.edu> 0:1.4.12.1-4
- RPMFusion Bug #1333
13 years, 5 months
rpms/mythtv/F-14 mythbackend.init, NONE, 1.1 mythbackend.logrotate, NONE, 1.1 mythbackend.sysconfig, NONE, 1.1 mythbackend.init.in, 1.3, NONE mythbackend.logrotate.in, 1.1, NONE mythbackend.sysconfig.in, 1.1, NONE
by Jarod Wilson
Author: jarod
Update of /cvs/free/rpms/mythtv/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv915
Added Files:
mythbackend.init mythbackend.logrotate mythbackend.sysconfig
Removed Files:
mythbackend.init.in mythbackend.logrotate.in
mythbackend.sysconfig.in
Log Message:
I hate cvs with a passion.
--- NEW FILE mythbackend.init ---
#!/bin/bash
#
# Startup script for mythbackend
#
# chkconfig: - 86 14
# description: mythbackend.
# processname: mythbackend
# pidfile: /var/run/mythbackend.pid
# config:
# Source function library.
. /etc/init.d/functions
if [ -f /etc/sysconfig/mythbackend ]; then
. /etc/sysconfig/mythbackend
fi
## Defaults, override them in /etc/sysconfig/mythbackend
MYTHTV_HOME=${MYTHTV_HOME:-/etc/mythtv}
MYTHBACKEND_USER=${MYTHBACKEND_USER:-root}
binary=/usr/bin/mythbackend
prog=mythbackend
RETVAL=0
OPTIONS="$OPTIONS --daemon --user ${MYTHBACKEND_USER} --logfile /var/log/mythtv/$prog.log --pidfile /var/run/$prog.pid"
start() {
echo -n $"Starting $prog: "
touch /var/run/mythbackend.pid
if [ "${MYTHBACKEND_USER}" != root ]; then
chown ${MYTHBACKEND_USER}:${MYTHBACKEND_USER} /var/run/mythbackend.pid
/usr/bin/setfacl -m u:${MYTHBACKEND_USER}:rwx -R /dev/dvb/
/usr/bin/setfacl -m u:${MYTHBACKEND_USER}:rwx -R /dev/snd/
/usr/bin/setfacl -m u:${MYTHBACKEND_USER}:rw- /dev/video*
/usr/bin/setfacl -m u:${MYTHBACKEND_USER}:rw- /dev/vbi*
fi
export MYTHCONFDIR="$MYTHTV_HOME"
export HOME="$MYTHTV_HOME"
daemon $binary $OPTIONS
RETVAL=$?
echo
[ $RETVAL = 0 ] && touch /var/lock/subsys/$prog
return $RETVAL
}
stop() {
echo -n $"Stopping $prog: "
killproc $binary
RETVAL=$?
if [ "${MYTHBACKEND_USER}" != root ]; then
/usr/bin/setfacl -x u:${MYTHBACKEND_USER} -R /dev/dvb/
/usr/bin/setfacl -x u:${MYTHBACKEND_USER} -R /dev/snd/
/usr/bin/setfacl -x u:${MYTHBACKEND_USER} /dev/video*
/usr/bin/setfacl -x u:${MYTHBACKEND_USER} /dev/vbi*
fi
echo
[ $RETVAL = 0 ] && rm -f /var/lock/subsys/$prog /var/run/$prog.pid
}
# See how we were called.
case "$1" in
start)
start
;;
stop)
stop
;;
reload|restart)
stop
start
;;
status)
status $prog
RETVAL=$?
;;
*)
echo $"Usage: $prog {start|stop|status|restart}"
exit 1
esac
exit $RETVAL
--- NEW FILE mythbackend.logrotate ---
/var/log/mythtv/mythbackend.log {
notifempty
missingok
compress
compresscmd /usr/bin/bzip2
uncompresscmd /usr/bin/bunzip2
compressext .bz2
weekly
rotate 4
size 10M
postrotate
/bin/kill -HUP `cat /var/run/mythbackend.pid 2>/dev/null` 2> /dev/null || true
endscript
}
--- NEW FILE mythbackend.sysconfig ---
#MYTHTV_HOME=/etc/mythtv
# mythbackend runs as root by default, but support for running as a non-root
# user should be functional. However, switching to a non-root user on an
# existing setup will require fixing up permissions on files mythbackend
# needs access to -- particularly, your recordings, which are owned by the
# user mythbackend runs as. If you switch from running as root to running as
# user mythtv, deleting existing recordings won't work until their file
# ownership has been changed from root to mythtv as well.
#MYTHBACKEND_USER=mythtv
#OPTIONS=
--- mythbackend.init.in DELETED ---
--- mythbackend.logrotate.in DELETED ---
--- mythbackend.sysconfig.in DELETED ---
13 years, 6 months
rpms/mythtv/F-14 mythtv.spec,1.78,1.79 sources,1.50,1.51
by Jarod Wilson
Author: jarod
Update of /cvs/free/rpms/mythtv/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv32208
Modified Files:
mythtv.spec sources
Log Message:
* Wed Nov 03 2010 Jarod Wilson <jarod(a)redhat.com> 0.24-0.2.rc2
- Update to svn trunk, revision 27095 (post-rc2)
- Add Obsoletes/Provides for nuked mythmovies
- Restore run-with-non-root-backend-capable initscript from F13 branch
Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-14/mythtv.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -r1.78 -r1.79
--- mythtv.spec 27 Oct 2010 01:42:32 -0000 1.78
+++ mythtv.spec 4 Nov 2010 03:55:21 -0000 1.79
@@ -80,7 +80,7 @@
Version: 0.24
%if "%{branch}" == "trunk"
#Release: 0.1.svn.%{_svnrev}%{?dist}
-Release: 0.2.rc1%{?dist}
+Release: 0.2.rc2%{?dist}
%else
Release: 1%{?dist}
%endif
@@ -134,9 +134,9 @@
#Patch0: mythtv-%{version}-svnfixes.patch
#Patch1: mythplugins-%{version}-svnfixes.patch
Source10: PACKAGE-LICENSING
-Source101: mythbackend.sysconfig.in
-Source102: mythbackend.init.in
-Source103: mythbackend.logrotate.in
+Source101: mythbackend.sysconfig
+Source102: mythbackend.init
+Source103: mythbackend.logrotate
Source106: mythfrontend.png
Source107: mythfrontend.desktop
Source108: mythtv-setup.png
@@ -559,6 +559,9 @@
# same deal for mythflix
Provides: mythflix = %{version}-%{release}
Obsoletes: mythflix < %{version}-%{release}
+# and now mythmovies
+Provides: mythmovies = %{version}-%{release}
+Obsoletes: mythmovies < %{version}-%{release}
%description common
MythTV provides a unified graphical interface for recording and viewing
@@ -597,6 +600,7 @@
#BuildArch: noarch
Requires: MySQL-python
+Requires: PyXML
%description -n python-MythTV
Provides a python-based interface to interacting with MythTV.
@@ -695,29 +699,6 @@
%description -n mythgame
A game frontend (xmame, nes, snes, pc) for MythTV.
-################################################################################
-#package -n mythgame-emulators
-#Summary: Meta-package requiring emulators for game types mythgame knows about
-#Group: Applications/Multimedia
-#Requires: mythgame = %{version}-%{release}
-# Multi Arcade Machine Emulator, Amiga, Atari 2600
-#Requires: sdlmame
-#Requires: e-uae
-#Requires: stella
-# Nintendo, Super Nintendo, Nintendo 64
-#Requires: fceultra
-#Requires: zsnes
-#Requires: mupen64, mupen64-ricevideo
-# Sega Genesis, Sega Master System, Game Gear
-#Requires: gens
-#Requires: dega-sdl
-#Requires: osmose
-# TurboGraphx 16 (and others)
-#Requires: mednafen
-
-#description -n mythgame-emulators
-#Meta-package requiring emulators for game types mythgame knows about.
-
%endif
################################################################################
%if %{with_mythmusic}
@@ -826,7 +807,7 @@
Requires: python-MythTV = %{version}-%{release}
Requires: python-pycurl
Requires: python >= 2.5
-# Technically, it *does* require this... But its not in the RPM Fusion repos.
+# This is packaged in adobe's yum repo
#Requires: flash-plugin
%description -n mythnetvision
@@ -868,25 +849,9 @@
sed -i -e 's#perl Makefile.PL#%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"#' \
bindings/perl/Makefile
-# Install other source files, and fix pathnames
+# Install other source files
cp -a %{SOURCE10} %{SOURCE101} %{SOURCE102} %{SOURCE103} .
cp -a %{SOURCE106} %{SOURCE107} %{SOURCE108} %{SOURCE109} .
- for file in mythbackend.init \
- mythbackend.sysconfig \
- mythbackend.logrotate; do
- sed -e's|@logdir@|%{_localstatedir}/log|g' \
- -e's|@rundir@|%{_localstatedir}/run|g' \
- -e's|@sysconfdir@|%{_sysconfdir}|g' \
- -e's|@sysconfigdir@|%{_sysconfdir}/sysconfig|g' \
- -e's|@initdir(a)|%{_sysconfdir}/init.d|g' \
- -e's|@bindir@|%{_bindir}|g' \
- -e's|@sbindir@|%{_sbindir}|g' \
- -e's|@subsysdir@|%{_localstatedir}/lock/subsys|g' \
- -e's|@varlibdir@|%{_localstatedir}/lib|g' \
- -e's|@varcachedir@|%{_localstatedir}/cache|g' \
- -e's|@logrotatedir(a)|%{_sysconfdir}/logrotate.d|g' \
- < $file.in > $file
- done
# Prevent all of those nasty installs to ../../../../../bin/whatever
# echo "QMAKE_PROJECT_DEPTH = 0" >> mythtv.pro
@@ -1397,12 +1362,6 @@
%dir %{_datadir}/mame/flyers
%{_datadir}/mythtv/game_settings.xml
%{_datadir}/mythtv/i18n/mythgame_*.qm
-
-#files -n mythgame-emulators
-#defattr(-,root,root,-)
-#{_datadir}/mythtv/games/xmame
-#{_datadir}/mame/screens
-#{_datadir}/mame/flyers
%endif
%if %{with_mythmusic}
@@ -1492,6 +1451,11 @@
################################################################################
%changelog
+* Wed Nov 03 2010 Jarod Wilson <jarod(a)redhat.com> 0.24-0.2.rc2
+- Update to svn trunk, revision 27095 (post-rc2)
+- Add Obsoletes/Provides for nuked mythmovies
+- Restore run-with-non-root-backend-capable initscript from F13 branch
+
* Tue Oct 26 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.24-0.2.rc1
- Update to svn trunk, revision 26998 (which is actually post-0.24-rc1)
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mythtv/F-14/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- sources 27 Oct 2010 01:27:13 -0000 1.50
+++ sources 4 Nov 2010 03:55:21 -0000 1.51
@@ -1,4 +1,4 @@
be3ab99952c2a3a135a7c4af90b08f15 mythfrontend.png
be3ab99952c2a3a135a7c4af90b08f15 mythtv-setup.png
-375117962689570c64f43cab37169217 mythplugins-0.24.tar.bz2
-1dc75cd41a7a4ecf6a7e91eff6c60294 mythtv-0.24.tar.bz2
+20588aecd7733500e0a5e33150f1df77 mythtv-0.24.tar.bz2
+4770732400ffa75bb64176c9aa7097fa mythplugins-0.24.tar.bz2
13 years, 6 months
rpms/xorg-x11-drv-nvidia/F-14 00-nvidia.conf, NONE, 1.1 nvidia-xorg.conf, NONE, 1.1 .cvsignore, 1.23, 1.24 sources, 1.23, 1.24 xorg-x11-drv-nvidia.spec, 1.49, 1.50 nvidia-config-display, 1.4, NONE nvidia-init, 1.4, NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv16763/F-14
Modified Files:
.cvsignore sources xorg-x11-drv-nvidia.spec
Added Files:
00-nvidia.conf nvidia-xorg.conf
Removed Files:
nvidia-config-display nvidia-init
Log Message:
Resync witg lcd removal
--- NEW FILE 00-nvidia.conf ---
#This file is provided by xorg-x11-drv-nvidia
#Do not edit
Section "Files"
ModulePath "@LIBDIR@/xorg/modules/extensions/nvidia"
ModulePath "@LIBDIR@/xorg/modules"
EndSection
--- NEW FILE nvidia-xorg.conf ---
# RPM Fusion - nvidia-xorg.conf
#
Section "Device"
Identifier "Videocard0"
Driver "nvidia"
EndSection
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-14/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources 14 Oct 2010 19:35:54 -0000 1.23
+++ sources 3 Nov 2010 23:07:03 -0000 1.24
@@ -1,2 +1,2 @@
-111da94be1ea21c0531b6e1c45d01b9b NVIDIA-Linux-x86_64-260.19.12-no-compat32.run
8bcefb2423908160d3676200650ad5c9 NVIDIA-Linux-x86-260.19.12.run
+111da94be1ea21c0531b6e1c45d01b9b NVIDIA-Linux-x86_64-260.19.12-no-compat32.run
Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-14/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- xorg-x11-drv-nvidia.spec 24 Oct 2010 17:20:25 -0000 1.49
+++ xorg-x11-drv-nvidia.spec 3 Nov 2010 23:07:03 -0000 1.50
@@ -9,7 +9,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 1
Version: 260.19.12
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -17,9 +17,11 @@
URL: http://www.nvidia.com/
Source0: ftp://download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%...
Source1: ftp://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x8...
-Source5: nvidia-init
+Source2: 00-nvidia.conf
+Source3: nvidia-xorg.conf
+#Source5: nvidia-init
Source6: blacklist-nouveau.conf
-Source10: nvidia-config-display
+#Source10: nvidia-config-display
Source11: nvidia-README.Fedora
# So we don't pull other nvidia variants
Source91: filter-requires.sh
@@ -40,24 +42,23 @@
Requires: nvidia-xconfig
Requires: nvidia-settings
-Requires: nvidia-kmod >= %{version}
-Requires(post): nvidia-kmod >= %{version}
+Requires: nvidia-kmod = %{version}
# Needed in all nvidia or fglrx driver packages
BuildRequires: prelink
Requires: which
-Requires: livna-config-display >= 0.0.21
+#Requires: livna-config-display >= 0.0.21
%if 0%{?fedora} > 10 || 0%{?rhel} > 5
Requires: %{name}-libs%{_isa} = %{?epoch}:%{version}-%{release}
%else
Requires: %{name}-libs-%{_target_cpu} = %{version}-%{release}
%endif
-Requires(post): livna-config-display
-Requires(preun): livna-config-display
-Requires(post): chkconfig
+#Requires(post): livna-config-display
+#Requires(preun): livna-config-display
+#Requires(post): chkconfig
Requires(post): ldconfig
-Requires(preun): chkconfig
+#Requires(preun): chkconfig
Provides: nvidia-kmod-common = %{?epoch}:%{version}
@@ -90,7 +91,11 @@
%package devel
Summary: Development files for %{name}
Group: Development/Libraries
+%if 0%{?fedora} > 10 || 0%{?rhel} > 5
+Requires: %{name}-libs%{_isa} = %{?epoch}:%{version}-%{release}
+%else
Requires: %{name}-libs-%{_target_cpu} = %{?epoch}:%{version}-%{release}
+%endif
#Introduced in F10 when 173xx has forked to legacy serie
Obsoletes: xorg-x11-drv-nvidia-newest-devel < %{version}-100
Provides: xorg-x11-drv-nvidia-newest-devel = %{version}-101
@@ -170,7 +175,7 @@
install -p -m 0644 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/
# Install initscript
-install -D -p -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_initrddir}/nvidia
+#install -D -p -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_initrddir}/nvidia
# OpenCL config
install -m 0755 -d $RPM_BUILD_ROOT%{_sysconfdir}/OpenCL/vendors/
@@ -218,7 +223,7 @@
# X configuration script
-install -D -p -m 0755 %{SOURCE10} $RPM_BUILD_ROOT%{_sbindir}/nvidia-config-display
+#install -D -p -m 0755 %{SOURCE10} $RPM_BUILD_ROOT%{_sbindir}/nvidia-config-display
# Install nvidia icon
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
@@ -235,6 +240,13 @@
%endif
%endif
+#Install static driver dependant configuration files
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d
+install -pm 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d
+sed -i -e 's|@LIBDIR@|%{_libdir}|g' $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/00-nvidia.conf
+touch -r %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/00-nvidia.conf
+install -pm 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/X11/
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -242,10 +254,10 @@
%post
if [ "$1" -eq "1" ]; then
# Enable nvidia driver when installing
- %{_sbindir}/nvidia-config-display enable &>/dev/null ||:
+ #%{_sbindir}/nvidia-config-display enable &>/dev/null ||:
# Add init script and start it
- /sbin/chkconfig --add nvidia ||:
- /etc/init.d/nvidia start &>/dev/null ||:
+ #/sbin/chkconfig --add nvidia ||:
+ #/etc/init.d/nvidia start &>/dev/null ||:
if [ -x /sbin/grubby ] ; then
GRUBBYLASTKERNEL=`/sbin/grubby --default-kernel`
/sbin/grubby --update-kernel=${GRUBBYLASTKERNEL} --args='nouveau.modeset=0 rdblacklist=nouveau' &>/dev/null
@@ -260,12 +272,16 @@
%post libs -p /sbin/ldconfig
+%posttrans
+ [ -f %{_sysconfdir}/X11/xorg.conf ] || \
+ cp -p %{_sysconfdir}/X11/nvidia-xorg.conf %{_sysconfdir}/X11/xorg.conf || :
+
%preun
if [ "$1" -eq "0" ]; then
# Disable driver on final removal
- test -f %{_sbindir}/nvidia-config-display && %{_sbindir}/nvidia-config-display disable &>/dev/null
- %{_initrddir}/nvidia stop &>/dev/null
- /sbin/chkconfig --del nvidia &>/dev/null
+ #test -f %{_sbindir}/nvidia-config-display && %{_sbindir}/nvidia-config-display disable &>/dev/null
+ #%{_initrddir}/nvidia stop &>/dev/null
+ #/sbin/chkconfig --del nvidia &>/dev/null
#Clear grub option to disable nouveau for all kernels
if [ -x /sbin/grubby ] ; then
KERNELS=`ls /boot/vmlinuz-*%{?dist}.$(uname -m)`
@@ -291,11 +307,13 @@
%dir %{_sysconfdir}/OpenCL
%dir %{_sysconfdir}/OpenCL/vendors
%config %{_sysconfdir}/OpenCL/vendors/nvidia.icd
+%config %{_sysconfdir}/X11/xorg.conf.d/00-nvidia.conf
%config(noreplace) %{_sysconfdir}/modprobe.d/blacklist-nouveau.conf
-%{_initrddir}/nvidia
+%config(noreplace) %{_sysconfdir}/X11/nvidia-xorg.conf
+#{_initrddir}/nvidia
%{_bindir}/nvidia-bug-report.sh
%{_bindir}/nvidia-smi
-%{_sbindir}/nvidia-config-display
+#{_sbindir}/nvidia-config-display
# Xorg libs that do not need to be multilib
%dir %{_libdir}/xorg/modules/extensions/nvidia
%{_libdir}/xorg/modules/drivers/nvidia_drv.so
@@ -329,6 +347,13 @@
%changelog
+* Tue Nov 02 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 1:260.19.12-4
+- Disable selinux restorecon on initscript.
+- Avoid using livna-config-display on fedora 14 and later
+ because of rhbz#623742
+- Use static workaround
+- Explicitely use %%{_isa} dependency from -devel to -libs
+
* Sun Oct 24 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 1:260.19.12-3
- Improve uninstallation script rfbz#1398
- Fix selinux context on device creation rfbz#1421
--- nvidia-config-display DELETED ---
--- nvidia-init DELETED ---
13 years, 6 months
rpms/xorg-x11-drv-nvidia-96xx/F-14 00-nvidia.conf, NONE, 1.1 nvidia-96xx-xorg.conf, NONE, 1.1 nvidia-96xx-README.Fedora, 1.5, 1.6 xorg-x11-drv-nvidia-96xx.spec, 1.19, 1.20 nvidia-96xx-config-display, 1.5, NONE nvidia-96xx-init, 1.5, NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia-96xx/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv15838/F-14
Modified Files:
nvidia-96xx-README.Fedora xorg-x11-drv-nvidia-96xx.spec
Added Files:
00-nvidia.conf nvidia-96xx-xorg.conf
Removed Files:
nvidia-96xx-config-display nvidia-96xx-init
Log Message:
Resync with lcd removal
--- NEW FILE 00-nvidia.conf ---
#This file is provided by xorg-x11-drv-nvidia
#Do not edit
Section "Files"
ModulePath "@LIBDIR@/xorg/modules/extensions/nvidia"
ModulePath "@LIBDIR@/xorg/modules"
EndSection
--- NEW FILE nvidia-96xx-xorg.conf ---
# RPM Fusion - nvidia-96xx-xorg.conf
#
Section "Device"
Identifier "Videocard0"
Driver "nvidia"
Option "AddARGBGLXVisuals" "true"
EndSection
Index: nvidia-96xx-README.Fedora
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-96xx/F-14/nvidia-96xx-README.Fedora,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- nvidia-96xx-README.Fedora 3 Nov 2010 16:08:36 -0000 1.5
+++ nvidia-96xx-README.Fedora 3 Nov 2010 22:57:57 -0000 1.6
@@ -1,112 +1 @@
-README for Nvidia Linux Drivers, as packaged by livna.org.
-
-1. After Installation
----------------------
-
-You only have to restart X to start using the Nvidia drivers after
-installation. Either choose "Log Out" from the GNOME/KDE menu, and then
-press Ctrl-Alt-Backspace at the login prompt, or press Ctrl-Alt-Backspace
-directly. You should see a white screen with a big Nvidia logo in the middle
-for about one second.
-
-To check that hardware acceleration is working, issue the following command
-in a terminal:
-
- glxinfo | grep OpenGL
-
-That should print out
-
- OpenGL vendor string: NVIDIA Corporation
-
-among a few other things. Also, the command
-
- glxinfo | grep direct
-
-should print out
-
- direct rendering: Yes
-
-If it does, you're all set.
-
-2. Basic Configuration
-----------------------
-
-The installation scripts perform the basic configuration for you.
-When (if) you uninstall the drivers, the configuration is reset to
-use the X.org/XFree86 Nvidia drivers again. If you want to temporarily
-disable the Nvidia drivers without uninstalling, you can issue the
-following two commands as root (remember su -):
-
- nvidia-config-display disable
-
-To re-enable the Nvidia drivers, run:
-
- nvidia-config-display enable
-
-
-3. Additional configuration
----------------------------
-
-It's possible to configure image quality and performance by setting various
-environment variables. Take a look at /etc/profile.d/nvidia-glx.sh
-(or .csh if you use csh) and read the README file in the same directory
-as this file.
-
-There are a number of settings in the X configuration file as well.
-The most interesting are acceleration of the XRENDER extension and AGP
-configuration. In the Driver section of /etc/X11/xorg.conf, you may add
-the following line:
-
- Option "RenderAccel" "true"
-
-to enable XRENDER acceleration. A value of "false" disables it.
-Note: this has shown to make some systems unstable, making the display freeze.
-If you experience this, set to "false" or comment out the line.
-
-To control AGP behaviour, add the following line to the Driver section:
-
- Option "NvAGP" "X"
-
-where X is 0, 1, 2 or 3. The different values are as follows (from Nvidia
-README):
-
- 0 : disable agp
- 1 : use NVIDIA's internal AGP support, if possible
- 2 : use AGPGART, if possible
- 3 : use any agp support (try AGPGART, then NVIDIA's AGP)
-
-Default is 3. AGPGART is the Linux kernel AGP driver. See Nvidia README,
-appendix D for more information. AGP speed is controlled by giving a parameter
-to the Nvidia kernel module, but should be autodetected in most cases.
-See output of "modinfo nvidia".
-
-For more configuration options (TwinView, TV-out etc) see the Nvidia README.
-
-4. An Initscript to enable/disable nvidia driver
-------------------------------------------------
-
-To make gdm work at system start this package contains an initscript that
-will be run during start up. This script will detect if the nvidia module
-for the running kernel is present. If the module is present, then the
-initscript will run.
-
- "nvidia-config-display enable"
-
-so that the X server will use the nvidia driver, otherwise it will run
-
- "nvidia-config-display disable"
-
-and X will use the nv driver. You can disable this check by running, as
-root (with root $PATH) :
-
- chkconfig nvidia off
-
-
-This script will also be invoked when switching to runlevels 6
-(reboot) and 0 (halt). When rebooting (or shutting down) the system,
-the script will _disable_ nvidia driver (and switch back to "nv"
-driver), so that, whatever the kernel you boot, Red Hat Graphical Boot
-will work.
-
-We suggest you read the chkconfig(8) man page for complete
-informations about how to handle rc scripts.
+See http://rpmfusion.org/Howto/nVidia
Index: xorg-x11-drv-nvidia-96xx.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-96xx/F-14/xorg-x11-drv-nvidia-96xx.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- xorg-x11-drv-nvidia-96xx.spec 3 Nov 2010 16:08:36 -0000 1.19
+++ xorg-x11-drv-nvidia-96xx.spec 3 Nov 2010 22:57:57 -0000 1.20
@@ -8,7 +8,7 @@
Name: xorg-x11-drv-nvidia-96xx
Version: 96.43.19
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: NVIDIA's 96xx series proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -16,9 +16,11 @@
URL: http://www.nvidia.com/
Source0: ftp://download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%...
Source1: ftp://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x8...
-Source5: nvidia-96xx-init
+Source2: 00-nvidia.conf
+Source3: nvidia-96xx-xorg.conf
+#Source5: nvidia-96xx-init
Source6: blacklist-nouveau.conf
-Source10: nvidia-96xx-config-display
+#Source10: nvidia-96xx-config-display
Source11: nvidia-96xx-README.Fedora
# So we don't pull other nvidia variants
Source91: filter-requires.sh
@@ -45,14 +47,18 @@
# Needed in all nvidia or fglrx driver packages
BuildRequires: prelink
Requires: which
-Requires: livna-config-display
+#Requires: livna-config-display
+%if 0%{?fedora} > 10 || 0%{?rhel} > 5
+Requires: %{name}-libs%{_isa} = %{?epoch}:%{version}-%{release}
+%else
Requires: %{name}-libs-%{_target_cpu} = %{version}-%{release}
+%endif
-Requires(post): livna-config-display
-Requires(preun): livna-config-display
-Requires(post): chkconfig
+#Requires(post): livna-config-display
+#Requires(preun): livna-config-display
+#Requires(post): chkconfig
Requires(post): ldconfig
-Requires(preun): chkconfig
+#Requires(preun): chkconfig
Provides: nvidia-96xx-kmod-common = %{version}
@@ -82,7 +88,11 @@
%package devel
Summary: Development files for %{name}
Group: Development/Libraries
+%if 0%{?fedora} > 10 || 0%{?rhel} > 5
+Requires: %{name}-libs%{_isa} = %{?epoch}:%{version}-%{release}
+%else
Requires: %{name}-libs-%{_target_cpu} = %{version}-%{release}
+%endif
%description devel
This package provides the development files of the %{name} package,
@@ -192,10 +202,10 @@
ln -s libglx.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/nvidia/libglx.so
# X configuration script
-install -D -p -m 0755 %{SOURCE10} $RPM_BUILD_ROOT%{_sbindir}/nvidia-96xx-config-display
+#install -D -p -m 0755 %{SOURCE10} $RPM_BUILD_ROOT%{_sbindir}/nvidia-96xx-config-display
# Install initscript
-install -D -p -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_initrddir}/nvidia-96xx
+#install -D -p -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_initrddir}/nvidia-96xx
#Blacklist nouveau by F-11
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/
@@ -216,6 +226,13 @@
%endif
%endif
+#Install static driver dependant configuration files
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d
+install -pm 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d
+sed -i -e 's|@LIBDIR@|%{_libdir}|g' $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/00-nvidia.conf
+touch -r %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/00-nvidia.conf
+install -pm 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/X11/
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -224,15 +241,15 @@
%post
if [ "$1" -eq "1" ]; then
# Enable nvidia driver when installing
- %{_sbindir}/nvidia-96xx-config-display enable &>/dev/null ||:
+ #%{_sbindir}/nvidia-96xx-config-display enable &>/dev/null ||:
# Add init script and start it
- /sbin/chkconfig --add nvidia-96xx ||:
- /etc/init.d/nvidia-96xx start &>/dev/null ||:
+ #/sbin/chkconfig --add nvidia-96xx ||:
+ #/etc/init.d/nvidia-96xx start &>/dev/null ||:
if [ -x /sbin/grubby ] ; then
GRUBBYLASTKERNEL=`/sbin/grubby --default-kernel`
/sbin/grubby --update-kernel=${GRUBBYLASTKERNEL} --args='nouveau.modeset=0 rdblacklist=nouveau' &>/dev/null
fi
-fi
+fi || :
if [ -x /usr/sbin/setsebool ] ; then
SELINUXEXECSTACK=`cat /selinux/booleans/allow_execstack 2>/dev/null`
if [ "${SELINUXEXECSTACK}" == "0 0" ] ; then
@@ -246,8 +263,8 @@
if [ "$1" -eq "0" ]; then
# Disable driver on final removal
test -f %{_sbindir}/nvidia-96xx-config-display && %{_sbindir}/nvidia-96xx-config-display disable &>/dev/null ||:
- %{_initrddir}/nvidia-96xx stop &>/dev/null ||:
- /sbin/chkconfig --del nvidia-96xx ||:
+ #%{_initrddir}/nvidia-96xx stop &>/dev/null ||:
+ #/sbin/chkconfig --del nvidia-96xx ||:
fi ||:
%postun libs -p /sbin/ldconfig
@@ -255,12 +272,14 @@
%files
%defattr(-,root,root,-)
%doc nvidiapkg/usr/share/doc/*
+%config %{_sysconfdir}/X11/xorg.conf.d/00-nvidia.conf
%config(noreplace) %{_sysconfdir}/modprobe.d/blacklist-nouveau.conf
-%{_initrddir}/nvidia-96xx
+%config(noreplace) %{_sysconfdir}/X11/nvidia-96xx-xorg.conf
+#{_initrddir}/nvidia-96xx
%exclude %{_bindir}/nvidia-settings
%exclude %{_sbindir}/nvidia-xconfig
%{_bindir}/nvidia-bug-report.sh
-%{_sbindir}/nvidia-96xx-config-display
+#{_sbindir}/nvidia-96xx-config-display
# Xorg libs that do not need to be multilib
%dir %{_libdir}/xorg/modules/extensions/nvidia
%{_libdir}/xorg/modules/drivers/nvidia_drv.so
@@ -288,8 +307,13 @@
%changelog
-* Wed Nov 03 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 96.43.19-1
+* Wed Nov 03 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 96.43.19-2
- Update to 96.43.19
+- Avoid using livna-config-display on fedora 14 and later
+ because of rhbz#623742
+- Use static workaround
+- Explicitely use %%{_isa} dependency from -devel to -libs
+- Improve uninstallation script rfbz#1398
* Sat Aug 14 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 96.43.18-1
- Update to 96.43.18
--- nvidia-96xx-config-display DELETED ---
--- nvidia-96xx-init DELETED ---
13 years, 6 months
rpms/xorg-x11-drv-nvidia-96xx/devel xorg-x11-drv-nvidia-96xx.spec, 1.20, 1.21
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia-96xx/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv15288
Modified Files:
xorg-x11-drv-nvidia-96xx.spec
Log Message:
Fix for README
Index: xorg-x11-drv-nvidia-96xx.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-96xx/devel/xorg-x11-drv-nvidia-96xx.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- xorg-x11-drv-nvidia-96xx.spec 3 Nov 2010 22:50:29 -0000 1.20
+++ xorg-x11-drv-nvidia-96xx.spec 3 Nov 2010 22:53:36 -0000 1.21
@@ -21,7 +21,7 @@
#Source5: nvidia-96xx-init
Source6: blacklist-nouveau.conf
#Source10: nvidia-96xx-config-display
-#Source11: nvidia-96xx-README.Fedora
+Source11: nvidia-96xx-README.Fedora
# So we don't pull other nvidia variants
Source91: filter-requires.sh
# So we don't mess with mesa provides.
13 years, 6 months
rpms/xorg-x11-drv-nvidia-96xx/devel nvidia-96xx-xorg.conf, NONE, 1.1 00-nvidia.conf, NONE, 1.1 xorg-x11-drv-nvidia-96xx.spec, 1.19, 1.20 nvidia-96xx-README.Fedora, 1.5, 1.6
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia-96xx/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv14885
Modified Files:
xorg-x11-drv-nvidia-96xx.spec nvidia-96xx-README.Fedora
Added Files:
nvidia-96xx-xorg.conf 00-nvidia.conf
Log Message:
- Update to 96.43.19
- Avoid using livna-config-display on fedora 14 and later
because of rhbz#623742
- Use static workaround
- Explicitely use %%{_isa} dependency from -devel to -libs
- Improve uninstallation script rfbz#1398
--- NEW FILE nvidia-96xx-xorg.conf ---
# RPM Fusion - nvidia-96xx-xorg.conf
#
Section "Device"
Identifier "Videocard0"
Driver "nvidia"
Option "AddARGBGLXVisuals" "true"
EndSection
--- NEW FILE 00-nvidia.conf ---
#This file is provided by xorg-x11-drv-nvidia
#Do not edit
Section "Files"
ModulePath "@LIBDIR@/xorg/modules/extensions/nvidia"
ModulePath "@LIBDIR@/xorg/modules"
EndSection
Index: xorg-x11-drv-nvidia-96xx.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-96xx/devel/xorg-x11-drv-nvidia-96xx.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- xorg-x11-drv-nvidia-96xx.spec 3 Nov 2010 16:09:27 -0000 1.19
+++ xorg-x11-drv-nvidia-96xx.spec 3 Nov 2010 22:50:29 -0000 1.20
@@ -8,7 +8,7 @@
Name: xorg-x11-drv-nvidia-96xx
Version: 96.43.19
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: NVIDIA's 96xx series proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
@@ -16,10 +16,12 @@
URL: http://www.nvidia.com/
Source0: ftp://download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%...
Source1: ftp://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x8...
-Source5: nvidia-96xx-init
+Source2: 00-nvidia.conf
+Source3: nvidia-96xx-xorg.conf
+#Source5: nvidia-96xx-init
Source6: blacklist-nouveau.conf
-Source10: nvidia-96xx-config-display
-Source11: nvidia-96xx-README.Fedora
+#Source10: nvidia-96xx-config-display
+#Source11: nvidia-96xx-README.Fedora
# So we don't pull other nvidia variants
Source91: filter-requires.sh
# So we don't mess with mesa provides.
@@ -45,14 +47,18 @@
# Needed in all nvidia or fglrx driver packages
BuildRequires: prelink
Requires: which
-Requires: livna-config-display
+#Requires: livna-config-display
+%if 0%{?fedora} > 10 || 0%{?rhel} > 5
+Requires: %{name}-libs%{_isa} = %{?epoch}:%{version}-%{release}
+%else
Requires: %{name}-libs-%{_target_cpu} = %{version}-%{release}
+%endif
-Requires(post): livna-config-display
-Requires(preun): livna-config-display
-Requires(post): chkconfig
+#Requires(post): livna-config-display
+#Requires(preun): livna-config-display
+#Requires(post): chkconfig
Requires(post): ldconfig
-Requires(preun): chkconfig
+#Requires(preun): chkconfig
Provides: nvidia-96xx-kmod-common = %{version}
@@ -82,7 +88,11 @@
%package devel
Summary: Development files for %{name}
Group: Development/Libraries
+%if 0%{?fedora} > 10 || 0%{?rhel} > 5
+Requires: %{name}-libs%{_isa} = %{?epoch}:%{version}-%{release}
+%else
Requires: %{name}-libs-%{_target_cpu} = %{version}-%{release}
+%endif
%description devel
This package provides the development files of the %{name} package,
@@ -192,10 +202,10 @@
ln -s libglx.so.%{version} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/nvidia/libglx.so
# X configuration script
-install -D -p -m 0755 %{SOURCE10} $RPM_BUILD_ROOT%{_sbindir}/nvidia-96xx-config-display
+#install -D -p -m 0755 %{SOURCE10} $RPM_BUILD_ROOT%{_sbindir}/nvidia-96xx-config-display
# Install initscript
-install -D -p -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_initrddir}/nvidia-96xx
+#install -D -p -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_initrddir}/nvidia-96xx
#Blacklist nouveau by F-11
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/
@@ -216,6 +226,13 @@
%endif
%endif
+#Install static driver dependant configuration files
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d
+install -pm 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d
+sed -i -e 's|@LIBDIR@|%{_libdir}|g' $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/00-nvidia.conf
+touch -r %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/00-nvidia.conf
+install -pm 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/X11/
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -224,15 +241,15 @@
%post
if [ "$1" -eq "1" ]; then
# Enable nvidia driver when installing
- %{_sbindir}/nvidia-96xx-config-display enable &>/dev/null ||:
+ #%{_sbindir}/nvidia-96xx-config-display enable &>/dev/null ||:
# Add init script and start it
- /sbin/chkconfig --add nvidia-96xx ||:
- /etc/init.d/nvidia-96xx start &>/dev/null ||:
+ #/sbin/chkconfig --add nvidia-96xx ||:
+ #/etc/init.d/nvidia-96xx start &>/dev/null ||:
if [ -x /sbin/grubby ] ; then
GRUBBYLASTKERNEL=`/sbin/grubby --default-kernel`
/sbin/grubby --update-kernel=${GRUBBYLASTKERNEL} --args='nouveau.modeset=0 rdblacklist=nouveau' &>/dev/null
fi
-fi
+fi || :
if [ -x /usr/sbin/setsebool ] ; then
SELINUXEXECSTACK=`cat /selinux/booleans/allow_execstack 2>/dev/null`
if [ "${SELINUXEXECSTACK}" == "0 0" ] ; then
@@ -246,8 +263,8 @@
if [ "$1" -eq "0" ]; then
# Disable driver on final removal
test -f %{_sbindir}/nvidia-96xx-config-display && %{_sbindir}/nvidia-96xx-config-display disable &>/dev/null ||:
- %{_initrddir}/nvidia-96xx stop &>/dev/null ||:
- /sbin/chkconfig --del nvidia-96xx ||:
+ #%{_initrddir}/nvidia-96xx stop &>/dev/null ||:
+ #/sbin/chkconfig --del nvidia-96xx ||:
fi ||:
%postun libs -p /sbin/ldconfig
@@ -255,12 +272,14 @@
%files
%defattr(-,root,root,-)
%doc nvidiapkg/usr/share/doc/*
+%config %{_sysconfdir}/X11/xorg.conf.d/00-nvidia.conf
%config(noreplace) %{_sysconfdir}/modprobe.d/blacklist-nouveau.conf
-%{_initrddir}/nvidia-96xx
+%config(noreplace) %{_sysconfdir}/X11/nvidia-96xx-xorg.conf
+#{_initrddir}/nvidia-96xx
%exclude %{_bindir}/nvidia-settings
%exclude %{_sbindir}/nvidia-xconfig
%{_bindir}/nvidia-bug-report.sh
-%{_sbindir}/nvidia-96xx-config-display
+#{_sbindir}/nvidia-96xx-config-display
# Xorg libs that do not need to be multilib
%dir %{_libdir}/xorg/modules/extensions/nvidia
%{_libdir}/xorg/modules/drivers/nvidia_drv.so
@@ -288,8 +307,13 @@
%changelog
-* Wed Nov 03 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 96.43.19-1
+* Wed Nov 03 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 96.43.19-2
- Update to 96.43.19
+- Avoid using livna-config-display on fedora 14 and later
+ because of rhbz#623742
+- Use static workaround
+- Explicitely use %%{_isa} dependency from -devel to -libs
+- Improve uninstallation script rfbz#1398
* Sat Aug 14 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 96.43.18-1
- Update to 96.43.18
Index: nvidia-96xx-README.Fedora
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-96xx/devel/nvidia-96xx-README.Fedora,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- nvidia-96xx-README.Fedora 3 Nov 2010 16:09:27 -0000 1.5
+++ nvidia-96xx-README.Fedora 3 Nov 2010 22:50:29 -0000 1.6
@@ -1,112 +1 @@
-README for Nvidia Linux Drivers, as packaged by livna.org.
-
-1. After Installation
----------------------
-
-You only have to restart X to start using the Nvidia drivers after
-installation. Either choose "Log Out" from the GNOME/KDE menu, and then
-press Ctrl-Alt-Backspace at the login prompt, or press Ctrl-Alt-Backspace
-directly. You should see a white screen with a big Nvidia logo in the middle
-for about one second.
-
-To check that hardware acceleration is working, issue the following command
-in a terminal:
-
- glxinfo | grep OpenGL
-
-That should print out
-
- OpenGL vendor string: NVIDIA Corporation
-
-among a few other things. Also, the command
-
- glxinfo | grep direct
-
-should print out
-
- direct rendering: Yes
-
-If it does, you're all set.
-
-2. Basic Configuration
-----------------------
-
-The installation scripts perform the basic configuration for you.
-When (if) you uninstall the drivers, the configuration is reset to
-use the X.org/XFree86 Nvidia drivers again. If you want to temporarily
-disable the Nvidia drivers without uninstalling, you can issue the
-following two commands as root (remember su -):
-
- nvidia-config-display disable
-
-To re-enable the Nvidia drivers, run:
-
- nvidia-config-display enable
-
-
-3. Additional configuration
----------------------------
-
-It's possible to configure image quality and performance by setting various
-environment variables. Take a look at /etc/profile.d/nvidia-glx.sh
-(or .csh if you use csh) and read the README file in the same directory
-as this file.
-
-There are a number of settings in the X configuration file as well.
-The most interesting are acceleration of the XRENDER extension and AGP
-configuration. In the Driver section of /etc/X11/xorg.conf, you may add
-the following line:
-
- Option "RenderAccel" "true"
-
-to enable XRENDER acceleration. A value of "false" disables it.
-Note: this has shown to make some systems unstable, making the display freeze.
-If you experience this, set to "false" or comment out the line.
-
-To control AGP behaviour, add the following line to the Driver section:
-
- Option "NvAGP" "X"
-
-where X is 0, 1, 2 or 3. The different values are as follows (from Nvidia
-README):
-
- 0 : disable agp
- 1 : use NVIDIA's internal AGP support, if possible
- 2 : use AGPGART, if possible
- 3 : use any agp support (try AGPGART, then NVIDIA's AGP)
-
-Default is 3. AGPGART is the Linux kernel AGP driver. See Nvidia README,
-appendix D for more information. AGP speed is controlled by giving a parameter
-to the Nvidia kernel module, but should be autodetected in most cases.
-See output of "modinfo nvidia".
-
-For more configuration options (TwinView, TV-out etc) see the Nvidia README.
-
-4. An Initscript to enable/disable nvidia driver
-------------------------------------------------
-
-To make gdm work at system start this package contains an initscript that
-will be run during start up. This script will detect if the nvidia module
-for the running kernel is present. If the module is present, then the
-initscript will run.
-
- "nvidia-config-display enable"
-
-so that the X server will use the nvidia driver, otherwise it will run
-
- "nvidia-config-display disable"
-
-and X will use the nv driver. You can disable this check by running, as
-root (with root $PATH) :
-
- chkconfig nvidia off
-
-
-This script will also be invoked when switching to runlevels 6
-(reboot) and 0 (halt). When rebooting (or shutting down) the system,
-the script will _disable_ nvidia driver (and switch back to "nv"
-driver), so that, whatever the kernel you boot, Red Hat Graphical Boot
-will work.
-
-We suggest you read the chkconfig(8) man page for complete
-informations about how to handle rc scripts.
+See http://rpmfusion.org/Howto/nVidia
13 years, 6 months
rpms/xorg-x11-drv-nvidia-96xx/F-13 xorg-x11-drv-nvidia-96xx.spec, 1.20, 1.21
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia-96xx/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv12847
Modified Files:
xorg-x11-drv-nvidia-96xx.spec
Log Message:
Fix error backporting
Index: xorg-x11-drv-nvidia-96xx.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-96xx/F-13/xorg-x11-drv-nvidia-96xx.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- xorg-x11-drv-nvidia-96xx.spec 3 Nov 2010 21:45:22 -0000 1.20
+++ xorg-x11-drv-nvidia-96xx.spec 3 Nov 2010 22:19:06 -0000 1.21
@@ -224,12 +224,6 @@
%endif
%endif
-#Install static driver dependant configuration files
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d
-install -pm 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d
-sed -i -e 's|@LIBDIR@|%{_libdir}|g' $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/00-nvidia.conf
-touch -r %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/00-nvidia.conf
-install -pm 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/X11/
%clean
13 years, 6 months