rpms/xorg-x11-drv-nvidia-96xx/F-13 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/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv10473
Modified Files:
xorg-x11-drv-nvidia-96xx.spec nvidia-96xx-README.Fedora
Log Message:
Resync with main driver
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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- xorg-x11-drv-nvidia-96xx.spec 3 Nov 2010 16:02:19 -0000 1.19
+++ xorg-x11-drv-nvidia-96xx.spec 3 Nov 2010 21:45:22 -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
@@ -46,7 +46,11 @@
BuildRequires: prelink
Requires: which
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
@@ -82,7 +86,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,
@@ -216,6 +224,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
@@ -232,7 +247,7 @@
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
@@ -248,6 +263,17 @@
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 ||:
+ #Clear grub option to disable nouveau for all kernels
+ if [ -x /sbin/grubby ] ; then
+ KERNELS=`ls /boot/vmlinuz-*%{?dist}.$(uname -m)`
+ for kernel in ${KERNELS} ; do
+ /sbin/grubby --update-kernel=${kernel} \
+ --remove-args='nouveau.modeset=0 rdblacklist=nouveau nomodeset' &>/dev/null
+ done
+ fi
+ #Backup and disable previously used xorg.conf
+ [ -f %{_sysconfdir}/X11/xorg.conf ] && \
+ mv %{_sysconfdir}/X11/xorg.conf %{_sysconfdir}/X11/xorg.conf.%{name}_uninstalled &>/dev/null
fi ||:
%postun libs -p /sbin/ldconfig
@@ -288,8 +314,10 @@
%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
+- 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/F-13/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:02:19 -0000 1.5
+++ nvidia-96xx-README.Fedora 3 Nov 2010 21:45:22 -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, 10 months
rpms/nvidia-96xx-kmod/devel nvidia-96xx-kmod.spec, 1.32, 1.33 nvidia-kmodtool-excludekernel-filterfile, 1.2, 1.3 sources, 1.6, 1.7 .cvsignore, 1.5, 1.6 dead.package, 1.1, NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-96xx-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv5398/devel
Modified Files:
.cvsignore
Added Files:
nvidia-96xx-kmod.spec nvidia-kmodtool-excludekernel-filterfile
sources
Removed Files:
dead.package
Log Message:
Re-import
Index: nvidia-96xx-kmod.spec
===================================================================
RCS file: nvidia-96xx-kmod.spec
diff -N nvidia-96xx-kmod.spec
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ nvidia-96xx-kmod.spec 3 Nov 2010 20:29:06 -0000 1.33
@@ -0,0 +1,879 @@
+# buildforkernels macro hint: when you build a new version or a new release
+# that contains bugfixes or other improvements then you must disable the
+# "buildforkernels newest" macro for just that build; immediately after
+# queuing that build enable the macro again for subsequent builds; that way
+# a new akmod package will only get build when a new one is actually needed
+#define buildforkernels newest
+
+Name: nvidia-96xx-kmod
+Version: 96.43.19
+Release: 1%{?dist}
+# Taken over by kmodtool
+Summary: NVIDIA 96xx display driver kernel module
+Group: System Environment/Kernel
+License: Redistributable, no modification permitted
+URL: http://www.nvidia.com/
+# Source is created from these files:
+# http://us.download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x...
+# http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linu...
+
+# <switch me> when sources are on kwizart's repo
+Source0: http://rpms.kwizart.net/fedora/SOURCES/nvidia-kmod-data-%{version}.tar.bz2
+#Source0: http://www.diffingo.com/downloads/livna/kmod-data/nvidia-kmod-data-%{vers...
+# </switch me>
+Source11: nvidia-kmodtool-excludekernel-filterfile
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+# needed for plague to make sure it builds for i586 and i686
+ExclusiveArch: i686 x86_64
+
+# get the needed BuildRequires (in parts depending on what we build for)
+BuildRequires: %{_bindir}/kmodtool
+%{!?kernels:BuildRequires: buildsys-build-rpmfusion-kerneldevpkgs-%{?buildforkernels:%{buildforkernels}}%{!?buildforkernels:current}-%{_target_cpu} }
+# kmodtool does its magic here
+%{expand:%(kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfile %{SOURCE11} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) }
+
+%description
+The nvidia %{version} display driver kernel module for kernel %{kversion}.
+
+%prep
+# error out if there was something wrong with kmodtool
+%{?kmodtool_check}
+# print kmodtool output for debugging purposes:
+kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfile %{SOURCE11} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null
+%setup -q -c -T -a 0
+
+# patch loop
+#for arch in x86 x64
+#do
+# pushd nvidiapkg-${arch}
+# empty
+# popd
+#done
+
+
+for kernel_version in %{?kernel_versions} ; do
+%ifarch %{ix86}
+ cp -a nvidiapkg-x86 _kmod_build_${kernel_version%%___*}
+%else
+ cp -a nvidiapkg-x64 _kmod_build_${kernel_version%%___*}
+%endif
+done
+
+
+%build
+for kernel_version in %{?kernel_versions}; do
+ pushd _kmod_build_${kernel_version%%___*}/usr/src/nv/
+ ln -s -f Makefile.kbuild Makefile
+ if [[ "${kernel_version%%___*}" = *xen ]] ; then
+ CC="cc -D__XEN_TOOLS__ \
+ -I${kernel_version##*___}/include/asm/mach-xen" \
+ IGNORE_XEN_PRESENCE=1 \
+ make %{?_smp_mflags} SYSSRC="${kernel_version##*___}" module
+ else
+ IGNORE_XEN_PRESENCE=1 \
+ make %{?_smp_mflags} SYSSRC="${kernel_version##*___}" module
+ fi
+ popd
+done
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+for kernel_version in %{?kernel_versions}; do
+ install -D -m 0755 _kmod_build_${kernel_version%%___*}/usr/src/nv/nvidia.ko $RPM_BUILD_ROOT/%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/nvidia.ko
+done
+%{?akmod_install}
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%changelog
+* Wed Nov 03 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 96.43.19-1
+- Update to 96.43.19
+
+* Thu Oct 21 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.18-1.5
+- rebuild for new kernel
+
+* Sun Sep 19 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.18-1.4
+- rebuild for new kernel
+
+* Mon Sep 13 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.18-1.3
+- rebuild to build i686 packages
+
+* Wed Sep 01 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.18-1.2
+- rebuild for new kernel
+
+* Fri Aug 20 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.18-1.1
+- rebuild for new kernel
+
+* Sat Aug 14 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 96.43.18-1
+- Update to 96.43.18
+
+* Tue Jul 27 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.16-1.10
+- rebuild for new kernel
+
+* Wed Jul 07 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.16-1.9
+- rebuild for new kernel
+
+* Fri Jun 18 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.16-1.8
+- rebuild for new kernel
+
+* Sat May 01 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.16-1.7
+- rebuild for new kernel
+
+* Thu Apr 29 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.16-1.6
+- rebuild for new kernel
+
+* Thu Apr 22 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.16-1.5
+- rebuild for new kernel
+
+* Mon Apr 19 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.16-1.4
+- rebuild for new kernel
+
+* Sat Apr 17 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.16-1.3
+- rebuild for new kernel
+
+* Sat Apr 10 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.16-1.2
+- rebuild for new kernel
+
+* Mon Mar 29 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.16-1.1
+- rebuild for new kernel
+
+* Sat Mar 27 2010 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 96.43.16-1
+- Update to 96.43.16
+
+* Fri Mar 05 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.14-1.14
+- rebuild for new kernel
+
+* Mon Mar 01 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.14-1.13
+- rebuild for new kernel
+
+* Sun Feb 28 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.14-1.12
+- rebuild for new kernel
+
+* Sat Feb 20 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.14-1.11
+- rebuild for new kernel
+
+* Sat Feb 20 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.14-1.10
+- rebuild for new kernel
+
+* Thu Feb 11 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.14-1.9
+- rebuild for new kernel
+
+* Wed Feb 10 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.14-1.8
+- rebuild for new kernel
+
+* Sat Jan 30 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.14-1.7
+- rebuild for new kernel
+
+* Wed Jan 20 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.14-1.6
+- rebuild for new kernel
+
+* Sat Dec 26 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.14-1.5
+- rebuild for new kernel
+
+* Thu Dec 10 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.14-1.4
+- rebuild for new kernel
+
+* Sun Dec 06 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.14-1.3
+- rebuild for new kernel
+
+* Wed Nov 25 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.14-1.2
+- rebuild for new kernel
+
+* Sun Nov 22 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.14-1.1
+- rebuild for new kernel, disable i586 builds
+
+* Sat Nov 14 2009 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 96.43.14-1
+- Update to 96.43.14
+
+* Thu Nov 05 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.13-1.4
+- rebuild for new kernels
+
+* Tue Oct 20 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.13-1.3
+- rebuild for new kernels
+
+* Wed Sep 30 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.13-1.2
+- rebuild for new kernels
+
+* Tue Sep 1 2009 kwizart < kwizart at gmail.com > - 96.43.13-1.1
+- rebuild for new kernels
+
+* Mon Aug 31 2009 kwizart < kwizart at gmail.com > - 96.43.13-1
+- Update to 96.43.13 (beta)
+
+* Thu Aug 27 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.11-2.17
+- rebuild for new kernels
+
+* Sun Aug 23 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.11-2.16
+- rebuild for new kernels
+
+* Sat Aug 22 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.11-2.15
+- rebuild for new kernels
+
+* Sat Aug 15 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.11-2.14
+- rebuild for new kernels
+
+* Fri Aug 14 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.11-2.13
+- rebuild for new kernels
+
+* Fri Jul 31 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.11-2.12
+- rebuild for new kernels
+
+* Tue Jul 14 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.11-2.11
+- rebuild for new kernels
+
+* Sun Jun 21 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.11-2.10
+- rebuild for new kernels
+
+* Sun Jun 21 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.11-2.9
+- rebuild for new kernels
+
+* Thu May 28 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.11-2.8
+- rebuild for new kernels
+
+* Wed May 27 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.11-2.7
+- rebuild for new kernels
+
+* Thu May 21 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.11-2.6
+- rebuild for new kernels
+
+* Wed May 13 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.11-2.5
+- rebuild for new kernels
+
+* Tue May 05 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.11-2.4
+- rebuild for new kernels
+
+* Sat May 02 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.11-2.3
+- rebuild for new kernels
+
+* Sun Apr 26 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.11-2.2
+- rebuild for new kernels
+
+* Sun Apr 05 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.11-2.1
+- rebuild for new kernels
+
+* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.11-2
+- rebuild for new F11 features
+
+* Wed Feb 25 2009 kwizart < kwizart at gmail.com > - 96.43.11-1
+- Update to 96.43.11 (stable)
+
+* Sun Feb 15 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.10-2.2
+- rebuild for latest Fedora kernel;
+
+* Sun Feb 01 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.10-2.1
+- rebuild for latest Fedora kernel;
+
+* Thu Jan 29 2009 kwizart < kwizart at gmail.com > - 96.43.10-2
+- Update the spec file in sync with nvidia-kmod
+
+* Thu Jan 29 2009 kwizart < kwizart at gmail.com > - 96.43.10-1
+- Update to 96.43.10 (beta)
+
+* Sun Jan 25 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.09-1.12
+- rebuild for latest Fedora kernel;
+
+* Sun Jan 18 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.09-1.11
+- rebuild for latest Fedora kernel;
+
+* Sun Jan 11 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.09-1.10
+- rebuild for latest Fedora kernel;
+
+* Sun Jan 04 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.09-1.9
+- rebuild for latest Fedora kernel;
+
+* Sun Dec 28 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.09-1.8
+- rebuild for latest Fedora kernel;
+
+* Sun Dec 21 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.09-1.7
+- rebuild for latest Fedora kernel;
+
+* Sun Dec 14 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.09-1.6
+- rebuild for latest Fedora kernel;
+
+* Sat Nov 22 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.09-1.5
+- rebuild for latest Fedora kernel;
+
+* Wed Nov 19 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.09-1.4
+- rebuild for latest Fedora kernel;
+
+* Tue Nov 18 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.09-1.3
+- rebuild for latest Fedora kernel;
+
+* Fri Nov 14 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.09-1.2
+- rebuild for latest Fedora kernel;
+
+* Sun Nov 09 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.09-1.1
+- rebuild for latest Fedora kernel;
+
+* Thu Oct 30 2008 kwizart < kwizart at gmail.com > - 96.43.09-1
+- Update to 96.43.09 (beta)
+
+* Thu Oct 23 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.07-6.2
+- rebuild for latest kernel
+
+* Sun Oct 05 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 96.43.07-6.1
+- rebuild for rpm fusion
+
+* Wed Oct 01 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 96.43.07-5
+- rebuild for new kernels
+
+* Sun Sep 21 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 96.43.07-4
+- rebuild for new kernels
+
+* Sat Aug 16 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 96.43.07-3
+- rebuild for new kernels
+
+* Thu Jul 24 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.07-2
+- rebuild for new Fedora kernels
+
+* Sat Jul 19 2008 Stewart Adam <s.adam at diffingo.com> - 96.43.07-1
+- Update to 96.43.07
+- Remove 2.6.25 patch
+
+* Tue Jul 15 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.05-15
+- rebuild for new Fedora kernels
+
+* Thu Jul 03 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.05-14
+- rebuild for new Fedora kernels
+
+* Fri Jun 20 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.05-13
+- rebuild for new Fedora kernels
+
+* Fri Jun 06 2008 kwizart < kwizart at gmail.com > - 96.43.05-12
+- Add Patch for 2.6.25 kernels
+
+* Fri Jun 06 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.05-11
+- rebuild for new Fedora kernels
+
+* Thu May 15 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.05-10
+- rebuild for new Fedora kernels
+
+* Fri Apr 25 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.05-9
+- rebuild for 2.6.24.5-85.fc8 2.6.21.7-3.fc8xen
+
+* Wed Apr 02 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.05-8
+- rebuild for 2.6.24.4-64.fc8 2.6.21.7-3.fc8xen (second try)
+
+* Mon Mar 31 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.05-7
+- rebuild for 2.6.24.4-64.fc8 2.6.21.7-3.fc8xen
+
+* Wed Mar 26 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.05-6
+- rebuild for 2.6.24.3-50.fc8
+
+* Sun Mar 16 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.05-5
+- rebuild for 2.6.24.3-34.fc8
+
+* Fri Mar 07 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.05-4
+- rebuild for 2.6.24.3-12.fc8 2.6.21.7-2.fc8xen
+
+* Mon Feb 11 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.05-3
+- rebuild for 2.6.23.15-137.fc8
+
+* Wed Feb 06 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.05-2
+- rebuild for 2.6.23.14-115.fc8
+
+* Mon Feb 4 2008 kwizar < kwizart at gmail.com > - 96.43.05-1
+- Update to 96.43.05
+
+* Thu Jan 24 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.01-20
+- rebuilt for 2.6.23.9-107.fc8
+
+* Thu Dec 20 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.01-19
+- rebuilt for 2.6.21-2952.fc8xen 2.6.23.9-85.fc8
+
+* Mon Dec 03 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.01-18
+- rebuilt for 2.6.23.8-63.fc8 2.6.21-2952.fc8xen
+
+* Sat Nov 10 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.01-17
+- rebuilt for 2.6.23.1-49.fc8
+
+* Mon Nov 05 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.01-16
+- rebuilt for F8 kernels
+
+* Wed Oct 31 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.01-15
+- rebuilt for latest kernels
+
+* Tue Oct 30 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.01-14
+- rebuilt for latest kernels
+
+* Sun Oct 28 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.01-13
+- rebuilt for latest kernels
+- adjust to rpmfusion and new kmodtool
+
+* Sat Oct 27 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.01-12
+- rebuilt for latest kernels
+
+* Tue Oct 23 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.01-11
+- rebuilt for latest kernels
+
+* Mon Oct 22 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.01-10
+- rebuilt for latest kernels
+
+* Thu Oct 18 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.01-9
+- rebuilt for latest kernels
+
+* Thu Oct 18 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.01-8
+- rebuilt for latest kernels
+
+* Fri Oct 12 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.01-7
+- rebuilt for latest kernels
+
+* Thu Oct 11 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.01-6
+- rebuilt for latest kernels
+
+* Wed Oct 10 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.01-5
+- rebuilt for latest kernels
+
+* Tue Oct 09 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> 96.43.01-4
+- rebuilt for latest kernels
+
+* Sun Oct 07 2007 Thorsten Leemhuis <fedora AT leemhuis DOT info>
+- build for rawhide kernels as of today
+
+* Thu Oct 04 2007 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 96.43.01-2
+- update for new kmod-helper stuff
+- build for newest kernels
+
+* Wed Oct 3 2007 kwizart < kwizart at gmail.com > - 96.43.01-1
+- Update to 96.43.01
+
+* Wed May 30 2007 kwizar < kwizart at gmail.com > - 1.0.9639-1
+- Update to 1.0.9639
+
+* Fri Apr 27 2007 Stewart Adam < s.adam AT diffingo DOT com > - 1.0.9631-12
+- Rebuild for F7T4 (fixed kversion)
+
+* Fri Apr 27 2007 kwizart < kwizart at gmail.com > - 1.0.9631-11
+- Build for Fedora test4 kernel
+
+* Sun Mar 4 2007 Stewart Adam < s.adam AT diffingo DOT com > - 1.0.9631-10
+- kdump for non-i686
+
+* Sat Mar 3 2007 Stewart Adam < s.adam AT diffingo DOT com > - 1.0.9631-9
+- Patch shouldn't be a URL!
+- No kdump
+- New kernel
+
+* Fri Mar 2 2007 Stewart Adam < s.adam AT diffingo DOT com > - 1.0.9631-8
+- New kernel
+- Make Source0 a URL
+
+* Sat Feb 24 2007 Stewart Adam < s.adam AT diffingo DOT com > - 1.0.9631-7
+- Standardize all summaries and descriptions with other nvidia and fglrx
+ packages
+- Move paths from nvidia-glx to nvidia-96xx
+
+* Wed Feb 7 2007 kwizart < kwizar at gmail.com > - 1.0.9631-6
+- Disable xen variant
+
+* Wed Feb 7 2007 kwizart < kwizar at gmail.com > - 1.0.9631-5
+- Rebuild for Fedora Core 7 test1
+
+* Sat Jan 13 2007 Stewart Adam < s.adam AT diffingo DOT com > - 1.0.9631-4
+- Initial release
+- Make %%Source0 a URL
+
+* Sun Jan 7 2007 kwizart < kwizart at gmail.com > - 1.0.9631-3
+- Update xen patch patch-nv-1.0-9625-xenrt.txt (not the newest anyway)!
+- Fix perm in SOURCES.
+
+* Thu Dec 28 2006 kwizart < kwizart at gmail.com > - 1.0.9631-2
+- New legacy version named kmod-nvidia-96xx
+
+* Thu Dec 07 2006 kwizart < kwizart at gmail.com > - 1.0.9631-1
+- Update to 1.0.9631-1
+
+* Tue Nov 07 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.9629-1
+- update to release 1.0.9629
+- include xen patch (thx to Bob Richmond)
+
+* Wed Nov 01 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.9626-2
+- include patch from
+ http://www.nvnews.net/vbulletin/showpost.php?p=996233&postcount=20
+
+* Sun Oct 22 2006 Stewart Adam <s.adam AT diffingo DOT com> - 1.0.9626-1
+- update to release 1.0.9626
+
+* Sat Oct 07 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.8774-2
+- sed-away the config.h include
+
+* Thu Aug 24 2006 Niko Mirthes (straw) <nmirthes AT gmail DOT com> - 1.0.8774-1
+- update to release 1.0.8774
+
+* Thu Aug 10 2006 Niko Mirthes (straw) <nmirthes AT gmail DOT com> - 1.0.8762-5
+- update for kernel 2.6.17-1.2174_FC5
+
+* Mon Aug 07 2006 Niko Mirthes (straw) <nmirthes AT gmail DOT com> - 1.0.8762-4
+- forgot to update release field
+
+* Fri Aug 04 2006 Niko Mirthes (straw) <nmirthes AT gmail DOT com> - 1.0.8762-3
+- minor changes to spacing, removal of random tabs, re-arrangements
+
+* Sun Jun 11 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0.8762-2
+- Invoke kmodtool with bash instead of sh.
+
+* Wed May 24 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.8762-1
+- update to 1.0.8762
+
+* Sun May 14 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0.8756-3
+- Require version >= of nvidia-kmod-common.
+- Provide nvidia-kmod instead of kmod-nvidia to fix upgrade woes (#970).
+
+* Thu Apr 27 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0.8756-2
+- Provide "kernel-modules" instead of "kernel-module" to match yum's config.
+
+* Sat Apr 08 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 1.0.8756-1
+- Update to 8756
+- drop patch
+
+* Thu Mar 23 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 1.0.8178-6
+- disable xen0 for now
+
+* Wed Mar 22 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 1.0.8178-5
+- build for 2.6.16-1.2069_FC5
+
+* Wed Mar 22 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 1.0.8178-4
+- allow to pass kversion and kvariants via command line
+
+* Sat Mar 18 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 1.0.8178-3
+- drop 0.lvn
+- use kmodtool from svn
+- hardcode kernel and variants
+
+* Mon Jan 30 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.8178-0.lvn.2
+- Some minor fixes
+- new kmodtool
+
+* Sun Jan 22 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.8178-0.lvn.1
+- split into packages for userland and kmod
+- rename to nvidia-kmod
+
+* Thu Dec 22 2005 Niko Mirthes (straw) <nmirthes AT gmail DOT com> - 0:1.0.8178-0.lvn.2
+- change nvidia-glx.sh and nvidia-glx.csh to point to README.txt rather than README
+- reference xorg.conf rather than XF86Config in the init script
+- improve readability of instructions and comments, fix some typos
+- drop epoch, as it seems to be affecting dependencies according to rpmlint
+- tweak the nvidia-settings desktop file so it always shows up on the
+ menu in the right location
+- add the manual pages for nvidia-settings and nvidia-xconfig
+- remove header entries from the nvidia-glx files list. they belong in -devel
+- fix changelog entries to refer to 7676 not 7176 (though there was a 7176 x86_64
+ release prior to 7174)
+- add libXvMCNVIDIA.so
+- update to 8178
+
+* Wed Dec 07 2005 Niko Mirthes (straw) <nmirthes AT gmail DOT com> - 0:1.0.8174-0.lvn.1
+- add the manual pages for nvidia-settings and nvidia-xconfig
+- install the new nvidia-xconfig utility and associated libs
+
+* Mon Dec 05 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:1.0.8174-0.lvn.1
+- Update to 8174
+- desktop entry now Categories=Settings (#665)
+- Ship bug-reporting tool in doc (#588)
+- Things from Bug 635, Niko Mirthes (straw) <nmirthes AT gmail DOT com>:
+-- avoid changing time stamps on libs where possible
+-- only add /etc/modprobe.conf entries if they aren't already there
+-- add /etc/modprobe.conf entries one at a time
+-- only remove /etc/modprobe.conf entries at uninstall, not during upgrade
+-- avoid removing any modprobe.conf entries other than our own
+-- match Xorg's install defaults where it makes sense (0444)
+-- a few other minor tweaks to the files lists
+
+* Sun Sep 04 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:1.0.7676-0.lvn.3
+- Conflics with nvidia-glx-legacy
+- Integrate some minor correction suggested by Niko Mirthes
+ <nmirthes AT gmail DOT com> in #475
+
+* Fri Aug 26 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:1.0.7676-0.lvn.2
+- Rename src5: nvidia.init to nvidia-glx-init
+- Fix correct servicename in nvidia-glx-init
+- Run nvidia-glx-init before gdm-early-login; del and readd the script
+ during post
+
+* Sun Aug 21 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:1.0.7676-0.lvn.1
+- Update to 7676
+- Lots of cleanup from me and Niko Mirthes <nmirthes AT gmail DOT com>
+- add NVreg_ModifyDeviceFiles=0 to modprobe.conf (Niko)
+- Drop support for FC2
+- Nearly proper Udev-Support with workarounds around FC-Bug 151527
+
+* Fri Jun 17 2005 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.7174-0.lvn.5
+- Slight change of modprobe.conf rexexp
+
+* Thu Jun 16 2005 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.7174-0.lvn.4
+- Fixed a critical bug in modprobe.conf editing where all lines starting with alias and
+ ending with then a word starting with any of the letters n,v,i,d,i,a,N,V,r,e is removed.
+
+* Mon Jun 13 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:1.0.7174-0.lvn.3
+- Adjust kenrnel-module-stuff for FC4
+- Ship both x86 and x64 in the SRPM
+
+* Sun Jun 12 2005 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.7174-0.lvn.2
+- Only create 16 devices
+- Put libXvMCNVIDIA.a in -devel
+- Don't remove nvidia options in /etc/modprobe.conf
+- Make ld.so.conf file config(noreplace)
+- Use same directory permissions as the kernel
+
+* Sat Apr 2 2005 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.7174-0.lvn.1
+- New upstream release, 7174
+
+* Wed Mar 30 2005 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.7167-0.lvn.5
+- Added x86_64 support patch from Thorsten Leemhuis
+
+* Wed Mar 23 2005 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.7167-0.lvn.4
+- Fix kernel module permissions again (644)
+- Only create 16 /dev/nvidia* devices, 256 is unnecessary
+
+* Fri Mar 18 2005 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.7167-0.lvn.3
+- Fixed kernel-module permissions
+
+* Thu Mar 17 2005 Dams <anvil[AT]livna.org> 0:1.0.7167-0.lvn.2
+- Removed provides on kernel-module and kernel-modules
+
+* Sat Mar 05 2005 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.7167-0.lvn.1
+- New upstream release 1.0.7167
+- Added patch from http://www.nvnews.net/vbulletin/showthread.php?t=47405
+- Removed old patch against 2.6.9
+
+* Sat Feb 05 2005 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6629-0.lvn.7
+- Added a number of post-6629 patches from http://www.minion.de/files/1.0-6629
+- Fixed permissions of nvidia/nvidia.ko
+
+* Fri Jan 21 2005 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6629-0.lvn.6
+- Fix incorrect MAKDEV behaviour and dependency
+
+* Tue Nov 30 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6629-0.lvn.4
+- Fixed creation of /dev/nvidia* on FC2
+
+* Sat Nov 27 2004 Dams <anvil[AT]livna.org> - 0:1.0.6629-0.lvn.3
+- Dont try to print kvariant in description when it's not defined.
+
+* Sun Nov 21 2004 Thorsten Leemhuis <fedora at leemhuis dot info> - 0:1.0.6629-0.lvn.2
+- resulting kernel-module package now depends again on /root/vmlinuz-<kernelver>
+- Use rpmbuildtags driverp and kernelp
+
+* Sat Nov 06 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6629-0.lvn.1
+- New upstream version, 1.0-6629
+- Build without kernel-module-devel by default
+
+* Fri Oct 29 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6111-0.lvn.6
+- Make n-c-display handle misc problems in a better way
+- Fixed wrong icon file name in .desktop file
+- Re-added the mysteriously vanished sleep line in the init script
+ when kernel module wasn't present
+
+* Fri Oct 22 2004 Thorsten Leemhuis <fedora at leemhuis dot info> - 0:1.0.6111-0.lvn.5
+- Use fedora-kmodhelper in the way ntfs or ati-fglrx use it
+- Allow rpm to strip the kernel module. Does not safe that much space ATM but
+ might be a good idea
+- Allow to build driver and kernel-module packages independent of each other
+- Some minor spec-file changes
+
+* Thu Oct 21 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6111-0.lvn.4
+- udev fixes
+- Incorporated fix for missing include line in ld.so.conf from ati-fglrx spec (T Leemhuis)
+
+* Sun Sep 19 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6111-0.lvn.3
+- Remove FC1/kernel 2.4 compability
+- Rename srpm to nvidia-glx
+- Build with kernel-module-devel
+
+* Sun Aug 15 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6111-0.lvn.2
+- Restore ldsoconfd macro
+- Disable autoamtic removal of scripted installation for now; needs testing
+
+* Sat Aug 14 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6111-0.lvn.1
+- Upstream release 6111
+- Fixed init script (again)
+
+* Tue Aug 3 2004 Dams <anvil[AT]livna.org> 0:1.0.6106-0.lvn.4
+- ld.so.conf.d directory detected by spec file
+- Using nvidialibdir in nvidia-glx-devel files section
+- Got rid of yarrow and tettnang macros
+- libGL.so.1 symlink in tls directory always present
+
+* Mon Jul 19 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6106-0.lvn.3
+- Fixed script bug that would empty prelink.conf
+- Added symlink to non-tls libGL.so.1 on FC1
+
+* Tue Jul 13 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6106-0.lvn.2.3
+- Updated init script to reflect name change -xfree86 -> -display
+
+* Mon Jul 12 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6106-0.lvn.2.2
+- Fixed backup file naming
+
+* Sun Jul 11 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6106-0.lvn.2.1
+- Restore working macros
+- Always package the gui tool
+
+* Sun Jul 11 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6106-0.lvn.2
+- Renamed nvidia-config-xfree86 to nvidia-config-display
+- Fixed symlinks
+- Use ld.so.conf.d on FC2
+- Remove script installation in pre
+- Use system-config-display icon for nvidia-settings
+- 2 second delay in init script when kernel module not found
+- Make nvidia-config-display fail more gracefully
+- Add blacklist entry to prelink.conf on FC1
+
+* Mon Jul 05 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6106-0.lvn.1
+- New upstream release
+- First attempt to support FC2
+- Dropped dependency on XFree86
+
+* Mon Feb 09 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.5336-0.lvn.3
+- Use pkg0
+
+* Sun Feb 08 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.5336-0.lvn.2
+- New Makefile variable SYSSRC to point to kernel sources.
+- kmodhelper fixes.
+
+* Fri Jan 30 2004 Keith G. Robertson-Turner <nvidia-devel[AT]genesis-x.nildram.co.uk> 0:1.0.5336-0.lvn.1
+- New upstream release
+- Removed (now obsolete) kernel-2.6 patch
+- Install target changed upstream, from "nvidia.o" to "module"
+- Linked nv/Makefile.kbuild to (now missing) nv/Makefile
+
+* Sun Jan 25 2004 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.18
+- Updated nvidia-config-display
+- Now requiring pyxf86config
+
+* Mon Jan 19 2004 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.17
+- Added nvidiasettings macro to enable/disable gui packaging
+
+* Mon Jan 19 2004 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.16
+- Updated minion.de patches
+- Added some explicit requires
+- Test nvidia-config-xfree86 presence in kernel-module package
+ scriptlets
+
+* Mon Jan 12 2004 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.15
+- Updated Readme.fedora
+- nvidia-glx-devel package
+
+* Sat Jan 3 2004 Dams <anvil[AT]livna.org> 0:1.0.5328-0.lvn.14
+- Hopefully fixed kernel variant thingy
+
+* Fri Jan 2 2004 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.13
+- Support for other kernel variants (bigmem, etc..)
+- Changed URL in Source0
+
+* Tue Dec 30 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.13
+- Dropped nvidia pkgX information in release tag.
+
+* Tue Dec 30 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.12.pkg0
+- Renamed kernel module package in a kernel-module-nvidia-`uname -r` way
+- Using fedora.us kmodhelper for kernel macro
+- Using nvidia pkg0 archive
+
+* Sun Dec 21 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.11.pkg1
+- kernel-module-nvidia package provides kernel-module
+- We wont own devices anymore. And we wont re-create them if they are
+ already present
+
+* Sun Dec 21 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.10.pkg1
+- Yet another initscript update. Really.
+- Scriptlets updated too
+
+* Sun Dec 21 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.9.pkg1
+- Fixed alias in modprobe.conf for 2.6
+
+* Sun Dec 21 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.8.pkg1
+- Another initscript update
+
+* Sun Dec 21 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.7.pkg1
+- kernel module requires kernel same kversion
+- initscript updated again
+- Dont conflict, nor obsolete XFree86-Mesa-libGL. Using ld.so.conf to
+ make libGL from nvidia first found. Hope Mike Harris will appreciate.
+
+* Sun Dec 21 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.6.pkg1
+- kernel-module-nvidia requires kernel same version-release
+
+* Sat Dec 20 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.6.pkg1
+- Updated initscript
+
+* Fri Dec 19 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.5.pkg1
+- lvn repository tag
+
+* Fri Dec 19 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.fdr.5.pkg1
+- Added initscript to toggle nvidia driver according to running kernel
+ and installed kernel-module-nvidia packages
+- Updated scriptlets
+
+* Thu Dec 18 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.fdr.4.pkg1
+- Arch detection
+- Url in patch0
+
+* Tue Dec 16 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.fdr.3.pkg1
+- Desktop entry for nvidia-settings
+- s/kernel-module-{name}/kernel-module-nvidia
+- nvidia-glx doesnt requires kernel-module-nvidia-driver anymore
+- Using modprobe.conf for 2.6 kernel
+- Hopefully fixed symlinks
+
+* Mon Dec 15 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.fdr.2.pkg1
+- Building kernel module for defined kernel
+- kernel module for 2.6 is nvidia.ko
+- Patch not to install kernel module on make install
+- Updated patch for 2.6
+- depmod in scriptlet for defined kernel
+- nvidia-glx conflicting XFree86-Mesa-libGL because we 0wn all its
+ symlink now
+- Dont override libGL.so symlink because it belongs to XFree86-devel
+- Added nvidia 'pkgfoo' info to packages release
+- Spec file cleanup
+
+* Fri Dec 12 2003 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.4620-0.fdr.2
+- Fixed repairing of a link in post-uninstall
+- Obsolete Mesa instead of Conflict with it, enables automatic removal.
+
+* Mon Dec 08 2003 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.4620-0.fdr.1
+- Added support for 2.6 kernels
+- Cleaned up build section, removed the need for patching Makefiles.
+- Added missing BuildReq gcc32
+- Don't package libs twice, only in /usr/lib/tls/nvidia
+- Made config cript executable and put it into /usr/sbin
+- Moved kernel module to kernel/drivers/video/nvidia/
+- Fixed libGL.so and libGLcore.so.1 links to allow linking against OpenGL libraries
+
+* Mon Dec 08 2003 Keith G. Robertson-Turner <nvidia-devel at genesis-x.nildram.co.uk> - 0:1.0.4620-0.fdr.0
+- New beta 4620 driver
+- New GUI control panel
+- Some minor fixes
+
+* Thu Nov 20 2003 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.4496-0.fdr.10.1
+- Finally fixed SMP builds.
+
+* Wed Nov 19 2003 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.4496-0.fdr.9
+- Don't make nvidia-glx depend on kernel-smp
+
+* Tue Nov 18 2003 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.4496-0.fdr.8
+- Some build fixes
+
+* Tue Nov 11 2003 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.4496-0.fdr.7
+- Added CC=gcc32
+- Fixed upgrading issue
+- Added driver switching capabilities to config script.
+
+* Fri Nov 07 2003 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.4496-0.fdr.4
+- Added conflict with XFree86-Mesa-libGL.
+- Disabled showing of the README.Fedora after installation.
+
+* Sun Oct 12 2003 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.4496-0.fdr.3
+- Added NVidia configuration script written in Python.
+- Some cleanup of files section
+- For more info, see https://bugzilla.fedora.us/show_bug.cgi?id=402
+
+* Tue Jul 08 2003 Andreas Bierfert (awjb) <andreas.bierfert[AT]awbsworld.de> - 0:1.0.4363-0.fdr.2
+- renamed /sbin/makedevices.sh /sbin/nvidia-makedevices.sh ( noticed by
+ Panu Matilainen )
+- Fixed name problem
+* Sun Jun 22 2003 Andreas Bierfert (awjb) <andreas.bierfert[AT]awbsworld.de> - 0:1.0.4363-0.fdr.1
+- Initial RPM release, still some ugly stuff in there but should work...
Index: nvidia-kmodtool-excludekernel-filterfile
===================================================================
RCS file: nvidia-kmodtool-excludekernel-filterfile
diff -N nvidia-kmodtool-excludekernel-filterfile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ nvidia-kmodtool-excludekernel-filterfile 3 Nov 2010 20:29:06 -0000 1.3
@@ -0,0 +1 @@
+xen$
Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ sources 3 Nov 2010 20:29:06 -0000 1.7
@@ -0,0 +1 @@
+1b47ad03c61464a1f1f74b5b190758f7 nvidia-kmod-data-96.43.19.tar.bz2
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-96xx-kmod/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 14 Nov 2009 21:40:57 -0000 1.5
+++ .cvsignore 3 Nov 2010 20:29:06 -0000 1.6
@@ -1 +1 @@
-nvidia-kmod-data-96.43.14.tar.bz2
+nvidia-kmod-data-96.43.19.tar.bz2
--- dead.package DELETED ---
13 years, 10 months
rpms/nvidia-96xx-kmod/F-14 nvidia-96xx-kmod.spec, 1.32, 1.33 nvidia-kmodtool-excludekernel-filterfile, 1.2, 1.3 sources, 1.6, 1.7 .cvsignore, 1.5, 1.6 dead.package, 1.1, NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-96xx-kmod/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv5150/F-14
Modified Files:
.cvsignore
Added Files:
nvidia-96xx-kmod.spec nvidia-kmodtool-excludekernel-filterfile
sources
Removed Files:
dead.package
Log Message:
Re-import
Index: nvidia-96xx-kmod.spec
===================================================================
RCS file: nvidia-96xx-kmod.spec
diff -N nvidia-96xx-kmod.spec
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ nvidia-96xx-kmod.spec 3 Nov 2010 20:28:22 -0000 1.33
@@ -0,0 +1,879 @@
+# buildforkernels macro hint: when you build a new version or a new release
+# that contains bugfixes or other improvements then you must disable the
+# "buildforkernels newest" macro for just that build; immediately after
+# queuing that build enable the macro again for subsequent builds; that way
+# a new akmod package will only get build when a new one is actually needed
+#define buildforkernels newest
+
+Name: nvidia-96xx-kmod
+Version: 96.43.19
+Release: 1%{?dist}
+# Taken over by kmodtool
+Summary: NVIDIA 96xx display driver kernel module
+Group: System Environment/Kernel
+License: Redistributable, no modification permitted
+URL: http://www.nvidia.com/
+# Source is created from these files:
+# http://us.download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x...
+# http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linu...
+
+# <switch me> when sources are on kwizart's repo
+Source0: http://rpms.kwizart.net/fedora/SOURCES/nvidia-kmod-data-%{version}.tar.bz2
+#Source0: http://www.diffingo.com/downloads/livna/kmod-data/nvidia-kmod-data-%{vers...
+# </switch me>
+Source11: nvidia-kmodtool-excludekernel-filterfile
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+# needed for plague to make sure it builds for i586 and i686
+ExclusiveArch: i686 x86_64
+
+# get the needed BuildRequires (in parts depending on what we build for)
+BuildRequires: %{_bindir}/kmodtool
+%{!?kernels:BuildRequires: buildsys-build-rpmfusion-kerneldevpkgs-%{?buildforkernels:%{buildforkernels}}%{!?buildforkernels:current}-%{_target_cpu} }
+# kmodtool does its magic here
+%{expand:%(kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfile %{SOURCE11} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) }
+
+%description
+The nvidia %{version} display driver kernel module for kernel %{kversion}.
+
+%prep
+# error out if there was something wrong with kmodtool
+%{?kmodtool_check}
+# print kmodtool output for debugging purposes:
+kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfile %{SOURCE11} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null
+%setup -q -c -T -a 0
+
+# patch loop
+#for arch in x86 x64
+#do
+# pushd nvidiapkg-${arch}
+# empty
+# popd
+#done
+
+
+for kernel_version in %{?kernel_versions} ; do
+%ifarch %{ix86}
+ cp -a nvidiapkg-x86 _kmod_build_${kernel_version%%___*}
+%else
+ cp -a nvidiapkg-x64 _kmod_build_${kernel_version%%___*}
+%endif
+done
+
+
+%build
+for kernel_version in %{?kernel_versions}; do
+ pushd _kmod_build_${kernel_version%%___*}/usr/src/nv/
+ ln -s -f Makefile.kbuild Makefile
+ if [[ "${kernel_version%%___*}" = *xen ]] ; then
+ CC="cc -D__XEN_TOOLS__ \
+ -I${kernel_version##*___}/include/asm/mach-xen" \
+ IGNORE_XEN_PRESENCE=1 \
+ make %{?_smp_mflags} SYSSRC="${kernel_version##*___}" module
+ else
+ IGNORE_XEN_PRESENCE=1 \
+ make %{?_smp_mflags} SYSSRC="${kernel_version##*___}" module
+ fi
+ popd
+done
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+for kernel_version in %{?kernel_versions}; do
+ install -D -m 0755 _kmod_build_${kernel_version%%___*}/usr/src/nv/nvidia.ko $RPM_BUILD_ROOT/%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/nvidia.ko
+done
+%{?akmod_install}
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%changelog
+* Wed Nov 03 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 96.43.19-1
+- Update to 96.43.19
+
+* Thu Oct 21 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.18-1.5
+- rebuild for new kernel
+
+* Sun Sep 19 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.18-1.4
+- rebuild for new kernel
+
+* Mon Sep 13 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.18-1.3
+- rebuild to build i686 packages
+
+* Wed Sep 01 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.18-1.2
+- rebuild for new kernel
+
+* Fri Aug 20 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.18-1.1
+- rebuild for new kernel
+
+* Sat Aug 14 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 96.43.18-1
+- Update to 96.43.18
+
+* Tue Jul 27 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.16-1.10
+- rebuild for new kernel
+
+* Wed Jul 07 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.16-1.9
+- rebuild for new kernel
+
+* Fri Jun 18 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.16-1.8
+- rebuild for new kernel
+
+* Sat May 01 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.16-1.7
+- rebuild for new kernel
+
+* Thu Apr 29 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.16-1.6
+- rebuild for new kernel
+
+* Thu Apr 22 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.16-1.5
+- rebuild for new kernel
+
+* Mon Apr 19 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.16-1.4
+- rebuild for new kernel
+
+* Sat Apr 17 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.16-1.3
+- rebuild for new kernel
+
+* Sat Apr 10 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.16-1.2
+- rebuild for new kernel
+
+* Mon Mar 29 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.16-1.1
+- rebuild for new kernel
+
+* Sat Mar 27 2010 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 96.43.16-1
+- Update to 96.43.16
+
+* Fri Mar 05 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.14-1.14
+- rebuild for new kernel
+
+* Mon Mar 01 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.14-1.13
+- rebuild for new kernel
+
+* Sun Feb 28 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.14-1.12
+- rebuild for new kernel
+
+* Sat Feb 20 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.14-1.11
+- rebuild for new kernel
+
+* Sat Feb 20 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.14-1.10
+- rebuild for new kernel
+
+* Thu Feb 11 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.14-1.9
+- rebuild for new kernel
+
+* Wed Feb 10 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.14-1.8
+- rebuild for new kernel
+
+* Sat Jan 30 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.14-1.7
+- rebuild for new kernel
+
+* Wed Jan 20 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.14-1.6
+- rebuild for new kernel
+
+* Sat Dec 26 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.14-1.5
+- rebuild for new kernel
+
+* Thu Dec 10 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.14-1.4
+- rebuild for new kernel
+
+* Sun Dec 06 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.14-1.3
+- rebuild for new kernel
+
+* Wed Nov 25 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.14-1.2
+- rebuild for new kernel
+
+* Sun Nov 22 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.14-1.1
+- rebuild for new kernel, disable i586 builds
+
+* Sat Nov 14 2009 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 96.43.14-1
+- Update to 96.43.14
+
+* Thu Nov 05 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.13-1.4
+- rebuild for new kernels
+
+* Tue Oct 20 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.13-1.3
+- rebuild for new kernels
+
+* Wed Sep 30 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.13-1.2
+- rebuild for new kernels
+
+* Tue Sep 1 2009 kwizart < kwizart at gmail.com > - 96.43.13-1.1
+- rebuild for new kernels
+
+* Mon Aug 31 2009 kwizart < kwizart at gmail.com > - 96.43.13-1
+- Update to 96.43.13 (beta)
+
+* Thu Aug 27 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.11-2.17
+- rebuild for new kernels
+
+* Sun Aug 23 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.11-2.16
+- rebuild for new kernels
+
+* Sat Aug 22 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.11-2.15
+- rebuild for new kernels
+
+* Sat Aug 15 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.11-2.14
+- rebuild for new kernels
+
+* Fri Aug 14 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.11-2.13
+- rebuild for new kernels
+
+* Fri Jul 31 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.11-2.12
+- rebuild for new kernels
+
+* Tue Jul 14 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.11-2.11
+- rebuild for new kernels
+
+* Sun Jun 21 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.11-2.10
+- rebuild for new kernels
+
+* Sun Jun 21 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.11-2.9
+- rebuild for new kernels
+
+* Thu May 28 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.11-2.8
+- rebuild for new kernels
+
+* Wed May 27 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.11-2.7
+- rebuild for new kernels
+
+* Thu May 21 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.11-2.6
+- rebuild for new kernels
+
+* Wed May 13 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.11-2.5
+- rebuild for new kernels
+
+* Tue May 05 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.11-2.4
+- rebuild for new kernels
+
+* Sat May 02 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.11-2.3
+- rebuild for new kernels
+
+* Sun Apr 26 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.11-2.2
+- rebuild for new kernels
+
+* Sun Apr 05 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.11-2.1
+- rebuild for new kernels
+
+* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.11-2
+- rebuild for new F11 features
+
+* Wed Feb 25 2009 kwizart < kwizart at gmail.com > - 96.43.11-1
+- Update to 96.43.11 (stable)
+
+* Sun Feb 15 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.10-2.2
+- rebuild for latest Fedora kernel;
+
+* Sun Feb 01 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.10-2.1
+- rebuild for latest Fedora kernel;
+
+* Thu Jan 29 2009 kwizart < kwizart at gmail.com > - 96.43.10-2
+- Update the spec file in sync with nvidia-kmod
+
+* Thu Jan 29 2009 kwizart < kwizart at gmail.com > - 96.43.10-1
+- Update to 96.43.10 (beta)
+
+* Sun Jan 25 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.09-1.12
+- rebuild for latest Fedora kernel;
+
+* Sun Jan 18 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.09-1.11
+- rebuild for latest Fedora kernel;
+
+* Sun Jan 11 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.09-1.10
+- rebuild for latest Fedora kernel;
+
+* Sun Jan 04 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.09-1.9
+- rebuild for latest Fedora kernel;
+
+* Sun Dec 28 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.09-1.8
+- rebuild for latest Fedora kernel;
+
+* Sun Dec 21 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.09-1.7
+- rebuild for latest Fedora kernel;
+
+* Sun Dec 14 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.09-1.6
+- rebuild for latest Fedora kernel;
+
+* Sat Nov 22 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.09-1.5
+- rebuild for latest Fedora kernel;
+
+* Wed Nov 19 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.09-1.4
+- rebuild for latest Fedora kernel;
+
+* Tue Nov 18 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.09-1.3
+- rebuild for latest Fedora kernel;
+
+* Fri Nov 14 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.09-1.2
+- rebuild for latest Fedora kernel;
+
+* Sun Nov 09 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.09-1.1
+- rebuild for latest Fedora kernel;
+
+* Thu Oct 30 2008 kwizart < kwizart at gmail.com > - 96.43.09-1
+- Update to 96.43.09 (beta)
+
+* Thu Oct 23 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.07-6.2
+- rebuild for latest kernel
+
+* Sun Oct 05 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 96.43.07-6.1
+- rebuild for rpm fusion
+
+* Wed Oct 01 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 96.43.07-5
+- rebuild for new kernels
+
+* Sun Sep 21 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 96.43.07-4
+- rebuild for new kernels
+
+* Sat Aug 16 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 96.43.07-3
+- rebuild for new kernels
+
+* Thu Jul 24 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.07-2
+- rebuild for new Fedora kernels
+
+* Sat Jul 19 2008 Stewart Adam <s.adam at diffingo.com> - 96.43.07-1
+- Update to 96.43.07
+- Remove 2.6.25 patch
+
+* Tue Jul 15 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.05-15
+- rebuild for new Fedora kernels
+
+* Thu Jul 03 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.05-14
+- rebuild for new Fedora kernels
+
+* Fri Jun 20 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.05-13
+- rebuild for new Fedora kernels
+
+* Fri Jun 06 2008 kwizart < kwizart at gmail.com > - 96.43.05-12
+- Add Patch for 2.6.25 kernels
+
+* Fri Jun 06 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.05-11
+- rebuild for new Fedora kernels
+
+* Thu May 15 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.05-10
+- rebuild for new Fedora kernels
+
+* Fri Apr 25 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.05-9
+- rebuild for 2.6.24.5-85.fc8 2.6.21.7-3.fc8xen
+
+* Wed Apr 02 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.05-8
+- rebuild for 2.6.24.4-64.fc8 2.6.21.7-3.fc8xen (second try)
+
+* Mon Mar 31 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.05-7
+- rebuild for 2.6.24.4-64.fc8 2.6.21.7-3.fc8xen
+
+* Wed Mar 26 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.05-6
+- rebuild for 2.6.24.3-50.fc8
+
+* Sun Mar 16 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.05-5
+- rebuild for 2.6.24.3-34.fc8
+
+* Fri Mar 07 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.05-4
+- rebuild for 2.6.24.3-12.fc8 2.6.21.7-2.fc8xen
+
+* Mon Feb 11 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.05-3
+- rebuild for 2.6.23.15-137.fc8
+
+* Wed Feb 06 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.05-2
+- rebuild for 2.6.23.14-115.fc8
+
+* Mon Feb 4 2008 kwizar < kwizart at gmail.com > - 96.43.05-1
+- Update to 96.43.05
+
+* Thu Jan 24 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.01-20
+- rebuilt for 2.6.23.9-107.fc8
+
+* Thu Dec 20 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.01-19
+- rebuilt for 2.6.21-2952.fc8xen 2.6.23.9-85.fc8
+
+* Mon Dec 03 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.01-18
+- rebuilt for 2.6.23.8-63.fc8 2.6.21-2952.fc8xen
+
+* Sat Nov 10 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.01-17
+- rebuilt for 2.6.23.1-49.fc8
+
+* Mon Nov 05 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.01-16
+- rebuilt for F8 kernels
+
+* Wed Oct 31 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.01-15
+- rebuilt for latest kernels
+
+* Tue Oct 30 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.01-14
+- rebuilt for latest kernels
+
+* Sun Oct 28 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.01-13
+- rebuilt for latest kernels
+- adjust to rpmfusion and new kmodtool
+
+* Sat Oct 27 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.01-12
+- rebuilt for latest kernels
+
+* Tue Oct 23 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.01-11
+- rebuilt for latest kernels
+
+* Mon Oct 22 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.01-10
+- rebuilt for latest kernels
+
+* Thu Oct 18 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.01-9
+- rebuilt for latest kernels
+
+* Thu Oct 18 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.01-8
+- rebuilt for latest kernels
+
+* Fri Oct 12 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.01-7
+- rebuilt for latest kernels
+
+* Thu Oct 11 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.01-6
+- rebuilt for latest kernels
+
+* Wed Oct 10 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.01-5
+- rebuilt for latest kernels
+
+* Tue Oct 09 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> 96.43.01-4
+- rebuilt for latest kernels
+
+* Sun Oct 07 2007 Thorsten Leemhuis <fedora AT leemhuis DOT info>
+- build for rawhide kernels as of today
+
+* Thu Oct 04 2007 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 96.43.01-2
+- update for new kmod-helper stuff
+- build for newest kernels
+
+* Wed Oct 3 2007 kwizart < kwizart at gmail.com > - 96.43.01-1
+- Update to 96.43.01
+
+* Wed May 30 2007 kwizar < kwizart at gmail.com > - 1.0.9639-1
+- Update to 1.0.9639
+
+* Fri Apr 27 2007 Stewart Adam < s.adam AT diffingo DOT com > - 1.0.9631-12
+- Rebuild for F7T4 (fixed kversion)
+
+* Fri Apr 27 2007 kwizart < kwizart at gmail.com > - 1.0.9631-11
+- Build for Fedora test4 kernel
+
+* Sun Mar 4 2007 Stewart Adam < s.adam AT diffingo DOT com > - 1.0.9631-10
+- kdump for non-i686
+
+* Sat Mar 3 2007 Stewart Adam < s.adam AT diffingo DOT com > - 1.0.9631-9
+- Patch shouldn't be a URL!
+- No kdump
+- New kernel
+
+* Fri Mar 2 2007 Stewart Adam < s.adam AT diffingo DOT com > - 1.0.9631-8
+- New kernel
+- Make Source0 a URL
+
+* Sat Feb 24 2007 Stewart Adam < s.adam AT diffingo DOT com > - 1.0.9631-7
+- Standardize all summaries and descriptions with other nvidia and fglrx
+ packages
+- Move paths from nvidia-glx to nvidia-96xx
+
+* Wed Feb 7 2007 kwizart < kwizar at gmail.com > - 1.0.9631-6
+- Disable xen variant
+
+* Wed Feb 7 2007 kwizart < kwizar at gmail.com > - 1.0.9631-5
+- Rebuild for Fedora Core 7 test1
+
+* Sat Jan 13 2007 Stewart Adam < s.adam AT diffingo DOT com > - 1.0.9631-4
+- Initial release
+- Make %%Source0 a URL
+
+* Sun Jan 7 2007 kwizart < kwizart at gmail.com > - 1.0.9631-3
+- Update xen patch patch-nv-1.0-9625-xenrt.txt (not the newest anyway)!
+- Fix perm in SOURCES.
+
+* Thu Dec 28 2006 kwizart < kwizart at gmail.com > - 1.0.9631-2
+- New legacy version named kmod-nvidia-96xx
+
+* Thu Dec 07 2006 kwizart < kwizart at gmail.com > - 1.0.9631-1
+- Update to 1.0.9631-1
+
+* Tue Nov 07 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.9629-1
+- update to release 1.0.9629
+- include xen patch (thx to Bob Richmond)
+
+* Wed Nov 01 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.9626-2
+- include patch from
+ http://www.nvnews.net/vbulletin/showpost.php?p=996233&postcount=20
+
+* Sun Oct 22 2006 Stewart Adam <s.adam AT diffingo DOT com> - 1.0.9626-1
+- update to release 1.0.9626
+
+* Sat Oct 07 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.8774-2
+- sed-away the config.h include
+
+* Thu Aug 24 2006 Niko Mirthes (straw) <nmirthes AT gmail DOT com> - 1.0.8774-1
+- update to release 1.0.8774
+
+* Thu Aug 10 2006 Niko Mirthes (straw) <nmirthes AT gmail DOT com> - 1.0.8762-5
+- update for kernel 2.6.17-1.2174_FC5
+
+* Mon Aug 07 2006 Niko Mirthes (straw) <nmirthes AT gmail DOT com> - 1.0.8762-4
+- forgot to update release field
+
+* Fri Aug 04 2006 Niko Mirthes (straw) <nmirthes AT gmail DOT com> - 1.0.8762-3
+- minor changes to spacing, removal of random tabs, re-arrangements
+
+* Sun Jun 11 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0.8762-2
+- Invoke kmodtool with bash instead of sh.
+
+* Wed May 24 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.8762-1
+- update to 1.0.8762
+
+* Sun May 14 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0.8756-3
+- Require version >= of nvidia-kmod-common.
+- Provide nvidia-kmod instead of kmod-nvidia to fix upgrade woes (#970).
+
+* Thu Apr 27 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0.8756-2
+- Provide "kernel-modules" instead of "kernel-module" to match yum's config.
+
+* Sat Apr 08 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 1.0.8756-1
+- Update to 8756
+- drop patch
+
+* Thu Mar 23 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 1.0.8178-6
+- disable xen0 for now
+
+* Wed Mar 22 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 1.0.8178-5
+- build for 2.6.16-1.2069_FC5
+
+* Wed Mar 22 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 1.0.8178-4
+- allow to pass kversion and kvariants via command line
+
+* Sat Mar 18 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 1.0.8178-3
+- drop 0.lvn
+- use kmodtool from svn
+- hardcode kernel and variants
+
+* Mon Jan 30 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.8178-0.lvn.2
+- Some minor fixes
+- new kmodtool
+
+* Sun Jan 22 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.8178-0.lvn.1
+- split into packages for userland and kmod
+- rename to nvidia-kmod
+
+* Thu Dec 22 2005 Niko Mirthes (straw) <nmirthes AT gmail DOT com> - 0:1.0.8178-0.lvn.2
+- change nvidia-glx.sh and nvidia-glx.csh to point to README.txt rather than README
+- reference xorg.conf rather than XF86Config in the init script
+- improve readability of instructions and comments, fix some typos
+- drop epoch, as it seems to be affecting dependencies according to rpmlint
+- tweak the nvidia-settings desktop file so it always shows up on the
+ menu in the right location
+- add the manual pages for nvidia-settings and nvidia-xconfig
+- remove header entries from the nvidia-glx files list. they belong in -devel
+- fix changelog entries to refer to 7676 not 7176 (though there was a 7176 x86_64
+ release prior to 7174)
+- add libXvMCNVIDIA.so
+- update to 8178
+
+* Wed Dec 07 2005 Niko Mirthes (straw) <nmirthes AT gmail DOT com> - 0:1.0.8174-0.lvn.1
+- add the manual pages for nvidia-settings and nvidia-xconfig
+- install the new nvidia-xconfig utility and associated libs
+
+* Mon Dec 05 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:1.0.8174-0.lvn.1
+- Update to 8174
+- desktop entry now Categories=Settings (#665)
+- Ship bug-reporting tool in doc (#588)
+- Things from Bug 635, Niko Mirthes (straw) <nmirthes AT gmail DOT com>:
+-- avoid changing time stamps on libs where possible
+-- only add /etc/modprobe.conf entries if they aren't already there
+-- add /etc/modprobe.conf entries one at a time
+-- only remove /etc/modprobe.conf entries at uninstall, not during upgrade
+-- avoid removing any modprobe.conf entries other than our own
+-- match Xorg's install defaults where it makes sense (0444)
+-- a few other minor tweaks to the files lists
+
+* Sun Sep 04 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:1.0.7676-0.lvn.3
+- Conflics with nvidia-glx-legacy
+- Integrate some minor correction suggested by Niko Mirthes
+ <nmirthes AT gmail DOT com> in #475
+
+* Fri Aug 26 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:1.0.7676-0.lvn.2
+- Rename src5: nvidia.init to nvidia-glx-init
+- Fix correct servicename in nvidia-glx-init
+- Run nvidia-glx-init before gdm-early-login; del and readd the script
+ during post
+
+* Sun Aug 21 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:1.0.7676-0.lvn.1
+- Update to 7676
+- Lots of cleanup from me and Niko Mirthes <nmirthes AT gmail DOT com>
+- add NVreg_ModifyDeviceFiles=0 to modprobe.conf (Niko)
+- Drop support for FC2
+- Nearly proper Udev-Support with workarounds around FC-Bug 151527
+
+* Fri Jun 17 2005 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.7174-0.lvn.5
+- Slight change of modprobe.conf rexexp
+
+* Thu Jun 16 2005 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.7174-0.lvn.4
+- Fixed a critical bug in modprobe.conf editing where all lines starting with alias and
+ ending with then a word starting with any of the letters n,v,i,d,i,a,N,V,r,e is removed.
+
+* Mon Jun 13 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:1.0.7174-0.lvn.3
+- Adjust kenrnel-module-stuff for FC4
+- Ship both x86 and x64 in the SRPM
+
+* Sun Jun 12 2005 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.7174-0.lvn.2
+- Only create 16 devices
+- Put libXvMCNVIDIA.a in -devel
+- Don't remove nvidia options in /etc/modprobe.conf
+- Make ld.so.conf file config(noreplace)
+- Use same directory permissions as the kernel
+
+* Sat Apr 2 2005 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.7174-0.lvn.1
+- New upstream release, 7174
+
+* Wed Mar 30 2005 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.7167-0.lvn.5
+- Added x86_64 support patch from Thorsten Leemhuis
+
+* Wed Mar 23 2005 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.7167-0.lvn.4
+- Fix kernel module permissions again (644)
+- Only create 16 /dev/nvidia* devices, 256 is unnecessary
+
+* Fri Mar 18 2005 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.7167-0.lvn.3
+- Fixed kernel-module permissions
+
+* Thu Mar 17 2005 Dams <anvil[AT]livna.org> 0:1.0.7167-0.lvn.2
+- Removed provides on kernel-module and kernel-modules
+
+* Sat Mar 05 2005 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.7167-0.lvn.1
+- New upstream release 1.0.7167
+- Added patch from http://www.nvnews.net/vbulletin/showthread.php?t=47405
+- Removed old patch against 2.6.9
+
+* Sat Feb 05 2005 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6629-0.lvn.7
+- Added a number of post-6629 patches from http://www.minion.de/files/1.0-6629
+- Fixed permissions of nvidia/nvidia.ko
+
+* Fri Jan 21 2005 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6629-0.lvn.6
+- Fix incorrect MAKDEV behaviour and dependency
+
+* Tue Nov 30 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6629-0.lvn.4
+- Fixed creation of /dev/nvidia* on FC2
+
+* Sat Nov 27 2004 Dams <anvil[AT]livna.org> - 0:1.0.6629-0.lvn.3
+- Dont try to print kvariant in description when it's not defined.
+
+* Sun Nov 21 2004 Thorsten Leemhuis <fedora at leemhuis dot info> - 0:1.0.6629-0.lvn.2
+- resulting kernel-module package now depends again on /root/vmlinuz-<kernelver>
+- Use rpmbuildtags driverp and kernelp
+
+* Sat Nov 06 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6629-0.lvn.1
+- New upstream version, 1.0-6629
+- Build without kernel-module-devel by default
+
+* Fri Oct 29 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6111-0.lvn.6
+- Make n-c-display handle misc problems in a better way
+- Fixed wrong icon file name in .desktop file
+- Re-added the mysteriously vanished sleep line in the init script
+ when kernel module wasn't present
+
+* Fri Oct 22 2004 Thorsten Leemhuis <fedora at leemhuis dot info> - 0:1.0.6111-0.lvn.5
+- Use fedora-kmodhelper in the way ntfs or ati-fglrx use it
+- Allow rpm to strip the kernel module. Does not safe that much space ATM but
+ might be a good idea
+- Allow to build driver and kernel-module packages independent of each other
+- Some minor spec-file changes
+
+* Thu Oct 21 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6111-0.lvn.4
+- udev fixes
+- Incorporated fix for missing include line in ld.so.conf from ati-fglrx spec (T Leemhuis)
+
+* Sun Sep 19 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6111-0.lvn.3
+- Remove FC1/kernel 2.4 compability
+- Rename srpm to nvidia-glx
+- Build with kernel-module-devel
+
+* Sun Aug 15 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6111-0.lvn.2
+- Restore ldsoconfd macro
+- Disable autoamtic removal of scripted installation for now; needs testing
+
+* Sat Aug 14 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6111-0.lvn.1
+- Upstream release 6111
+- Fixed init script (again)
+
+* Tue Aug 3 2004 Dams <anvil[AT]livna.org> 0:1.0.6106-0.lvn.4
+- ld.so.conf.d directory detected by spec file
+- Using nvidialibdir in nvidia-glx-devel files section
+- Got rid of yarrow and tettnang macros
+- libGL.so.1 symlink in tls directory always present
+
+* Mon Jul 19 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6106-0.lvn.3
+- Fixed script bug that would empty prelink.conf
+- Added symlink to non-tls libGL.so.1 on FC1
+
+* Tue Jul 13 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6106-0.lvn.2.3
+- Updated init script to reflect name change -xfree86 -> -display
+
+* Mon Jul 12 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6106-0.lvn.2.2
+- Fixed backup file naming
+
+* Sun Jul 11 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6106-0.lvn.2.1
+- Restore working macros
+- Always package the gui tool
+
+* Sun Jul 11 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6106-0.lvn.2
+- Renamed nvidia-config-xfree86 to nvidia-config-display
+- Fixed symlinks
+- Use ld.so.conf.d on FC2
+- Remove script installation in pre
+- Use system-config-display icon for nvidia-settings
+- 2 second delay in init script when kernel module not found
+- Make nvidia-config-display fail more gracefully
+- Add blacklist entry to prelink.conf on FC1
+
+* Mon Jul 05 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6106-0.lvn.1
+- New upstream release
+- First attempt to support FC2
+- Dropped dependency on XFree86
+
+* Mon Feb 09 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.5336-0.lvn.3
+- Use pkg0
+
+* Sun Feb 08 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.5336-0.lvn.2
+- New Makefile variable SYSSRC to point to kernel sources.
+- kmodhelper fixes.
+
+* Fri Jan 30 2004 Keith G. Robertson-Turner <nvidia-devel[AT]genesis-x.nildram.co.uk> 0:1.0.5336-0.lvn.1
+- New upstream release
+- Removed (now obsolete) kernel-2.6 patch
+- Install target changed upstream, from "nvidia.o" to "module"
+- Linked nv/Makefile.kbuild to (now missing) nv/Makefile
+
+* Sun Jan 25 2004 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.18
+- Updated nvidia-config-display
+- Now requiring pyxf86config
+
+* Mon Jan 19 2004 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.17
+- Added nvidiasettings macro to enable/disable gui packaging
+
+* Mon Jan 19 2004 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.16
+- Updated minion.de patches
+- Added some explicit requires
+- Test nvidia-config-xfree86 presence in kernel-module package
+ scriptlets
+
+* Mon Jan 12 2004 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.15
+- Updated Readme.fedora
+- nvidia-glx-devel package
+
+* Sat Jan 3 2004 Dams <anvil[AT]livna.org> 0:1.0.5328-0.lvn.14
+- Hopefully fixed kernel variant thingy
+
+* Fri Jan 2 2004 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.13
+- Support for other kernel variants (bigmem, etc..)
+- Changed URL in Source0
+
+* Tue Dec 30 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.13
+- Dropped nvidia pkgX information in release tag.
+
+* Tue Dec 30 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.12.pkg0
+- Renamed kernel module package in a kernel-module-nvidia-`uname -r` way
+- Using fedora.us kmodhelper for kernel macro
+- Using nvidia pkg0 archive
+
+* Sun Dec 21 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.11.pkg1
+- kernel-module-nvidia package provides kernel-module
+- We wont own devices anymore. And we wont re-create them if they are
+ already present
+
+* Sun Dec 21 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.10.pkg1
+- Yet another initscript update. Really.
+- Scriptlets updated too
+
+* Sun Dec 21 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.9.pkg1
+- Fixed alias in modprobe.conf for 2.6
+
+* Sun Dec 21 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.8.pkg1
+- Another initscript update
+
+* Sun Dec 21 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.7.pkg1
+- kernel module requires kernel same kversion
+- initscript updated again
+- Dont conflict, nor obsolete XFree86-Mesa-libGL. Using ld.so.conf to
+ make libGL from nvidia first found. Hope Mike Harris will appreciate.
+
+* Sun Dec 21 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.6.pkg1
+- kernel-module-nvidia requires kernel same version-release
+
+* Sat Dec 20 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.6.pkg1
+- Updated initscript
+
+* Fri Dec 19 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.5.pkg1
+- lvn repository tag
+
+* Fri Dec 19 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.fdr.5.pkg1
+- Added initscript to toggle nvidia driver according to running kernel
+ and installed kernel-module-nvidia packages
+- Updated scriptlets
+
+* Thu Dec 18 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.fdr.4.pkg1
+- Arch detection
+- Url in patch0
+
+* Tue Dec 16 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.fdr.3.pkg1
+- Desktop entry for nvidia-settings
+- s/kernel-module-{name}/kernel-module-nvidia
+- nvidia-glx doesnt requires kernel-module-nvidia-driver anymore
+- Using modprobe.conf for 2.6 kernel
+- Hopefully fixed symlinks
+
+* Mon Dec 15 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.fdr.2.pkg1
+- Building kernel module for defined kernel
+- kernel module for 2.6 is nvidia.ko
+- Patch not to install kernel module on make install
+- Updated patch for 2.6
+- depmod in scriptlet for defined kernel
+- nvidia-glx conflicting XFree86-Mesa-libGL because we 0wn all its
+ symlink now
+- Dont override libGL.so symlink because it belongs to XFree86-devel
+- Added nvidia 'pkgfoo' info to packages release
+- Spec file cleanup
+
+* Fri Dec 12 2003 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.4620-0.fdr.2
+- Fixed repairing of a link in post-uninstall
+- Obsolete Mesa instead of Conflict with it, enables automatic removal.
+
+* Mon Dec 08 2003 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.4620-0.fdr.1
+- Added support for 2.6 kernels
+- Cleaned up build section, removed the need for patching Makefiles.
+- Added missing BuildReq gcc32
+- Don't package libs twice, only in /usr/lib/tls/nvidia
+- Made config cript executable and put it into /usr/sbin
+- Moved kernel module to kernel/drivers/video/nvidia/
+- Fixed libGL.so and libGLcore.so.1 links to allow linking against OpenGL libraries
+
+* Mon Dec 08 2003 Keith G. Robertson-Turner <nvidia-devel at genesis-x.nildram.co.uk> - 0:1.0.4620-0.fdr.0
+- New beta 4620 driver
+- New GUI control panel
+- Some minor fixes
+
+* Thu Nov 20 2003 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.4496-0.fdr.10.1
+- Finally fixed SMP builds.
+
+* Wed Nov 19 2003 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.4496-0.fdr.9
+- Don't make nvidia-glx depend on kernel-smp
+
+* Tue Nov 18 2003 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.4496-0.fdr.8
+- Some build fixes
+
+* Tue Nov 11 2003 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.4496-0.fdr.7
+- Added CC=gcc32
+- Fixed upgrading issue
+- Added driver switching capabilities to config script.
+
+* Fri Nov 07 2003 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.4496-0.fdr.4
+- Added conflict with XFree86-Mesa-libGL.
+- Disabled showing of the README.Fedora after installation.
+
+* Sun Oct 12 2003 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.4496-0.fdr.3
+- Added NVidia configuration script written in Python.
+- Some cleanup of files section
+- For more info, see https://bugzilla.fedora.us/show_bug.cgi?id=402
+
+* Tue Jul 08 2003 Andreas Bierfert (awjb) <andreas.bierfert[AT]awbsworld.de> - 0:1.0.4363-0.fdr.2
+- renamed /sbin/makedevices.sh /sbin/nvidia-makedevices.sh ( noticed by
+ Panu Matilainen )
+- Fixed name problem
+* Sun Jun 22 2003 Andreas Bierfert (awjb) <andreas.bierfert[AT]awbsworld.de> - 0:1.0.4363-0.fdr.1
+- Initial RPM release, still some ugly stuff in there but should work...
Index: nvidia-kmodtool-excludekernel-filterfile
===================================================================
RCS file: nvidia-kmodtool-excludekernel-filterfile
diff -N nvidia-kmodtool-excludekernel-filterfile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ nvidia-kmodtool-excludekernel-filterfile 3 Nov 2010 20:28:22 -0000 1.3
@@ -0,0 +1 @@
+xen$
Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ sources 3 Nov 2010 20:28:22 -0000 1.7
@@ -0,0 +1 @@
+1b47ad03c61464a1f1f74b5b190758f7 nvidia-kmod-data-96.43.19.tar.bz2
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-96xx-kmod/F-14/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 14 Nov 2009 21:40:57 -0000 1.5
+++ .cvsignore 3 Nov 2010 20:28:22 -0000 1.6
@@ -1 +1 @@
-nvidia-kmod-data-96.43.14.tar.bz2
+nvidia-kmod-data-96.43.19.tar.bz2
--- dead.package DELETED ---
13 years, 10 months
rpms/nvidia-96xx-kmod/F-13 nvidia-96xx-kmod.spec, 1.32, 1.33 nvidia-kmodtool-excludekernel-filterfile, 1.2, 1.3 sources, 1.6, 1.7 .cvsignore, 1.5, 1.6 dead.package, 1.1, NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/nvidia-96xx-kmod/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv4897/F-13
Modified Files:
.cvsignore
Added Files:
nvidia-96xx-kmod.spec nvidia-kmodtool-excludekernel-filterfile
sources
Removed Files:
dead.package
Log Message:
Re-import
Index: nvidia-96xx-kmod.spec
===================================================================
RCS file: nvidia-96xx-kmod.spec
diff -N nvidia-96xx-kmod.spec
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ nvidia-96xx-kmod.spec 3 Nov 2010 20:27:46 -0000 1.33
@@ -0,0 +1,879 @@
+# buildforkernels macro hint: when you build a new version or a new release
+# that contains bugfixes or other improvements then you must disable the
+# "buildforkernels newest" macro for just that build; immediately after
+# queuing that build enable the macro again for subsequent builds; that way
+# a new akmod package will only get build when a new one is actually needed
+#define buildforkernels newest
+
+Name: nvidia-96xx-kmod
+Version: 96.43.19
+Release: 1%{?dist}
+# Taken over by kmodtool
+Summary: NVIDIA 96xx display driver kernel module
+Group: System Environment/Kernel
+License: Redistributable, no modification permitted
+URL: http://www.nvidia.com/
+# Source is created from these files:
+# http://us.download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x...
+# http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linu...
+
+# <switch me> when sources are on kwizart's repo
+Source0: http://rpms.kwizart.net/fedora/SOURCES/nvidia-kmod-data-%{version}.tar.bz2
+#Source0: http://www.diffingo.com/downloads/livna/kmod-data/nvidia-kmod-data-%{vers...
+# </switch me>
+Source11: nvidia-kmodtool-excludekernel-filterfile
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+# needed for plague to make sure it builds for i586 and i686
+ExclusiveArch: i686 x86_64
+
+# get the needed BuildRequires (in parts depending on what we build for)
+BuildRequires: %{_bindir}/kmodtool
+%{!?kernels:BuildRequires: buildsys-build-rpmfusion-kerneldevpkgs-%{?buildforkernels:%{buildforkernels}}%{!?buildforkernels:current}-%{_target_cpu} }
+# kmodtool does its magic here
+%{expand:%(kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfile %{SOURCE11} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) }
+
+%description
+The nvidia %{version} display driver kernel module for kernel %{kversion}.
+
+%prep
+# error out if there was something wrong with kmodtool
+%{?kmodtool_check}
+# print kmodtool output for debugging purposes:
+kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfile %{SOURCE11} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null
+%setup -q -c -T -a 0
+
+# patch loop
+#for arch in x86 x64
+#do
+# pushd nvidiapkg-${arch}
+# empty
+# popd
+#done
+
+
+for kernel_version in %{?kernel_versions} ; do
+%ifarch %{ix86}
+ cp -a nvidiapkg-x86 _kmod_build_${kernel_version%%___*}
+%else
+ cp -a nvidiapkg-x64 _kmod_build_${kernel_version%%___*}
+%endif
+done
+
+
+%build
+for kernel_version in %{?kernel_versions}; do
+ pushd _kmod_build_${kernel_version%%___*}/usr/src/nv/
+ ln -s -f Makefile.kbuild Makefile
+ if [[ "${kernel_version%%___*}" = *xen ]] ; then
+ CC="cc -D__XEN_TOOLS__ \
+ -I${kernel_version##*___}/include/asm/mach-xen" \
+ IGNORE_XEN_PRESENCE=1 \
+ make %{?_smp_mflags} SYSSRC="${kernel_version##*___}" module
+ else
+ IGNORE_XEN_PRESENCE=1 \
+ make %{?_smp_mflags} SYSSRC="${kernel_version##*___}" module
+ fi
+ popd
+done
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+for kernel_version in %{?kernel_versions}; do
+ install -D -m 0755 _kmod_build_${kernel_version%%___*}/usr/src/nv/nvidia.ko $RPM_BUILD_ROOT/%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/nvidia.ko
+done
+%{?akmod_install}
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%changelog
+* Wed Nov 03 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 96.43.19-1
+- Update to 96.43.19
+
+* Thu Oct 21 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.18-1.5
+- rebuild for new kernel
+
+* Sun Sep 19 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.18-1.4
+- rebuild for new kernel
+
+* Mon Sep 13 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.18-1.3
+- rebuild to build i686 packages
+
+* Wed Sep 01 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.18-1.2
+- rebuild for new kernel
+
+* Fri Aug 20 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.18-1.1
+- rebuild for new kernel
+
+* Sat Aug 14 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 96.43.18-1
+- Update to 96.43.18
+
+* Tue Jul 27 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.16-1.10
+- rebuild for new kernel
+
+* Wed Jul 07 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.16-1.9
+- rebuild for new kernel
+
+* Fri Jun 18 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.16-1.8
+- rebuild for new kernel
+
+* Sat May 01 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.16-1.7
+- rebuild for new kernel
+
+* Thu Apr 29 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.16-1.6
+- rebuild for new kernel
+
+* Thu Apr 22 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.16-1.5
+- rebuild for new kernel
+
+* Mon Apr 19 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.16-1.4
+- rebuild for new kernel
+
+* Sat Apr 17 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.16-1.3
+- rebuild for new kernel
+
+* Sat Apr 10 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.16-1.2
+- rebuild for new kernel
+
+* Mon Mar 29 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.16-1.1
+- rebuild for new kernel
+
+* Sat Mar 27 2010 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 96.43.16-1
+- Update to 96.43.16
+
+* Fri Mar 05 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.14-1.14
+- rebuild for new kernel
+
+* Mon Mar 01 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.14-1.13
+- rebuild for new kernel
+
+* Sun Feb 28 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.14-1.12
+- rebuild for new kernel
+
+* Sat Feb 20 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.14-1.11
+- rebuild for new kernel
+
+* Sat Feb 20 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.14-1.10
+- rebuild for new kernel
+
+* Thu Feb 11 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.14-1.9
+- rebuild for new kernel
+
+* Wed Feb 10 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.14-1.8
+- rebuild for new kernel
+
+* Sat Jan 30 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.14-1.7
+- rebuild for new kernel
+
+* Wed Jan 20 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.14-1.6
+- rebuild for new kernel
+
+* Sat Dec 26 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.14-1.5
+- rebuild for new kernel
+
+* Thu Dec 10 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.14-1.4
+- rebuild for new kernel
+
+* Sun Dec 06 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.14-1.3
+- rebuild for new kernel
+
+* Wed Nov 25 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.14-1.2
+- rebuild for new kernel
+
+* Sun Nov 22 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.14-1.1
+- rebuild for new kernel, disable i586 builds
+
+* Sat Nov 14 2009 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 96.43.14-1
+- Update to 96.43.14
+
+* Thu Nov 05 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.13-1.4
+- rebuild for new kernels
+
+* Tue Oct 20 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.13-1.3
+- rebuild for new kernels
+
+* Wed Sep 30 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.13-1.2
+- rebuild for new kernels
+
+* Tue Sep 1 2009 kwizart < kwizart at gmail.com > - 96.43.13-1.1
+- rebuild for new kernels
+
+* Mon Aug 31 2009 kwizart < kwizart at gmail.com > - 96.43.13-1
+- Update to 96.43.13 (beta)
+
+* Thu Aug 27 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.11-2.17
+- rebuild for new kernels
+
+* Sun Aug 23 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.11-2.16
+- rebuild for new kernels
+
+* Sat Aug 22 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.11-2.15
+- rebuild for new kernels
+
+* Sat Aug 15 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.11-2.14
+- rebuild for new kernels
+
+* Fri Aug 14 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.11-2.13
+- rebuild for new kernels
+
+* Fri Jul 31 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.11-2.12
+- rebuild for new kernels
+
+* Tue Jul 14 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.11-2.11
+- rebuild for new kernels
+
+* Sun Jun 21 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.11-2.10
+- rebuild for new kernels
+
+* Sun Jun 21 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.11-2.9
+- rebuild for new kernels
+
+* Thu May 28 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.11-2.8
+- rebuild for new kernels
+
+* Wed May 27 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.11-2.7
+- rebuild for new kernels
+
+* Thu May 21 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.11-2.6
+- rebuild for new kernels
+
+* Wed May 13 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.11-2.5
+- rebuild for new kernels
+
+* Tue May 05 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.11-2.4
+- rebuild for new kernels
+
+* Sat May 02 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.11-2.3
+- rebuild for new kernels
+
+* Sun Apr 26 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.11-2.2
+- rebuild for new kernels
+
+* Sun Apr 05 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.11-2.1
+- rebuild for new kernels
+
+* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.11-2
+- rebuild for new F11 features
+
+* Wed Feb 25 2009 kwizart < kwizart at gmail.com > - 96.43.11-1
+- Update to 96.43.11 (stable)
+
+* Sun Feb 15 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.10-2.2
+- rebuild for latest Fedora kernel;
+
+* Sun Feb 01 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.10-2.1
+- rebuild for latest Fedora kernel;
+
+* Thu Jan 29 2009 kwizart < kwizart at gmail.com > - 96.43.10-2
+- Update the spec file in sync with nvidia-kmod
+
+* Thu Jan 29 2009 kwizart < kwizart at gmail.com > - 96.43.10-1
+- Update to 96.43.10 (beta)
+
+* Sun Jan 25 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.09-1.12
+- rebuild for latest Fedora kernel;
+
+* Sun Jan 18 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.09-1.11
+- rebuild for latest Fedora kernel;
+
+* Sun Jan 11 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.09-1.10
+- rebuild for latest Fedora kernel;
+
+* Sun Jan 04 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.09-1.9
+- rebuild for latest Fedora kernel;
+
+* Sun Dec 28 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.09-1.8
+- rebuild for latest Fedora kernel;
+
+* Sun Dec 21 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.09-1.7
+- rebuild for latest Fedora kernel;
+
+* Sun Dec 14 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.09-1.6
+- rebuild for latest Fedora kernel;
+
+* Sat Nov 22 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.09-1.5
+- rebuild for latest Fedora kernel;
+
+* Wed Nov 19 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.09-1.4
+- rebuild for latest Fedora kernel;
+
+* Tue Nov 18 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.09-1.3
+- rebuild for latest Fedora kernel;
+
+* Fri Nov 14 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.09-1.2
+- rebuild for latest Fedora kernel;
+
+* Sun Nov 09 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.09-1.1
+- rebuild for latest Fedora kernel;
+
+* Thu Oct 30 2008 kwizart < kwizart at gmail.com > - 96.43.09-1
+- Update to 96.43.09 (beta)
+
+* Thu Oct 23 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.07-6.2
+- rebuild for latest kernel
+
+* Sun Oct 05 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 96.43.07-6.1
+- rebuild for rpm fusion
+
+* Wed Oct 01 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 96.43.07-5
+- rebuild for new kernels
+
+* Sun Sep 21 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 96.43.07-4
+- rebuild for new kernels
+
+* Sat Aug 16 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 96.43.07-3
+- rebuild for new kernels
+
+* Thu Jul 24 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.07-2
+- rebuild for new Fedora kernels
+
+* Sat Jul 19 2008 Stewart Adam <s.adam at diffingo.com> - 96.43.07-1
+- Update to 96.43.07
+- Remove 2.6.25 patch
+
+* Tue Jul 15 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.05-15
+- rebuild for new Fedora kernels
+
+* Thu Jul 03 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.05-14
+- rebuild for new Fedora kernels
+
+* Fri Jun 20 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.05-13
+- rebuild for new Fedora kernels
+
+* Fri Jun 06 2008 kwizart < kwizart at gmail.com > - 96.43.05-12
+- Add Patch for 2.6.25 kernels
+
+* Fri Jun 06 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.05-11
+- rebuild for new Fedora kernels
+
+* Thu May 15 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.05-10
+- rebuild for new Fedora kernels
+
+* Fri Apr 25 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.05-9
+- rebuild for 2.6.24.5-85.fc8 2.6.21.7-3.fc8xen
+
+* Wed Apr 02 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.05-8
+- rebuild for 2.6.24.4-64.fc8 2.6.21.7-3.fc8xen (second try)
+
+* Mon Mar 31 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.05-7
+- rebuild for 2.6.24.4-64.fc8 2.6.21.7-3.fc8xen
+
+* Wed Mar 26 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.05-6
+- rebuild for 2.6.24.3-50.fc8
+
+* Sun Mar 16 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.05-5
+- rebuild for 2.6.24.3-34.fc8
+
+* Fri Mar 07 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.05-4
+- rebuild for 2.6.24.3-12.fc8 2.6.21.7-2.fc8xen
+
+* Mon Feb 11 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.05-3
+- rebuild for 2.6.23.15-137.fc8
+
+* Wed Feb 06 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.05-2
+- rebuild for 2.6.23.14-115.fc8
+
+* Mon Feb 4 2008 kwizar < kwizart at gmail.com > - 96.43.05-1
+- Update to 96.43.05
+
+* Thu Jan 24 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.01-20
+- rebuilt for 2.6.23.9-107.fc8
+
+* Thu Dec 20 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.01-19
+- rebuilt for 2.6.21-2952.fc8xen 2.6.23.9-85.fc8
+
+* Mon Dec 03 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.01-18
+- rebuilt for 2.6.23.8-63.fc8 2.6.21-2952.fc8xen
+
+* Sat Nov 10 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.01-17
+- rebuilt for 2.6.23.1-49.fc8
+
+* Mon Nov 05 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.01-16
+- rebuilt for F8 kernels
+
+* Wed Oct 31 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.01-15
+- rebuilt for latest kernels
+
+* Tue Oct 30 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.01-14
+- rebuilt for latest kernels
+
+* Sun Oct 28 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.01-13
+- rebuilt for latest kernels
+- adjust to rpmfusion and new kmodtool
+
+* Sat Oct 27 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.01-12
+- rebuilt for latest kernels
+
+* Tue Oct 23 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.01-11
+- rebuilt for latest kernels
+
+* Mon Oct 22 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.01-10
+- rebuilt for latest kernels
+
+* Thu Oct 18 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.01-9
+- rebuilt for latest kernels
+
+* Thu Oct 18 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.01-8
+- rebuilt for latest kernels
+
+* Fri Oct 12 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.01-7
+- rebuilt for latest kernels
+
+* Thu Oct 11 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.01-6
+- rebuilt for latest kernels
+
+* Wed Oct 10 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 96.43.01-5
+- rebuilt for latest kernels
+
+* Tue Oct 09 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> 96.43.01-4
+- rebuilt for latest kernels
+
+* Sun Oct 07 2007 Thorsten Leemhuis <fedora AT leemhuis DOT info>
+- build for rawhide kernels as of today
+
+* Thu Oct 04 2007 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 96.43.01-2
+- update for new kmod-helper stuff
+- build for newest kernels
+
+* Wed Oct 3 2007 kwizart < kwizart at gmail.com > - 96.43.01-1
+- Update to 96.43.01
+
+* Wed May 30 2007 kwizar < kwizart at gmail.com > - 1.0.9639-1
+- Update to 1.0.9639
+
+* Fri Apr 27 2007 Stewart Adam < s.adam AT diffingo DOT com > - 1.0.9631-12
+- Rebuild for F7T4 (fixed kversion)
+
+* Fri Apr 27 2007 kwizart < kwizart at gmail.com > - 1.0.9631-11
+- Build for Fedora test4 kernel
+
+* Sun Mar 4 2007 Stewart Adam < s.adam AT diffingo DOT com > - 1.0.9631-10
+- kdump for non-i686
+
+* Sat Mar 3 2007 Stewart Adam < s.adam AT diffingo DOT com > - 1.0.9631-9
+- Patch shouldn't be a URL!
+- No kdump
+- New kernel
+
+* Fri Mar 2 2007 Stewart Adam < s.adam AT diffingo DOT com > - 1.0.9631-8
+- New kernel
+- Make Source0 a URL
+
+* Sat Feb 24 2007 Stewart Adam < s.adam AT diffingo DOT com > - 1.0.9631-7
+- Standardize all summaries and descriptions with other nvidia and fglrx
+ packages
+- Move paths from nvidia-glx to nvidia-96xx
+
+* Wed Feb 7 2007 kwizart < kwizar at gmail.com > - 1.0.9631-6
+- Disable xen variant
+
+* Wed Feb 7 2007 kwizart < kwizar at gmail.com > - 1.0.9631-5
+- Rebuild for Fedora Core 7 test1
+
+* Sat Jan 13 2007 Stewart Adam < s.adam AT diffingo DOT com > - 1.0.9631-4
+- Initial release
+- Make %%Source0 a URL
+
+* Sun Jan 7 2007 kwizart < kwizart at gmail.com > - 1.0.9631-3
+- Update xen patch patch-nv-1.0-9625-xenrt.txt (not the newest anyway)!
+- Fix perm in SOURCES.
+
+* Thu Dec 28 2006 kwizart < kwizart at gmail.com > - 1.0.9631-2
+- New legacy version named kmod-nvidia-96xx
+
+* Thu Dec 07 2006 kwizart < kwizart at gmail.com > - 1.0.9631-1
+- Update to 1.0.9631-1
+
+* Tue Nov 07 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.9629-1
+- update to release 1.0.9629
+- include xen patch (thx to Bob Richmond)
+
+* Wed Nov 01 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.9626-2
+- include patch from
+ http://www.nvnews.net/vbulletin/showpost.php?p=996233&postcount=20
+
+* Sun Oct 22 2006 Stewart Adam <s.adam AT diffingo DOT com> - 1.0.9626-1
+- update to release 1.0.9626
+
+* Sat Oct 07 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.8774-2
+- sed-away the config.h include
+
+* Thu Aug 24 2006 Niko Mirthes (straw) <nmirthes AT gmail DOT com> - 1.0.8774-1
+- update to release 1.0.8774
+
+* Thu Aug 10 2006 Niko Mirthes (straw) <nmirthes AT gmail DOT com> - 1.0.8762-5
+- update for kernel 2.6.17-1.2174_FC5
+
+* Mon Aug 07 2006 Niko Mirthes (straw) <nmirthes AT gmail DOT com> - 1.0.8762-4
+- forgot to update release field
+
+* Fri Aug 04 2006 Niko Mirthes (straw) <nmirthes AT gmail DOT com> - 1.0.8762-3
+- minor changes to spacing, removal of random tabs, re-arrangements
+
+* Sun Jun 11 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0.8762-2
+- Invoke kmodtool with bash instead of sh.
+
+* Wed May 24 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.8762-1
+- update to 1.0.8762
+
+* Sun May 14 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0.8756-3
+- Require version >= of nvidia-kmod-common.
+- Provide nvidia-kmod instead of kmod-nvidia to fix upgrade woes (#970).
+
+* Thu Apr 27 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0.8756-2
+- Provide "kernel-modules" instead of "kernel-module" to match yum's config.
+
+* Sat Apr 08 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 1.0.8756-1
+- Update to 8756
+- drop patch
+
+* Thu Mar 23 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 1.0.8178-6
+- disable xen0 for now
+
+* Wed Mar 22 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 1.0.8178-5
+- build for 2.6.16-1.2069_FC5
+
+* Wed Mar 22 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 1.0.8178-4
+- allow to pass kversion and kvariants via command line
+
+* Sat Mar 18 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 1.0.8178-3
+- drop 0.lvn
+- use kmodtool from svn
+- hardcode kernel and variants
+
+* Mon Jan 30 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.8178-0.lvn.2
+- Some minor fixes
+- new kmodtool
+
+* Sun Jan 22 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.8178-0.lvn.1
+- split into packages for userland and kmod
+- rename to nvidia-kmod
+
+* Thu Dec 22 2005 Niko Mirthes (straw) <nmirthes AT gmail DOT com> - 0:1.0.8178-0.lvn.2
+- change nvidia-glx.sh and nvidia-glx.csh to point to README.txt rather than README
+- reference xorg.conf rather than XF86Config in the init script
+- improve readability of instructions and comments, fix some typos
+- drop epoch, as it seems to be affecting dependencies according to rpmlint
+- tweak the nvidia-settings desktop file so it always shows up on the
+ menu in the right location
+- add the manual pages for nvidia-settings and nvidia-xconfig
+- remove header entries from the nvidia-glx files list. they belong in -devel
+- fix changelog entries to refer to 7676 not 7176 (though there was a 7176 x86_64
+ release prior to 7174)
+- add libXvMCNVIDIA.so
+- update to 8178
+
+* Wed Dec 07 2005 Niko Mirthes (straw) <nmirthes AT gmail DOT com> - 0:1.0.8174-0.lvn.1
+- add the manual pages for nvidia-settings and nvidia-xconfig
+- install the new nvidia-xconfig utility and associated libs
+
+* Mon Dec 05 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:1.0.8174-0.lvn.1
+- Update to 8174
+- desktop entry now Categories=Settings (#665)
+- Ship bug-reporting tool in doc (#588)
+- Things from Bug 635, Niko Mirthes (straw) <nmirthes AT gmail DOT com>:
+-- avoid changing time stamps on libs where possible
+-- only add /etc/modprobe.conf entries if they aren't already there
+-- add /etc/modprobe.conf entries one at a time
+-- only remove /etc/modprobe.conf entries at uninstall, not during upgrade
+-- avoid removing any modprobe.conf entries other than our own
+-- match Xorg's install defaults where it makes sense (0444)
+-- a few other minor tweaks to the files lists
+
+* Sun Sep 04 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:1.0.7676-0.lvn.3
+- Conflics with nvidia-glx-legacy
+- Integrate some minor correction suggested by Niko Mirthes
+ <nmirthes AT gmail DOT com> in #475
+
+* Fri Aug 26 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:1.0.7676-0.lvn.2
+- Rename src5: nvidia.init to nvidia-glx-init
+- Fix correct servicename in nvidia-glx-init
+- Run nvidia-glx-init before gdm-early-login; del and readd the script
+ during post
+
+* Sun Aug 21 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:1.0.7676-0.lvn.1
+- Update to 7676
+- Lots of cleanup from me and Niko Mirthes <nmirthes AT gmail DOT com>
+- add NVreg_ModifyDeviceFiles=0 to modprobe.conf (Niko)
+- Drop support for FC2
+- Nearly proper Udev-Support with workarounds around FC-Bug 151527
+
+* Fri Jun 17 2005 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.7174-0.lvn.5
+- Slight change of modprobe.conf rexexp
+
+* Thu Jun 16 2005 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.7174-0.lvn.4
+- Fixed a critical bug in modprobe.conf editing where all lines starting with alias and
+ ending with then a word starting with any of the letters n,v,i,d,i,a,N,V,r,e is removed.
+
+* Mon Jun 13 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:1.0.7174-0.lvn.3
+- Adjust kenrnel-module-stuff for FC4
+- Ship both x86 and x64 in the SRPM
+
+* Sun Jun 12 2005 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.7174-0.lvn.2
+- Only create 16 devices
+- Put libXvMCNVIDIA.a in -devel
+- Don't remove nvidia options in /etc/modprobe.conf
+- Make ld.so.conf file config(noreplace)
+- Use same directory permissions as the kernel
+
+* Sat Apr 2 2005 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.7174-0.lvn.1
+- New upstream release, 7174
+
+* Wed Mar 30 2005 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.7167-0.lvn.5
+- Added x86_64 support patch from Thorsten Leemhuis
+
+* Wed Mar 23 2005 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.7167-0.lvn.4
+- Fix kernel module permissions again (644)
+- Only create 16 /dev/nvidia* devices, 256 is unnecessary
+
+* Fri Mar 18 2005 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.7167-0.lvn.3
+- Fixed kernel-module permissions
+
+* Thu Mar 17 2005 Dams <anvil[AT]livna.org> 0:1.0.7167-0.lvn.2
+- Removed provides on kernel-module and kernel-modules
+
+* Sat Mar 05 2005 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.7167-0.lvn.1
+- New upstream release 1.0.7167
+- Added patch from http://www.nvnews.net/vbulletin/showthread.php?t=47405
+- Removed old patch against 2.6.9
+
+* Sat Feb 05 2005 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6629-0.lvn.7
+- Added a number of post-6629 patches from http://www.minion.de/files/1.0-6629
+- Fixed permissions of nvidia/nvidia.ko
+
+* Fri Jan 21 2005 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6629-0.lvn.6
+- Fix incorrect MAKDEV behaviour and dependency
+
+* Tue Nov 30 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6629-0.lvn.4
+- Fixed creation of /dev/nvidia* on FC2
+
+* Sat Nov 27 2004 Dams <anvil[AT]livna.org> - 0:1.0.6629-0.lvn.3
+- Dont try to print kvariant in description when it's not defined.
+
+* Sun Nov 21 2004 Thorsten Leemhuis <fedora at leemhuis dot info> - 0:1.0.6629-0.lvn.2
+- resulting kernel-module package now depends again on /root/vmlinuz-<kernelver>
+- Use rpmbuildtags driverp and kernelp
+
+* Sat Nov 06 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6629-0.lvn.1
+- New upstream version, 1.0-6629
+- Build without kernel-module-devel by default
+
+* Fri Oct 29 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6111-0.lvn.6
+- Make n-c-display handle misc problems in a better way
+- Fixed wrong icon file name in .desktop file
+- Re-added the mysteriously vanished sleep line in the init script
+ when kernel module wasn't present
+
+* Fri Oct 22 2004 Thorsten Leemhuis <fedora at leemhuis dot info> - 0:1.0.6111-0.lvn.5
+- Use fedora-kmodhelper in the way ntfs or ati-fglrx use it
+- Allow rpm to strip the kernel module. Does not safe that much space ATM but
+ might be a good idea
+- Allow to build driver and kernel-module packages independent of each other
+- Some minor spec-file changes
+
+* Thu Oct 21 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6111-0.lvn.4
+- udev fixes
+- Incorporated fix for missing include line in ld.so.conf from ati-fglrx spec (T Leemhuis)
+
+* Sun Sep 19 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6111-0.lvn.3
+- Remove FC1/kernel 2.4 compability
+- Rename srpm to nvidia-glx
+- Build with kernel-module-devel
+
+* Sun Aug 15 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6111-0.lvn.2
+- Restore ldsoconfd macro
+- Disable autoamtic removal of scripted installation for now; needs testing
+
+* Sat Aug 14 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6111-0.lvn.1
+- Upstream release 6111
+- Fixed init script (again)
+
+* Tue Aug 3 2004 Dams <anvil[AT]livna.org> 0:1.0.6106-0.lvn.4
+- ld.so.conf.d directory detected by spec file
+- Using nvidialibdir in nvidia-glx-devel files section
+- Got rid of yarrow and tettnang macros
+- libGL.so.1 symlink in tls directory always present
+
+* Mon Jul 19 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6106-0.lvn.3
+- Fixed script bug that would empty prelink.conf
+- Added symlink to non-tls libGL.so.1 on FC1
+
+* Tue Jul 13 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6106-0.lvn.2.3
+- Updated init script to reflect name change -xfree86 -> -display
+
+* Mon Jul 12 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6106-0.lvn.2.2
+- Fixed backup file naming
+
+* Sun Jul 11 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6106-0.lvn.2.1
+- Restore working macros
+- Always package the gui tool
+
+* Sun Jul 11 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6106-0.lvn.2
+- Renamed nvidia-config-xfree86 to nvidia-config-display
+- Fixed symlinks
+- Use ld.so.conf.d on FC2
+- Remove script installation in pre
+- Use system-config-display icon for nvidia-settings
+- 2 second delay in init script when kernel module not found
+- Make nvidia-config-display fail more gracefully
+- Add blacklist entry to prelink.conf on FC1
+
+* Mon Jul 05 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6106-0.lvn.1
+- New upstream release
+- First attempt to support FC2
+- Dropped dependency on XFree86
+
+* Mon Feb 09 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.5336-0.lvn.3
+- Use pkg0
+
+* Sun Feb 08 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.5336-0.lvn.2
+- New Makefile variable SYSSRC to point to kernel sources.
+- kmodhelper fixes.
+
+* Fri Jan 30 2004 Keith G. Robertson-Turner <nvidia-devel[AT]genesis-x.nildram.co.uk> 0:1.0.5336-0.lvn.1
+- New upstream release
+- Removed (now obsolete) kernel-2.6 patch
+- Install target changed upstream, from "nvidia.o" to "module"
+- Linked nv/Makefile.kbuild to (now missing) nv/Makefile
+
+* Sun Jan 25 2004 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.18
+- Updated nvidia-config-display
+- Now requiring pyxf86config
+
+* Mon Jan 19 2004 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.17
+- Added nvidiasettings macro to enable/disable gui packaging
+
+* Mon Jan 19 2004 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.16
+- Updated minion.de patches
+- Added some explicit requires
+- Test nvidia-config-xfree86 presence in kernel-module package
+ scriptlets
+
+* Mon Jan 12 2004 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.15
+- Updated Readme.fedora
+- nvidia-glx-devel package
+
+* Sat Jan 3 2004 Dams <anvil[AT]livna.org> 0:1.0.5328-0.lvn.14
+- Hopefully fixed kernel variant thingy
+
+* Fri Jan 2 2004 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.13
+- Support for other kernel variants (bigmem, etc..)
+- Changed URL in Source0
+
+* Tue Dec 30 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.13
+- Dropped nvidia pkgX information in release tag.
+
+* Tue Dec 30 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.12.pkg0
+- Renamed kernel module package in a kernel-module-nvidia-`uname -r` way
+- Using fedora.us kmodhelper for kernel macro
+- Using nvidia pkg0 archive
+
+* Sun Dec 21 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.11.pkg1
+- kernel-module-nvidia package provides kernel-module
+- We wont own devices anymore. And we wont re-create them if they are
+ already present
+
+* Sun Dec 21 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.10.pkg1
+- Yet another initscript update. Really.
+- Scriptlets updated too
+
+* Sun Dec 21 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.9.pkg1
+- Fixed alias in modprobe.conf for 2.6
+
+* Sun Dec 21 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.8.pkg1
+- Another initscript update
+
+* Sun Dec 21 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.7.pkg1
+- kernel module requires kernel same kversion
+- initscript updated again
+- Dont conflict, nor obsolete XFree86-Mesa-libGL. Using ld.so.conf to
+ make libGL from nvidia first found. Hope Mike Harris will appreciate.
+
+* Sun Dec 21 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.6.pkg1
+- kernel-module-nvidia requires kernel same version-release
+
+* Sat Dec 20 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.6.pkg1
+- Updated initscript
+
+* Fri Dec 19 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.5.pkg1
+- lvn repository tag
+
+* Fri Dec 19 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.fdr.5.pkg1
+- Added initscript to toggle nvidia driver according to running kernel
+ and installed kernel-module-nvidia packages
+- Updated scriptlets
+
+* Thu Dec 18 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.fdr.4.pkg1
+- Arch detection
+- Url in patch0
+
+* Tue Dec 16 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.fdr.3.pkg1
+- Desktop entry for nvidia-settings
+- s/kernel-module-{name}/kernel-module-nvidia
+- nvidia-glx doesnt requires kernel-module-nvidia-driver anymore
+- Using modprobe.conf for 2.6 kernel
+- Hopefully fixed symlinks
+
+* Mon Dec 15 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.fdr.2.pkg1
+- Building kernel module for defined kernel
+- kernel module for 2.6 is nvidia.ko
+- Patch not to install kernel module on make install
+- Updated patch for 2.6
+- depmod in scriptlet for defined kernel
+- nvidia-glx conflicting XFree86-Mesa-libGL because we 0wn all its
+ symlink now
+- Dont override libGL.so symlink because it belongs to XFree86-devel
+- Added nvidia 'pkgfoo' info to packages release
+- Spec file cleanup
+
+* Fri Dec 12 2003 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.4620-0.fdr.2
+- Fixed repairing of a link in post-uninstall
+- Obsolete Mesa instead of Conflict with it, enables automatic removal.
+
+* Mon Dec 08 2003 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.4620-0.fdr.1
+- Added support for 2.6 kernels
+- Cleaned up build section, removed the need for patching Makefiles.
+- Added missing BuildReq gcc32
+- Don't package libs twice, only in /usr/lib/tls/nvidia
+- Made config cript executable and put it into /usr/sbin
+- Moved kernel module to kernel/drivers/video/nvidia/
+- Fixed libGL.so and libGLcore.so.1 links to allow linking against OpenGL libraries
+
+* Mon Dec 08 2003 Keith G. Robertson-Turner <nvidia-devel at genesis-x.nildram.co.uk> - 0:1.0.4620-0.fdr.0
+- New beta 4620 driver
+- New GUI control panel
+- Some minor fixes
+
+* Thu Nov 20 2003 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.4496-0.fdr.10.1
+- Finally fixed SMP builds.
+
+* Wed Nov 19 2003 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.4496-0.fdr.9
+- Don't make nvidia-glx depend on kernel-smp
+
+* Tue Nov 18 2003 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.4496-0.fdr.8
+- Some build fixes
+
+* Tue Nov 11 2003 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.4496-0.fdr.7
+- Added CC=gcc32
+- Fixed upgrading issue
+- Added driver switching capabilities to config script.
+
+* Fri Nov 07 2003 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.4496-0.fdr.4
+- Added conflict with XFree86-Mesa-libGL.
+- Disabled showing of the README.Fedora after installation.
+
+* Sun Oct 12 2003 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.4496-0.fdr.3
+- Added NVidia configuration script written in Python.
+- Some cleanup of files section
+- For more info, see https://bugzilla.fedora.us/show_bug.cgi?id=402
+
+* Tue Jul 08 2003 Andreas Bierfert (awjb) <andreas.bierfert[AT]awbsworld.de> - 0:1.0.4363-0.fdr.2
+- renamed /sbin/makedevices.sh /sbin/nvidia-makedevices.sh ( noticed by
+ Panu Matilainen )
+- Fixed name problem
+* Sun Jun 22 2003 Andreas Bierfert (awjb) <andreas.bierfert[AT]awbsworld.de> - 0:1.0.4363-0.fdr.1
+- Initial RPM release, still some ugly stuff in there but should work...
Index: nvidia-kmodtool-excludekernel-filterfile
===================================================================
RCS file: nvidia-kmodtool-excludekernel-filterfile
diff -N nvidia-kmodtool-excludekernel-filterfile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ nvidia-kmodtool-excludekernel-filterfile 3 Nov 2010 20:27:46 -0000 1.3
@@ -0,0 +1 @@
+xen$
Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ sources 3 Nov 2010 20:27:46 -0000 1.7
@@ -0,0 +1 @@
+1b47ad03c61464a1f1f74b5b190758f7 nvidia-kmod-data-96.43.19.tar.bz2
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-96xx-kmod/F-13/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 14 Nov 2009 21:40:57 -0000 1.5
+++ .cvsignore 3 Nov 2010 20:27:46 -0000 1.6
@@ -1 +1 @@
-nvidia-kmod-data-96.43.14.tar.bz2
+nvidia-kmod-data-96.43.19.tar.bz2
--- dead.package DELETED ---
13 years, 10 months
rpms/foo2zjs/F-14 .cvsignore, 1.5, 1.6 foo2zjs-dynamic-jbig.patch, 1.3, 1.4 foo2zjs.spec, 1.9, 1.10 sources, 1.6, 1.7
by Cedric OLIVIER
Author: cquad
Update of /cvs/free/rpms/foo2zjs/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv25938/F-14
Modified Files:
.cvsignore foo2zjs-dynamic-jbig.patch foo2zjs.spec sources
Log Message:
Update to 20101016 release
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/foo2zjs/F-14/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 19 Apr 2010 11:55:16 -0000 1.5
+++ .cvsignore 3 Nov 2010 17:37:50 -0000 1.6
@@ -1 +1 @@
-foo2zjs-20100413.tar.gz
+foo2zjs-20101016.tar.gz
foo2zjs-dynamic-jbig.patch:
Makefile | 89 -
jbig.c | 3289 --------------------------------------------------------------
jbig.h | 233 ----
jbig_ar.c | 426 --------
jbig_ar.h | 55 -
5 files changed, 42 insertions(+), 4050 deletions(-)
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.3 -r 1.4 foo2zjs-dynamic-jbig.patch
Index: foo2zjs-dynamic-jbig.patch
===================================================================
RCS file: /cvs/free/rpms/foo2zjs/F-14/foo2zjs-dynamic-jbig.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- foo2zjs-dynamic-jbig.patch 8 Nov 2009 23:19:07 -0000 1.3
+++ foo2zjs-dynamic-jbig.patch 3 Nov 2010 17:37:50 -0000 1.4
@@ -1,7 +1,4043 @@
-diff -uNr foo2zjs-20091106/Makefile foo2zjs/Makefile
---- foo2zjs-20091106/Makefile 2009-10-21 19:41:50.000000000 +0100
-+++ foo2zjs/Makefile 2009-11-08 22:56:20.000000000 +0000
-@@ -123,10 +123,6 @@
+diff -uNr foo2zjs.original/jbig_ar.c foo2zjs/jbig_ar.c
+--- foo2zjs.original/jbig_ar.c 2008-09-05 17:05:54.000000000 +0200
++++ foo2zjs/jbig_ar.c 1970-01-01 01:00:00.000000000 +0100
+@@ -1,426 +0,0 @@
+-/*
+- * Arithmetic encoder and decoder of the portable JBIG
+- * compression library
+- *
+- * Markus Kuhn -- http://www.cl.cam.ac.uk/~mgk25/jbigkit/
+- *
+- * This module implements a portable standard C arithmetic encoder
+- * and decoder used by the JBIG lossless bi-level image compression
+- * algorithm as specified in International Standard ISO 11544:1993
+- * and ITU-T Recommendation T.82.
+- *
+- * This program is free software; you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License as published by
+- * the Free Software Foundation; either version 2 of the License, or
+- * (at your option) any later version.
+- *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+- * GNU General Public License for more details.
+- *
+- * You should have received a copy of the GNU General Public License
+- * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+- *
+- * If you want to use this program under different license conditions,
+- * then contact the author for an arrangement.
+- *
+- * It is possible that certain products which can be built using this
+- * software module might form inventions protected by patent rights in
+- * some countries (e.g., by patents about arithmetic coding algorithms
+- * owned by IBM and AT&T in the USA). Provision of this software by the
+- * author does NOT include any licences for any patents. In those
+- * countries where a patent licence is required for certain applications
+- * of this software module, you will have to obtain such a licence
+- * yourself.
+- */
+-
+-#include <assert.h>
+-#include "jbig_ar.h"
+-
+-/*
+- * Probability estimation tables for the arithmetic encoder/decoder
+- * given by ITU T.82 Table 24.
+- */
+-
+-static short lsztab[113] = {
+- 0x5a1d, 0x2586, 0x1114, 0x080b, 0x03d8, 0x01da, 0x00e5, 0x006f,
+- 0x0036, 0x001a, 0x000d, 0x0006, 0x0003, 0x0001, 0x5a7f, 0x3f25,
+- 0x2cf2, 0x207c, 0x17b9, 0x1182, 0x0cef, 0x09a1, 0x072f, 0x055c,
+- 0x0406, 0x0303, 0x0240, 0x01b1, 0x0144, 0x00f5, 0x00b7, 0x008a,
+- 0x0068, 0x004e, 0x003b, 0x002c, 0x5ae1, 0x484c, 0x3a0d, 0x2ef1,
+- 0x261f, 0x1f33, 0x19a8, 0x1518, 0x1177, 0x0e74, 0x0bfb, 0x09f8,
+- 0x0861, 0x0706, 0x05cd, 0x04de, 0x040f, 0x0363, 0x02d4, 0x025c,
+- 0x01f8, 0x01a4, 0x0160, 0x0125, 0x00f6, 0x00cb, 0x00ab, 0x008f,
+- 0x5b12, 0x4d04, 0x412c, 0x37d8, 0x2fe8, 0x293c, 0x2379, 0x1edf,
+- 0x1aa9, 0x174e, 0x1424, 0x119c, 0x0f6b, 0x0d51, 0x0bb6, 0x0a40,
+- 0x5832, 0x4d1c, 0x438e, 0x3bdd, 0x34ee, 0x2eae, 0x299a, 0x2516,
+- 0x5570, 0x4ca9, 0x44d9, 0x3e22, 0x3824, 0x32b4, 0x2e17, 0x56a8,
+- 0x4f46, 0x47e5, 0x41cf, 0x3c3d, 0x375e, 0x5231, 0x4c0f, 0x4639,
+- 0x415e, 0x5627, 0x50e7, 0x4b85, 0x5597, 0x504f, 0x5a10, 0x5522,
+- 0x59eb
+-};
+-
+-static unsigned char nmpstab[113] = {
+- 1, 2, 3, 4, 5, 6, 7, 8,
+- 9, 10, 11, 12, 13, 13, 15, 16,
+- 17, 18, 19, 20, 21, 22, 23, 24,
+- 25, 26, 27, 28, 29, 30, 31, 32,
+- 33, 34, 35, 9, 37, 38, 39, 40,
+- 41, 42, 43, 44, 45, 46, 47, 48,
+- 49, 50, 51, 52, 53, 54, 55, 56,
+- 57, 58, 59, 60, 61, 62, 63, 32,
+- 65, 66, 67, 68, 69, 70, 71, 72,
+- 73, 74, 75, 76, 77, 78, 79, 48,
+- 81, 82, 83, 84, 85, 86, 87, 71,
+- 89, 90, 91, 92, 93, 94, 86, 96,
+- 97, 98, 99, 100, 93, 102, 103, 104,
+- 99, 106, 107, 103, 109, 107, 111, 109,
+- 111
+-};
+-
+-/*
+- * least significant 7 bits (mask 0x7f) of nlpstab[] contain NLPS value,
+- * most significant bit (mask 0x80) contains SWTCH bit
+- */
+-static unsigned char nlpstab[113] = {
+- 129, 14, 16, 18, 20, 23, 25, 28,
+- 30, 33, 35, 9, 10, 12, 143, 36,
+- 38, 39, 40, 42, 43, 45, 46, 48,
+- 49, 51, 52, 54, 56, 57, 59, 60,
+- 62, 63, 32, 33, 165, 64, 65, 67,
+- 68, 69, 70, 72, 73, 74, 75, 77,
+- 78, 79, 48, 50, 50, 51, 52, 53,
+- 54, 55, 56, 57, 58, 59, 61, 61,
+- 193, 80, 81, 82, 83, 84, 86, 87,
+- 87, 72, 72, 74, 74, 75, 77, 77,
+- 208, 88, 89, 90, 91, 92, 93, 86,
+- 216, 95, 96, 97, 99, 99, 93, 223,
+- 101, 102, 103, 104, 99, 105, 106, 107,
+- 103, 233, 108, 109, 110, 111, 238, 112,
+- 240
+-};
+-
+-/*
+- * The next functions implement the arithmedic encoder and decoder
+- * required for JBIG. The same algorithm is also used in the arithmetic
+- * variant of JPEG.
+- */
+-
+-/* marker codes */
+-#define MARKER_STUFF 0x00
+-#define MARKER_ESC 0xff
+-
+-void arith_encode_init(struct jbg_arenc_state *s, int reuse_st)
+-{
+- int i;
+-
+- if (!reuse_st)
+- for (i = 0; i < 4096; s->st[i++] = 0);
+- s->c = 0;
+- s->a = 0x10000L;
+- s->sc = 0;
+- s->ct = 11;
+- s->buffer = -1; /* empty */
+-
+- return;
+-}
+-
+-
+-void arith_encode_flush(struct jbg_arenc_state *s)
+-{
+- unsigned long temp;
+-
+- /* find the s->c in the coding interval with the largest
+- * number of trailing zero bits */
+- if ((temp = (s->a - 1 + s->c) & 0xffff0000L) < s->c)
+- s->c = temp + 0x8000;
+- else
+- s->c = temp;
+- /* send remaining bytes to output */
+- s->c <<= s->ct;
+- if (s->c & 0xf8000000L) {
+- /* one final overflow has to be handled */
+- if (s->buffer >= 0) {
+- s->byte_out(s->buffer + 1, s->file);
+- if (s->buffer + 1 == MARKER_ESC)
+- s->byte_out(MARKER_STUFF, s->file);
+- }
+- /* output 0x00 bytes only when more non-0x00 will follow */
+- if (s->c & 0x7fff800L)
+- for (; s->sc; --s->sc)
+- s->byte_out(0x00, s->file);
+- } else {
+- if (s->buffer >= 0)
+- s->byte_out(s->buffer, s->file);
+- /* T.82 figure 30 says buffer+1 for the above line! Typo? */
+- for (; s->sc; --s->sc) {
+- s->byte_out(0xff, s->file);
+- s->byte_out(MARKER_STUFF, s->file);
+- }
+- }
+- /* output final bytes only if they are not 0x00 */
+- if (s->c & 0x7fff800L) {
+- s->byte_out((s->c >> 19) & 0xff, s->file);
+- if (((s->c >> 19) & 0xff) == MARKER_ESC)
+- s->byte_out(MARKER_STUFF, s->file);
+- if (s->c & 0x7f800L) {
+- s->byte_out((s->c >> 11) & 0xff, s->file);
+- if (((s->c >> 11) & 0xff) == MARKER_ESC)
+- s->byte_out(MARKER_STUFF, s->file);
+- }
+- }
+-
+- return;
+-}
+-
+-
+-void arith_encode(struct jbg_arenc_state *s, int cx, int pix)
+-{
+- register unsigned lsz, ss;
+- register unsigned char *st;
+- long temp;
[...5281 lines suppressed...]
-+ -e "s@\$${URLZJS}@$(URLZJS)@g" \
-+ -e "s@\$${URLHP}@$(URLHP)@g" \
-+ -e "s@\$${URLXQX}@$(URLXQX)@g" \
-+ -e "s@\$${URLLAVA}@$(URLLAVA)@g" \
-+ -e "s@\$${URLQPDL}@$(URLQPDL)@g" \
-+ -e "s@\$${URLSLX}@$(URLSLX)@g" \
-+ -e "s@\$${URLHC}@$(URLHC)@g" \
-+ -e "s@\$${PRODUCT}@$$PRODUCT@g" \
-+ -e "s/\$${MODindex}/$$MODindex $$TZ/" \
-+ -e "s/\$${MODtarball}/$$MODtarball $$TZ/"
-+ chmod -w $@
-+
-+web: test tar manual.pdf webindex
-+ ncftpput -m -f $(FTPSITE) foo2zjs \
-+ ChangeLog INSTALL manual.pdf foo2zjs.tar.gz;
-+
-+webt: tar manual.pdf webindex
-+ ncftpput -m -f $(FTPSITE) foo2zjs \
-+ ChangeLog INSTALL manual.pdf foo2zjs.tar.gz;
-+
-+webworld: web webpics
-+
-+webindex: INSTALL zjsindex oakindex hpindex xqxindex lavaindex \
-+ qpdlindex oakindex slxindex hcindex
-+
-+webpics: redhat suse ubuntu mandriva fedora
-+
-+webphotos:
-+ cd printer-photos; $(MAKE)
-+
-+zjsindex: foo2zjs.html archzjs.gif thermometer.gif webphotos
-+ ln -sf foo2zjs.html index.html
-+ ncftpput -m -f $(FTPSITE) foo2zjs \
-+ index.html style.css archzjs.gif thermometer.gif \
-+ flags.png INSTALL INSTALL.osx zjsfavicon.png \
-+ printer-photos/printers.jpg;
-+
-+oakindex: foo2oak.html archoak.gif thermometer.gif webphotos
-+ ln -sf foo2oak.html index.html
-+ ncftpput -m -f $(FTPSITE) foo2oak \
-+ index.html style.css archoak.gif thermometer.gif \
-+ flags.png INSTALL \
-+ printer-photos/printers.jpg;
-+
-+hpindex: foo2hp.html archhp.gif thermometer.gif webphotos
-+ ln -sf foo2hp.html index.html
-+ ncftpput -m -f $(FTPSITE) foo2hp \
-+ index.html style.css archhp.gif thermometer.gif \
-+ flags.png INSTALL hpfavicon.png \
-+ printer-photos/printers.jpg;
-+
-+xqxindex: foo2xqx.html archxqx.gif thermometer.gif webphotos
-+ ln -sf foo2xqx.html index.html
-+ ncftpput -m -f $(FTPSITE) foo2xqx \
-+ index.html style.css archxqx.gif thermometer.gif \
-+ flags.png INSTALL xqxfavicon.png \
-+ printer-photos/printers.jpg;
-+
-+lavaindex: foo2lava.html archlava.gif thermometer.gif webphotos
-+ ln -sf foo2lava.html index.html
-+ ncftpput -m -f $(FTPSITE) foo2lava \
-+ index.html style.css archlava.gif thermometer.gif \
-+ flags.png INSTALL lavafavicon.png \
-+ printer-photos/printers.jpg;
-+
-+qpdlindex: foo2qpdl.html archqpdl.gif thermometer.gif webphotos
-+ ln -sf foo2qpdl.html index.html
-+ ncftpput -m -f $(FTPSITE) foo2qpdl \
-+ index.html style.css archqpdl.gif thermometer.gif \
-+ flags.png INSTALL qpdlfavicon.png \
-+ printer-photos/printers.jpg;
-+
-+slxindex: foo2slx.html archslx.gif thermometer.gif webphotos
-+ ln -sf foo2slx.html index.html
-+ ncftpput -m -f $(FTPSITE) foo2slx \
-+ index.html style.css archslx.gif thermometer.gif \
-+ flags.png INSTALL slxfavicon.png \
-+ printer-photos/printers.jpg;
-+
-+hcindex: foo2hiperc.html archhiperc.gif thermometer.gif webphotos
-+ ln -sf foo2hiperc.html index.html
-+ ncftpput -m -f $(FTPSITE) foo2hiperc \
-+ index.html style.css archhiperc.gif thermometer.gif \
-+ flags.png INSTALL hipercfavicon.png \
-+ printer-photos/printers.jpg;
-+
-+foo2zjs.html: warning.html contribute.html resources.html unsupported.html
-+foo2hp.html: warning.html contribute.html resources.html unsupported.html
-+foo2xqx.html: warning.html contribute.html resources.html unsupported.html
-+foo2lava.html: warning.html contribute.html resources.html unsupported.html
-+foo2qpdl.html: warning.html contribute.html resources.html unsupported.html
-+foo2slx.html: warning.html contribute.html resources.html unsupported.html
-+foo2hiperc.html: warning.html contribute.html resources.html unsupported.html
-+foo2oak.html: warning.html contribute.html resources.html unsupported.html
-+
-+# RedHat
-+redhat: FRC
-+ cd redhat; $(MAKE) web FTPSITE=$(FTPSITE)
-+
-+# Fedora Core 6+
-+fedora: FRC
-+ cd fedora; $(MAKE) web FTPSITE=$(FTPSITE)
-+
-+suse: FRC
-+ cd suse; $(MAKE) web FTPSITE=$(FTPSITE)
-+
-+ubuntu: FRC
-+ cd ubuntu; $(MAKE) web FTPSITE=$(FTPSITE)
-+
-+mandriva: FRC
-+ cd mandriva; $(MAKE) web FTPSITE=$(FTPSITE)
-+
-+#
-+# Extra files from web
-+#
-+webextra: webicm webfw
-+
-+webicm: \
-+ icm/dl2300.tar.gz \
-+ icm/km2430.tar.gz icm/hpclj2600n.tar.gz \
-+ icm/hp1215.tar.gz icm/km2530.tar.gz \
-+ icm/km-1600.tar.gz \
-+ icm/samclp300.tar.gz icm/samclp315.tar.gz \
-+ icm/lexc500.tar.gz \
-+ icm/okic3200.tar.gz icm/okic3400.tar.gz icm/okic5600.tar.gz
-+ ncftpput -m -f $(FTPSITE) foo2zjs/icm icm/dl2300.tar.gz;
-+ ncftpput -m -f $(FTPSITE) foo2zjs/icm icm/km2430.tar.gz;
-+ ncftpput -m -f $(FTPSITE) foo2hp/icm icm/hpclj2600n.tar.gz;
-+ ncftpput -m -f $(FTPSITE) foo2hp/icm icm/hp1215.tar.gz;
-+ ncftpput -m -f $(FTPSITE) foo2lava/icm icm/km2530.tar.gz;
-+ ncftpput -m -f $(FTPSITE) foo2lava/icm icm/km-1600.tar.gz;
-+ ncftpput -m -f $(FTPSITE) foo2qpdl/icm icm/samclp300.tar.gz;
-+ ncftpput -m -f $(FTPSITE) foo2qpdl/icm icm/samclp315.tar.gz;
-+ ncftpput -m -f $(FTPSITE) foo2slx/icm icm/lexc500.tar.gz;
-+ ncftpput -m -f $(FTPSITE) foo2hiperc/icm icm/okic3200.tar.gz;
-+ ncftpput -m -f $(FTPSITE) foo2hiperc/icm icm/okic3400.tar.gz;
-+ ncftpput -m -f $(FTPSITE) foo2hiperc/icm icm/okic5600.tar.gz;
-+
-+icm/dl2300.tar.gz: FRC
-+ cd icm; tar -c -z -f ../$@ CP*.icm DL*.icm
-+icm/km2430.tar.gz: FRC
-+ cd icm; tar -c -z -f ../$@ km2430*.icm
-+icm/hpclj2600n.tar.gz: FRC
-+ cd icm; tar -c -z -f ../$@ hpclj2600*.icm
-+icm/hp1215.tar.gz: FRC
-+ cd icm; tar -c -z -f ../$@ hp1215*.icm
-+icm/km2530.tar.gz: FRC
-+ cd icm; tar -c -z -f ../$@ km2530*.icm
-+icm/km-1600.tar.gz: FRC
-+ cd icm; tar -c -z -f ../$@ km-1600*.icm
-+icm/samclp300.tar.gz: FRC
-+ cd icm; tar -c -z -f ../$@ samclp300*.icm
-+icm/samclp315.tar.gz: FRC
-+ cd icm; tar -c -z -f ../$@ samclp315*.icm
-+icm/lexc500.tar.gz: FRC
-+ cd icm; tar -c -z -f ../$@ lexR*.icm
-+icm/okic3200.tar.gz: FRC
-+ cd icm; tar -c -z -f ../$@ OK32*.icm
-+icm/okic3400.tar.gz: FRC
-+ cd icm; tar -c -z -f ../$@ C3400*.icm
-+icm/okic5600.tar.gz: FRC
-+ cd icm; tar -c -z -f ../$@ OK56*.icm
-+
-+webfw: firmware/sihp1000.tar.gz \
-+ firmware/sihp1005.tar.gz \
-+ firmware/sihp1018.tar.gz \
-+ firmware/sihp1020.tar.gz \
-+ firmware/sihpP1005.tar.gz \
-+ firmware/sihpP1006.tar.gz \
-+ firmware/sihpP1505.tar.gz \
-+ $(NULL)
-+ ncftpput -m -f $(FTPSITE) foo2zjs/firmware firmware/*.tar.gz;
-+
-+firmware/sihp1000.tar.gz: FRC
-+ cd firmware; tar -c -z -f ../$@ sihp1000.img
-+firmware/sihp1005.tar.gz: FRC
-+ cd firmware; tar -c -z -f ../$@ sihp1005.img
-+firmware/sihp1018.tar.gz: FRC
-+ cd firmware; tar -c -z -f ../$@ sihp1018.img
-+firmware/sihp1020.tar.gz: FRC
-+ cd firmware; tar -c -z -f ../$@ sihp1020.img
-+firmware/sihpP1005.tar.gz: FRC
-+ cd firmware; tar -c -z -f ../$@ sihpP1005.img
-+firmware/sihpP1006.tar.gz: FRC
-+ cd firmware; tar -c -z -f ../$@ sihpP1006.img
-+firmware/sihpP1505.tar.gz: FRC
-+ cd firmware; tar -c -z -f ../$@ sihpP1505.img
-+
-+FRC:
-+
-+#
-+# Misc
-+#
-+misc: pksm2bitcmyk phorum-logo.gif
-+
-+pksm2bitcmyk: pksm2bitcmyk.c
-+ $(CC) $(CFLAGS) pksm2bitcmyk.c -lnetpbm -o $@
-+
-+phorum-logo.gif: archhp.fig
-+ fig2dev -L gif -m.25 archhp.fig | giftrans -t "#ffffff" -o $@
Index: foo2zjs.spec
===================================================================
RCS file: /cvs/free/rpms/foo2zjs/F-14/foo2zjs.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- foo2zjs.spec 19 Apr 2010 11:59:08 -0000 1.9
+++ foo2zjs.spec 3 Nov 2010 17:37:50 -0000 1.10
@@ -1,4 +1,4 @@
-%define foo2zjs_ver 20100413
+%define foo2zjs_ver 20101016
Name: foo2zjs
Version: 0.%{foo2zjs_ver}
@@ -6,7 +6,7 @@
Summary: Linux printer driver for ZjStream protocol
Group: System Environment/Libraries
-License: GPL
+License: GPLv2
URL: http://foo2zjs.rkkda.com/
Source0: foo2zjs-%{foo2zjs_ver}.tar.gz
@@ -15,6 +15,7 @@
BuildRequires: jbigkit-devel groff ghostscript
Requires: lcms
+Requires: argyllcms
Requires(post): /bin/rm
%package -n foo2hp
@@ -186,11 +187,24 @@
%prep
%setup -q -n foo2zjs
+
+# Patch to use jbigkit-devel package instead of static jbig source code
%patch0 -p1
+
+# Remove jbig source code, jbigkit-devel package is used in BuildRequires
+#rm -f jbig*
+
sed -i -e s/foo2zjs-icc2ps/icc2ps/g *wrapper*
sed -i -e s/775/755/ Makefile
chmod -x COPYING
+# Xerox-Phaser_6110 not needed files because already in foomatic-db package
+rm foomatic-db/printer/Xerox-Phaser_6110.xml
+rm PPD/Xerox-Phaser_6110.ppd
+
+# Samsung CLP-310 already included in foomatic-db package
+rm foomatic-db/printer/Samsung-CLP-310.xml
+
%build
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
@@ -211,8 +225,6 @@
# Remove man page for usb_printerid which we don't ship
rm -f $RPM_BUILD_ROOT%{_mandir}/man1/usb_printerid.1
-rm -f $RPM_BUILD_ROOT%{_mandir}/man1/printer-profile.1
-rm -f $RPM_BUILD_ROOT%{_bindir}/printer-profile
%clean
@@ -222,9 +234,14 @@
%files
%defattr(-,root,root,-)
%{_bindir}/*zjs*
+%{_bindir}/printer-profile
%{_datadir}/foo2zjs
%{_mandir}/man1/*zjs*
+%{_mandir}/man1/printer-profile.1.gz
+%{_mandir}/man1/gipddecode.1.gz
%{_datadir}/foomatic/db/source/driver/foo2zjs.xml
+%{_datadir}/foomatic/db/source/driver/foo2zjs-z1.xml
+%{_datadir}/foomatic/db/source/driver/foo2zjs-z2.xml
%{_datadir}/foomatic/db/source/opt/foo2zjs*.xml
%{_datadir}/foomatic/db/source/opt/foo2xxx*.xml
%{_datadir}/foomatic/db/source/printer/Generic-ZjStream_Printer.xml
@@ -241,6 +258,7 @@
%{_datadir}/cups/model/Minolta-magicolor_2430_DL.ppd.gz
%files -n foo2hp
+%defattr(-,root,root,-)
%{_bindir}/*hp*
%{_mandir}/man1/*hp*
%{_datadir}/foomatic/db/source/driver/foo2hp.xml
@@ -253,6 +271,7 @@
%{_datadir}/cups/model/HP-Color_LaserJet_2600n.ppd.gz
%files -n foo2xqx
+%defattr(-,root,root,-)
%{_bindir}/*xqx*
%{_mandir}/man1/*xqx*
%{_datadir}/foomatic/db/source/driver/foo2xqx.xml
@@ -263,35 +282,45 @@
%{_datadir}/cups/model/HP-LaserJet_P*.ppd.gz
%files -n foo2lava
+%defattr(-,root,root,-)
%{_bindir}/*lava*
%{_bindir}/opldecode
%{_mandir}/man1/*lava*
%{_mandir}/man1/opldecode.1.gz
%{_datadir}/foomatic/db/source/driver/foo2lava.xml
%{_datadir}/foomatic/db/source/opt/foo2lava*.xml
-%{_datadir}/foomatic/db/source/printer/KONICA_MINOLTA-magicolor_16*.xml
%{_datadir}/foomatic/db/source/printer/KONICA_MINOLTA-magicolor_2480_MF.xml
%{_datadir}/foomatic/db/source/printer/KONICA_MINOLTA-magicolor_2490_MF.xml
%{_datadir}/foomatic/db/source/printer/KONICA_MINOLTA-magicolor_2530_DL.xml
+%{_datadir}/foomatic/db/source/printer/KONICA_MINOLTA-magicolor_1600W.xml
+%{_datadir}/foomatic/db/source/printer/KONICA_MINOLTA-magicolor_1680MF.xml
+%{_datadir}/foomatic/db/source/printer/KONICA_MINOLTA-magicolor_1690MF.xml
%{_datadir}/foomatic/db/source/printer/KONICA_MINOLTA-magicolor_4690MF.xml
-%{_datadir}/cups/model/KONICA_MINOLTA-magicolor_16*.ppd.gz
+%{_datadir}/foomatic/db/source/printer/Xerox-Phaser_6121MFP.xml
%{_datadir}/cups/model/KONICA_MINOLTA-magicolor_2480_MF.ppd.gz
%{_datadir}/cups/model/KONICA_MINOLTA-magicolor_2490_MF.ppd.gz
%{_datadir}/cups/model/KONICA_MINOLTA-magicolor_2530_DL.ppd.gz
+%{_datadir}/cups/model/KONICA_MINOLTA-magicolor_1600W.ppd.gz
+%{_datadir}/cups/model/KONICA_MINOLTA-magicolor_1680MF.ppd.gz
+%{_datadir}/cups/model/KONICA_MINOLTA-magicolor_1690MF.ppd.gz
%{_datadir}/cups/model/KONICA_MINOLTA-magicolor_4690MF.ppd.gz
+%{_datadir}/cups/model/Xerox-Phaser_6121MFP.ppd.gz
+
%files -n foo2qpdl
+%defattr(-,root,root,-)
%{_bindir}/*qpdl*
%{_mandir}/man1/*qpdl*
%{_datadir}/foomatic/db/source/driver/foo2qpdl.xml
%{_datadir}/foomatic/db/source/opt/foo2qpdl*.xml
%{_datadir}/foomatic/db/source/printer/Samsung-CL*.xml
-%{_datadir}/foomatic/db/source/printer/Xerox-Phaser_611*.xml
+%{_datadir}/foomatic/db/source/printer/Xerox-Phaser_6115MFP.xml
%{_datadir}/cups/model/Samsung-CL*.ppd.gz
-%{_datadir}/cups/model/Xerox-Phaser_611*.ppd.gz
+%{_datadir}/cups/model/Xerox-Phaser_6115MFP.ppd.gz
%{_datadir}/foo2qpdl/crd/
%files -n foo2slx
+%defattr(-,root,root,-)
%{_bindir}/*slx*
%{_bindir}/gipddecode
%{_mandir}/man1/*slx*
@@ -301,6 +330,7 @@
%{_datadir}/cups/model/Lexmark-C500.ppd.gz
%files -n foo2hiperc
+%defattr(-,root,root,-)
%{_bindir}/*hiperc*
%{_mandir}/man1/*hiperc*
%{_datadir}/foomatic/db/source/driver/foo2hiperc.xml
@@ -309,6 +339,7 @@
%{_datadir}/cups/model/Oki-C*.ppd.gz
%files -n foo2oak
+%defattr(-,root,root,-)
%{_bindir}/*oak*
%{_mandir}/man1/*oak*.1.gz
%{_datadir}/foomatic/db/source/opt/foo2oak*
@@ -350,11 +381,33 @@
/bin/rm -f /var/cache/foomatic/*
%changelog
-* Mon Apr 19 2010 David Woodhouse <dwmw2(a)infradead.org> 0.20100413-1
-- Update to 20100413
-
-* Sun Nov 08 2009 David Woodhouse <dwmw2(a)infradead.org> 0.20091106-1
-- Update to 20091106
+* Sat Oct 23 2010 Cedric Olivier <cedric.olivier(a)free.fr> 0.20101016-1
+- Update to last release
+- Remove Samsung-CLP-310.xml which conflict with foomatic-db package
+
+* Wed Sep 17 2010 Cedric Olivier <cedric.olivier(a)free.fr> 0.20100817-1
+- New foo2lava printer: Xerox Phaser 6121MFP (printer only)
+- Added manual page for foo2zjs-icc2ps
+
+* Thu Jul 22 2010 Cedric Olivier <cedric.olivier(a)free.fr> 0.20100722-1
+- New Printer: Oki C110
+- Change PPD's for Konica Minolta mc1600W, mc1680MF, mc1690MF, mc2490 MF, mc2530 DL, mc4690MF,
+and Oki C110 if cups-devel is installed.
+- Used for reporting marker (toner) levels via PJL on foo2lava printers.
+
+* Thu May 11 2010 Cedric Olivier <cedric.olivier(a)free.fr> 0.20100506-2
+- add foo2zjs-dynamic-jbig patch to use jbigkit-devel package instead of static jbig source code
+
+* Fri May 07 2010 Cedric Olivier <cedric.olivier(a)free.fr> 0.20100506-1
+- Update to 20100506
+- New Printers: Oki C5650
+- New Printers: HP LaserJet Pro P1102, P1102w
+- New Printers: HP LaserJet Pro P1566
+- New Printers: HP LaserJet Pro P1606dn
+
+* Wed Mar 10 2010 Cedric Olivier <cedric.olivier(a)free.fr> 0.20100307-1
+- Update to 20100307
+- BugFix and adding new printers supports
* Sat Apr 25 2009 Lubomir Rintel <lkundrak(a)v3.sk> 0.20080826-3
- Add proper scriptlet requires
Index: sources
===================================================================
RCS file: /cvs/free/rpms/foo2zjs/F-14/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 19 Apr 2010 11:55:17 -0000 1.6
+++ sources 3 Nov 2010 17:37:50 -0000 1.7
@@ -1 +1 @@
-c6de65768824d84f01a0fe116014db68 foo2zjs-20100413.tar.gz
+00907246dab06daa16a4cab29c4d6ddd foo2zjs-20101016.tar.gz
13 years, 10 months
rpms/foo2zjs/F-13 .cvsignore, 1.5, 1.6 foo2zjs-dynamic-jbig.patch, 1.3, 1.4 foo2zjs.spec, 1.8, 1.9 sources, 1.6, 1.7
by Cedric OLIVIER
Author: cquad
Update of /cvs/free/rpms/foo2zjs/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv24351/F-13
Modified Files:
.cvsignore foo2zjs-dynamic-jbig.patch foo2zjs.spec sources
Log Message:
Update to 20101016 release
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/foo2zjs/F-13/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 19 Apr 2010 11:59:44 -0000 1.5
+++ .cvsignore 3 Nov 2010 17:18:31 -0000 1.6
@@ -1 +1 @@
-foo2zjs-20100413.tar.gz
+foo2zjs-20101016.tar.gz
foo2zjs-dynamic-jbig.patch:
Makefile | 89 -
jbig.c | 3289 --------------------------------------------------------------
jbig.h | 233 ----
jbig_ar.c | 426 --------
jbig_ar.h | 55 -
5 files changed, 42 insertions(+), 4050 deletions(-)
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.3 -r 1.4 foo2zjs-dynamic-jbig.patch
Index: foo2zjs-dynamic-jbig.patch
===================================================================
RCS file: /cvs/free/rpms/foo2zjs/F-13/foo2zjs-dynamic-jbig.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- foo2zjs-dynamic-jbig.patch 8 Nov 2009 23:19:07 -0000 1.3
+++ foo2zjs-dynamic-jbig.patch 3 Nov 2010 17:18:31 -0000 1.4
@@ -1,7 +1,4043 @@
-diff -uNr foo2zjs-20091106/Makefile foo2zjs/Makefile
---- foo2zjs-20091106/Makefile 2009-10-21 19:41:50.000000000 +0100
-+++ foo2zjs/Makefile 2009-11-08 22:56:20.000000000 +0000
-@@ -123,10 +123,6 @@
+diff -uNr foo2zjs.original/jbig_ar.c foo2zjs/jbig_ar.c
+--- foo2zjs.original/jbig_ar.c 2008-09-05 17:05:54.000000000 +0200
++++ foo2zjs/jbig_ar.c 1970-01-01 01:00:00.000000000 +0100
+@@ -1,426 +0,0 @@
+-/*
+- * Arithmetic encoder and decoder of the portable JBIG
+- * compression library
+- *
+- * Markus Kuhn -- http://www.cl.cam.ac.uk/~mgk25/jbigkit/
+- *
+- * This module implements a portable standard C arithmetic encoder
+- * and decoder used by the JBIG lossless bi-level image compression
+- * algorithm as specified in International Standard ISO 11544:1993
+- * and ITU-T Recommendation T.82.
+- *
+- * This program is free software; you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License as published by
+- * the Free Software Foundation; either version 2 of the License, or
+- * (at your option) any later version.
+- *
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+- * GNU General Public License for more details.
+- *
+- * You should have received a copy of the GNU General Public License
+- * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+- *
+- * If you want to use this program under different license conditions,
+- * then contact the author for an arrangement.
+- *
+- * It is possible that certain products which can be built using this
+- * software module might form inventions protected by patent rights in
+- * some countries (e.g., by patents about arithmetic coding algorithms
+- * owned by IBM and AT&T in the USA). Provision of this software by the
+- * author does NOT include any licences for any patents. In those
+- * countries where a patent licence is required for certain applications
+- * of this software module, you will have to obtain such a licence
+- * yourself.
+- */
+-
+-#include <assert.h>
+-#include "jbig_ar.h"
+-
+-/*
+- * Probability estimation tables for the arithmetic encoder/decoder
+- * given by ITU T.82 Table 24.
+- */
+-
+-static short lsztab[113] = {
+- 0x5a1d, 0x2586, 0x1114, 0x080b, 0x03d8, 0x01da, 0x00e5, 0x006f,
+- 0x0036, 0x001a, 0x000d, 0x0006, 0x0003, 0x0001, 0x5a7f, 0x3f25,
+- 0x2cf2, 0x207c, 0x17b9, 0x1182, 0x0cef, 0x09a1, 0x072f, 0x055c,
+- 0x0406, 0x0303, 0x0240, 0x01b1, 0x0144, 0x00f5, 0x00b7, 0x008a,
+- 0x0068, 0x004e, 0x003b, 0x002c, 0x5ae1, 0x484c, 0x3a0d, 0x2ef1,
+- 0x261f, 0x1f33, 0x19a8, 0x1518, 0x1177, 0x0e74, 0x0bfb, 0x09f8,
+- 0x0861, 0x0706, 0x05cd, 0x04de, 0x040f, 0x0363, 0x02d4, 0x025c,
+- 0x01f8, 0x01a4, 0x0160, 0x0125, 0x00f6, 0x00cb, 0x00ab, 0x008f,
+- 0x5b12, 0x4d04, 0x412c, 0x37d8, 0x2fe8, 0x293c, 0x2379, 0x1edf,
+- 0x1aa9, 0x174e, 0x1424, 0x119c, 0x0f6b, 0x0d51, 0x0bb6, 0x0a40,
+- 0x5832, 0x4d1c, 0x438e, 0x3bdd, 0x34ee, 0x2eae, 0x299a, 0x2516,
+- 0x5570, 0x4ca9, 0x44d9, 0x3e22, 0x3824, 0x32b4, 0x2e17, 0x56a8,
+- 0x4f46, 0x47e5, 0x41cf, 0x3c3d, 0x375e, 0x5231, 0x4c0f, 0x4639,
+- 0x415e, 0x5627, 0x50e7, 0x4b85, 0x5597, 0x504f, 0x5a10, 0x5522,
+- 0x59eb
+-};
+-
+-static unsigned char nmpstab[113] = {
+- 1, 2, 3, 4, 5, 6, 7, 8,
+- 9, 10, 11, 12, 13, 13, 15, 16,
+- 17, 18, 19, 20, 21, 22, 23, 24,
+- 25, 26, 27, 28, 29, 30, 31, 32,
+- 33, 34, 35, 9, 37, 38, 39, 40,
+- 41, 42, 43, 44, 45, 46, 47, 48,
+- 49, 50, 51, 52, 53, 54, 55, 56,
+- 57, 58, 59, 60, 61, 62, 63, 32,
+- 65, 66, 67, 68, 69, 70, 71, 72,
+- 73, 74, 75, 76, 77, 78, 79, 48,
+- 81, 82, 83, 84, 85, 86, 87, 71,
+- 89, 90, 91, 92, 93, 94, 86, 96,
+- 97, 98, 99, 100, 93, 102, 103, 104,
+- 99, 106, 107, 103, 109, 107, 111, 109,
+- 111
+-};
+-
+-/*
+- * least significant 7 bits (mask 0x7f) of nlpstab[] contain NLPS value,
+- * most significant bit (mask 0x80) contains SWTCH bit
+- */
+-static unsigned char nlpstab[113] = {
+- 129, 14, 16, 18, 20, 23, 25, 28,
+- 30, 33, 35, 9, 10, 12, 143, 36,
+- 38, 39, 40, 42, 43, 45, 46, 48,
+- 49, 51, 52, 54, 56, 57, 59, 60,
+- 62, 63, 32, 33, 165, 64, 65, 67,
+- 68, 69, 70, 72, 73, 74, 75, 77,
+- 78, 79, 48, 50, 50, 51, 52, 53,
+- 54, 55, 56, 57, 58, 59, 61, 61,
+- 193, 80, 81, 82, 83, 84, 86, 87,
+- 87, 72, 72, 74, 74, 75, 77, 77,
+- 208, 88, 89, 90, 91, 92, 93, 86,
+- 216, 95, 96, 97, 99, 99, 93, 223,
+- 101, 102, 103, 104, 99, 105, 106, 107,
+- 103, 233, 108, 109, 110, 111, 238, 112,
+- 240
+-};
+-
+-/*
+- * The next functions implement the arithmedic encoder and decoder
+- * required for JBIG. The same algorithm is also used in the arithmetic
+- * variant of JPEG.
+- */
+-
+-/* marker codes */
+-#define MARKER_STUFF 0x00
+-#define MARKER_ESC 0xff
+-
+-void arith_encode_init(struct jbg_arenc_state *s, int reuse_st)
+-{
+- int i;
+-
+- if (!reuse_st)
+- for (i = 0; i < 4096; s->st[i++] = 0);
+- s->c = 0;
+- s->a = 0x10000L;
+- s->sc = 0;
+- s->ct = 11;
+- s->buffer = -1; /* empty */
+-
+- return;
+-}
+-
+-
+-void arith_encode_flush(struct jbg_arenc_state *s)
+-{
+- unsigned long temp;
+-
+- /* find the s->c in the coding interval with the largest
+- * number of trailing zero bits */
+- if ((temp = (s->a - 1 + s->c) & 0xffff0000L) < s->c)
+- s->c = temp + 0x8000;
+- else
+- s->c = temp;
+- /* send remaining bytes to output */
+- s->c <<= s->ct;
+- if (s->c & 0xf8000000L) {
+- /* one final overflow has to be handled */
+- if (s->buffer >= 0) {
+- s->byte_out(s->buffer + 1, s->file);
+- if (s->buffer + 1 == MARKER_ESC)
+- s->byte_out(MARKER_STUFF, s->file);
+- }
+- /* output 0x00 bytes only when more non-0x00 will follow */
+- if (s->c & 0x7fff800L)
+- for (; s->sc; --s->sc)
+- s->byte_out(0x00, s->file);
+- } else {
+- if (s->buffer >= 0)
+- s->byte_out(s->buffer, s->file);
+- /* T.82 figure 30 says buffer+1 for the above line! Typo? */
+- for (; s->sc; --s->sc) {
+- s->byte_out(0xff, s->file);
+- s->byte_out(MARKER_STUFF, s->file);
+- }
+- }
+- /* output final bytes only if they are not 0x00 */
+- if (s->c & 0x7fff800L) {
+- s->byte_out((s->c >> 19) & 0xff, s->file);
+- if (((s->c >> 19) & 0xff) == MARKER_ESC)
+- s->byte_out(MARKER_STUFF, s->file);
+- if (s->c & 0x7f800L) {
+- s->byte_out((s->c >> 11) & 0xff, s->file);
+- if (((s->c >> 11) & 0xff) == MARKER_ESC)
+- s->byte_out(MARKER_STUFF, s->file);
+- }
+- }
+-
+- return;
+-}
+-
+-
+-void arith_encode(struct jbg_arenc_state *s, int cx, int pix)
+-{
+- register unsigned lsz, ss;
+- register unsigned char *st;
+- long temp;
[...5281 lines suppressed...]
-+ -e "s@\$${URLZJS}@$(URLZJS)@g" \
-+ -e "s@\$${URLHP}@$(URLHP)@g" \
-+ -e "s@\$${URLXQX}@$(URLXQX)@g" \
-+ -e "s@\$${URLLAVA}@$(URLLAVA)@g" \
-+ -e "s@\$${URLQPDL}@$(URLQPDL)@g" \
-+ -e "s@\$${URLSLX}@$(URLSLX)@g" \
-+ -e "s@\$${URLHC}@$(URLHC)@g" \
-+ -e "s@\$${PRODUCT}@$$PRODUCT@g" \
-+ -e "s/\$${MODindex}/$$MODindex $$TZ/" \
-+ -e "s/\$${MODtarball}/$$MODtarball $$TZ/"
-+ chmod -w $@
-+
-+web: test tar manual.pdf webindex
-+ ncftpput -m -f $(FTPSITE) foo2zjs \
-+ ChangeLog INSTALL manual.pdf foo2zjs.tar.gz;
-+
-+webt: tar manual.pdf webindex
-+ ncftpput -m -f $(FTPSITE) foo2zjs \
-+ ChangeLog INSTALL manual.pdf foo2zjs.tar.gz;
-+
-+webworld: web webpics
-+
-+webindex: INSTALL zjsindex oakindex hpindex xqxindex lavaindex \
-+ qpdlindex oakindex slxindex hcindex
-+
-+webpics: redhat suse ubuntu mandriva fedora
-+
-+webphotos:
-+ cd printer-photos; $(MAKE)
-+
-+zjsindex: foo2zjs.html archzjs.gif thermometer.gif webphotos
-+ ln -sf foo2zjs.html index.html
-+ ncftpput -m -f $(FTPSITE) foo2zjs \
-+ index.html style.css archzjs.gif thermometer.gif \
-+ flags.png INSTALL INSTALL.osx zjsfavicon.png \
-+ printer-photos/printers.jpg;
-+
-+oakindex: foo2oak.html archoak.gif thermometer.gif webphotos
-+ ln -sf foo2oak.html index.html
-+ ncftpput -m -f $(FTPSITE) foo2oak \
-+ index.html style.css archoak.gif thermometer.gif \
-+ flags.png INSTALL \
-+ printer-photos/printers.jpg;
-+
-+hpindex: foo2hp.html archhp.gif thermometer.gif webphotos
-+ ln -sf foo2hp.html index.html
-+ ncftpput -m -f $(FTPSITE) foo2hp \
-+ index.html style.css archhp.gif thermometer.gif \
-+ flags.png INSTALL hpfavicon.png \
-+ printer-photos/printers.jpg;
-+
-+xqxindex: foo2xqx.html archxqx.gif thermometer.gif webphotos
-+ ln -sf foo2xqx.html index.html
-+ ncftpput -m -f $(FTPSITE) foo2xqx \
-+ index.html style.css archxqx.gif thermometer.gif \
-+ flags.png INSTALL xqxfavicon.png \
-+ printer-photos/printers.jpg;
-+
-+lavaindex: foo2lava.html archlava.gif thermometer.gif webphotos
-+ ln -sf foo2lava.html index.html
-+ ncftpput -m -f $(FTPSITE) foo2lava \
-+ index.html style.css archlava.gif thermometer.gif \
-+ flags.png INSTALL lavafavicon.png \
-+ printer-photos/printers.jpg;
-+
-+qpdlindex: foo2qpdl.html archqpdl.gif thermometer.gif webphotos
-+ ln -sf foo2qpdl.html index.html
-+ ncftpput -m -f $(FTPSITE) foo2qpdl \
-+ index.html style.css archqpdl.gif thermometer.gif \
-+ flags.png INSTALL qpdlfavicon.png \
-+ printer-photos/printers.jpg;
-+
-+slxindex: foo2slx.html archslx.gif thermometer.gif webphotos
-+ ln -sf foo2slx.html index.html
-+ ncftpput -m -f $(FTPSITE) foo2slx \
-+ index.html style.css archslx.gif thermometer.gif \
-+ flags.png INSTALL slxfavicon.png \
-+ printer-photos/printers.jpg;
-+
-+hcindex: foo2hiperc.html archhiperc.gif thermometer.gif webphotos
-+ ln -sf foo2hiperc.html index.html
-+ ncftpput -m -f $(FTPSITE) foo2hiperc \
-+ index.html style.css archhiperc.gif thermometer.gif \
-+ flags.png INSTALL hipercfavicon.png \
-+ printer-photos/printers.jpg;
-+
-+foo2zjs.html: warning.html contribute.html resources.html unsupported.html
-+foo2hp.html: warning.html contribute.html resources.html unsupported.html
-+foo2xqx.html: warning.html contribute.html resources.html unsupported.html
-+foo2lava.html: warning.html contribute.html resources.html unsupported.html
-+foo2qpdl.html: warning.html contribute.html resources.html unsupported.html
-+foo2slx.html: warning.html contribute.html resources.html unsupported.html
-+foo2hiperc.html: warning.html contribute.html resources.html unsupported.html
-+foo2oak.html: warning.html contribute.html resources.html unsupported.html
-+
-+# RedHat
-+redhat: FRC
-+ cd redhat; $(MAKE) web FTPSITE=$(FTPSITE)
-+
-+# Fedora Core 6+
-+fedora: FRC
-+ cd fedora; $(MAKE) web FTPSITE=$(FTPSITE)
-+
-+suse: FRC
-+ cd suse; $(MAKE) web FTPSITE=$(FTPSITE)
-+
-+ubuntu: FRC
-+ cd ubuntu; $(MAKE) web FTPSITE=$(FTPSITE)
-+
-+mandriva: FRC
-+ cd mandriva; $(MAKE) web FTPSITE=$(FTPSITE)
-+
-+#
-+# Extra files from web
-+#
-+webextra: webicm webfw
-+
-+webicm: \
-+ icm/dl2300.tar.gz \
-+ icm/km2430.tar.gz icm/hpclj2600n.tar.gz \
-+ icm/hp1215.tar.gz icm/km2530.tar.gz \
-+ icm/km-1600.tar.gz \
-+ icm/samclp300.tar.gz icm/samclp315.tar.gz \
-+ icm/lexc500.tar.gz \
-+ icm/okic3200.tar.gz icm/okic3400.tar.gz icm/okic5600.tar.gz
-+ ncftpput -m -f $(FTPSITE) foo2zjs/icm icm/dl2300.tar.gz;
-+ ncftpput -m -f $(FTPSITE) foo2zjs/icm icm/km2430.tar.gz;
-+ ncftpput -m -f $(FTPSITE) foo2hp/icm icm/hpclj2600n.tar.gz;
-+ ncftpput -m -f $(FTPSITE) foo2hp/icm icm/hp1215.tar.gz;
-+ ncftpput -m -f $(FTPSITE) foo2lava/icm icm/km2530.tar.gz;
-+ ncftpput -m -f $(FTPSITE) foo2lava/icm icm/km-1600.tar.gz;
-+ ncftpput -m -f $(FTPSITE) foo2qpdl/icm icm/samclp300.tar.gz;
-+ ncftpput -m -f $(FTPSITE) foo2qpdl/icm icm/samclp315.tar.gz;
-+ ncftpput -m -f $(FTPSITE) foo2slx/icm icm/lexc500.tar.gz;
-+ ncftpput -m -f $(FTPSITE) foo2hiperc/icm icm/okic3200.tar.gz;
-+ ncftpput -m -f $(FTPSITE) foo2hiperc/icm icm/okic3400.tar.gz;
-+ ncftpput -m -f $(FTPSITE) foo2hiperc/icm icm/okic5600.tar.gz;
-+
-+icm/dl2300.tar.gz: FRC
-+ cd icm; tar -c -z -f ../$@ CP*.icm DL*.icm
-+icm/km2430.tar.gz: FRC
-+ cd icm; tar -c -z -f ../$@ km2430*.icm
-+icm/hpclj2600n.tar.gz: FRC
-+ cd icm; tar -c -z -f ../$@ hpclj2600*.icm
-+icm/hp1215.tar.gz: FRC
-+ cd icm; tar -c -z -f ../$@ hp1215*.icm
-+icm/km2530.tar.gz: FRC
-+ cd icm; tar -c -z -f ../$@ km2530*.icm
-+icm/km-1600.tar.gz: FRC
-+ cd icm; tar -c -z -f ../$@ km-1600*.icm
-+icm/samclp300.tar.gz: FRC
-+ cd icm; tar -c -z -f ../$@ samclp300*.icm
-+icm/samclp315.tar.gz: FRC
-+ cd icm; tar -c -z -f ../$@ samclp315*.icm
-+icm/lexc500.tar.gz: FRC
-+ cd icm; tar -c -z -f ../$@ lexR*.icm
-+icm/okic3200.tar.gz: FRC
-+ cd icm; tar -c -z -f ../$@ OK32*.icm
-+icm/okic3400.tar.gz: FRC
-+ cd icm; tar -c -z -f ../$@ C3400*.icm
-+icm/okic5600.tar.gz: FRC
-+ cd icm; tar -c -z -f ../$@ OK56*.icm
-+
-+webfw: firmware/sihp1000.tar.gz \
-+ firmware/sihp1005.tar.gz \
-+ firmware/sihp1018.tar.gz \
-+ firmware/sihp1020.tar.gz \
-+ firmware/sihpP1005.tar.gz \
-+ firmware/sihpP1006.tar.gz \
-+ firmware/sihpP1505.tar.gz \
-+ $(NULL)
-+ ncftpput -m -f $(FTPSITE) foo2zjs/firmware firmware/*.tar.gz;
-+
-+firmware/sihp1000.tar.gz: FRC
-+ cd firmware; tar -c -z -f ../$@ sihp1000.img
-+firmware/sihp1005.tar.gz: FRC
-+ cd firmware; tar -c -z -f ../$@ sihp1005.img
-+firmware/sihp1018.tar.gz: FRC
-+ cd firmware; tar -c -z -f ../$@ sihp1018.img
-+firmware/sihp1020.tar.gz: FRC
-+ cd firmware; tar -c -z -f ../$@ sihp1020.img
-+firmware/sihpP1005.tar.gz: FRC
-+ cd firmware; tar -c -z -f ../$@ sihpP1005.img
-+firmware/sihpP1006.tar.gz: FRC
-+ cd firmware; tar -c -z -f ../$@ sihpP1006.img
-+firmware/sihpP1505.tar.gz: FRC
-+ cd firmware; tar -c -z -f ../$@ sihpP1505.img
-+
-+FRC:
-+
-+#
-+# Misc
-+#
-+misc: pksm2bitcmyk phorum-logo.gif
-+
-+pksm2bitcmyk: pksm2bitcmyk.c
-+ $(CC) $(CFLAGS) pksm2bitcmyk.c -lnetpbm -o $@
-+
-+phorum-logo.gif: archhp.fig
-+ fig2dev -L gif -m.25 archhp.fig | giftrans -t "#ffffff" -o $@
Index: foo2zjs.spec
===================================================================
RCS file: /cvs/free/rpms/foo2zjs/F-13/foo2zjs.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- foo2zjs.spec 19 Apr 2010 11:59:44 -0000 1.8
+++ foo2zjs.spec 3 Nov 2010 17:18:31 -0000 1.9
@@ -1,4 +1,4 @@
-%define foo2zjs_ver 20100413
+%define foo2zjs_ver 20101016
Name: foo2zjs
Version: 0.%{foo2zjs_ver}
@@ -6,7 +6,7 @@
Summary: Linux printer driver for ZjStream protocol
Group: System Environment/Libraries
-License: GPL
+License: GPLv2
URL: http://foo2zjs.rkkda.com/
Source0: foo2zjs-%{foo2zjs_ver}.tar.gz
@@ -15,6 +15,7 @@
BuildRequires: jbigkit-devel groff ghostscript
Requires: lcms
+Requires: argyllcms
Requires(post): /bin/rm
%package -n foo2hp
@@ -186,11 +187,24 @@
%prep
%setup -q -n foo2zjs
+
+# Patch to use jbigkit-devel package instead of static jbig source code
%patch0 -p1
+
+# Remove jbig source code, jbigkit-devel package is used in BuildRequires
+#rm -f jbig*
+
sed -i -e s/foo2zjs-icc2ps/icc2ps/g *wrapper*
sed -i -e s/775/755/ Makefile
chmod -x COPYING
+# Xerox-Phaser_6110 not needed files because already in foomatic-db package
+rm foomatic-db/printer/Xerox-Phaser_6110.xml
+rm PPD/Xerox-Phaser_6110.ppd
+
+# Samsung CLP-310 already included in foomatic-db package
+rm foomatic-db/printer/Samsung-CLP-310.xml
+
%build
make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"
@@ -211,8 +225,6 @@
# Remove man page for usb_printerid which we don't ship
rm -f $RPM_BUILD_ROOT%{_mandir}/man1/usb_printerid.1
-rm -f $RPM_BUILD_ROOT%{_mandir}/man1/printer-profile.1
-rm -f $RPM_BUILD_ROOT%{_bindir}/printer-profile
%clean
@@ -222,9 +234,14 @@
%files
%defattr(-,root,root,-)
%{_bindir}/*zjs*
+%{_bindir}/printer-profile
%{_datadir}/foo2zjs
%{_mandir}/man1/*zjs*
+%{_mandir}/man1/printer-profile.1.gz
+%{_mandir}/man1/gipddecode.1.gz
%{_datadir}/foomatic/db/source/driver/foo2zjs.xml
+%{_datadir}/foomatic/db/source/driver/foo2zjs-z1.xml
+%{_datadir}/foomatic/db/source/driver/foo2zjs-z2.xml
%{_datadir}/foomatic/db/source/opt/foo2zjs*.xml
%{_datadir}/foomatic/db/source/opt/foo2xxx*.xml
%{_datadir}/foomatic/db/source/printer/Generic-ZjStream_Printer.xml
@@ -241,6 +258,7 @@
%{_datadir}/cups/model/Minolta-magicolor_2430_DL.ppd.gz
%files -n foo2hp
+%defattr(-,root,root,-)
%{_bindir}/*hp*
%{_mandir}/man1/*hp*
%{_datadir}/foomatic/db/source/driver/foo2hp.xml
@@ -253,6 +271,7 @@
%{_datadir}/cups/model/HP-Color_LaserJet_2600n.ppd.gz
%files -n foo2xqx
+%defattr(-,root,root,-)
%{_bindir}/*xqx*
%{_mandir}/man1/*xqx*
%{_datadir}/foomatic/db/source/driver/foo2xqx.xml
@@ -263,35 +282,45 @@
%{_datadir}/cups/model/HP-LaserJet_P*.ppd.gz
%files -n foo2lava
+%defattr(-,root,root,-)
%{_bindir}/*lava*
%{_bindir}/opldecode
%{_mandir}/man1/*lava*
%{_mandir}/man1/opldecode.1.gz
%{_datadir}/foomatic/db/source/driver/foo2lava.xml
%{_datadir}/foomatic/db/source/opt/foo2lava*.xml
-%{_datadir}/foomatic/db/source/printer/KONICA_MINOLTA-magicolor_16*.xml
%{_datadir}/foomatic/db/source/printer/KONICA_MINOLTA-magicolor_2480_MF.xml
%{_datadir}/foomatic/db/source/printer/KONICA_MINOLTA-magicolor_2490_MF.xml
%{_datadir}/foomatic/db/source/printer/KONICA_MINOLTA-magicolor_2530_DL.xml
+%{_datadir}/foomatic/db/source/printer/KONICA_MINOLTA-magicolor_1600W.xml
+%{_datadir}/foomatic/db/source/printer/KONICA_MINOLTA-magicolor_1680MF.xml
+%{_datadir}/foomatic/db/source/printer/KONICA_MINOLTA-magicolor_1690MF.xml
%{_datadir}/foomatic/db/source/printer/KONICA_MINOLTA-magicolor_4690MF.xml
-%{_datadir}/cups/model/KONICA_MINOLTA-magicolor_16*.ppd.gz
+%{_datadir}/foomatic/db/source/printer/Xerox-Phaser_6121MFP.xml
%{_datadir}/cups/model/KONICA_MINOLTA-magicolor_2480_MF.ppd.gz
%{_datadir}/cups/model/KONICA_MINOLTA-magicolor_2490_MF.ppd.gz
%{_datadir}/cups/model/KONICA_MINOLTA-magicolor_2530_DL.ppd.gz
+%{_datadir}/cups/model/KONICA_MINOLTA-magicolor_1600W.ppd.gz
+%{_datadir}/cups/model/KONICA_MINOLTA-magicolor_1680MF.ppd.gz
+%{_datadir}/cups/model/KONICA_MINOLTA-magicolor_1690MF.ppd.gz
%{_datadir}/cups/model/KONICA_MINOLTA-magicolor_4690MF.ppd.gz
+%{_datadir}/cups/model/Xerox-Phaser_6121MFP.ppd.gz
+
%files -n foo2qpdl
+%defattr(-,root,root,-)
%{_bindir}/*qpdl*
%{_mandir}/man1/*qpdl*
%{_datadir}/foomatic/db/source/driver/foo2qpdl.xml
%{_datadir}/foomatic/db/source/opt/foo2qpdl*.xml
%{_datadir}/foomatic/db/source/printer/Samsung-CL*.xml
-%{_datadir}/foomatic/db/source/printer/Xerox-Phaser_611*.xml
+%{_datadir}/foomatic/db/source/printer/Xerox-Phaser_6115MFP.xml
%{_datadir}/cups/model/Samsung-CL*.ppd.gz
-%{_datadir}/cups/model/Xerox-Phaser_611*.ppd.gz
+%{_datadir}/cups/model/Xerox-Phaser_6115MFP.ppd.gz
%{_datadir}/foo2qpdl/crd/
%files -n foo2slx
+%defattr(-,root,root,-)
%{_bindir}/*slx*
%{_bindir}/gipddecode
%{_mandir}/man1/*slx*
@@ -301,6 +330,7 @@
%{_datadir}/cups/model/Lexmark-C500.ppd.gz
%files -n foo2hiperc
+%defattr(-,root,root,-)
%{_bindir}/*hiperc*
%{_mandir}/man1/*hiperc*
%{_datadir}/foomatic/db/source/driver/foo2hiperc.xml
@@ -309,6 +339,7 @@
%{_datadir}/cups/model/Oki-C*.ppd.gz
%files -n foo2oak
+%defattr(-,root,root,-)
%{_bindir}/*oak*
%{_mandir}/man1/*oak*.1.gz
%{_datadir}/foomatic/db/source/opt/foo2oak*
@@ -350,11 +381,33 @@
/bin/rm -f /var/cache/foomatic/*
%changelog
-* Mon Apr 19 2010 David Woodhouse <dwmw2(a)infradead.org> 0.20100413-1
-- Update to 20100413
-
-* Sun Nov 08 2009 David Woodhouse <dwmw2(a)infradead.org> 0.20091106-1
-- Update to 20091106
+* Sat Oct 23 2010 Cedric Olivier <cedric.olivier(a)free.fr> 0.20101016-1
+- Update to last release
+- Remove Samsung-CLP-310.xml which conflict with foomatic-db package
+
+* Wed Sep 17 2010 Cedric Olivier <cedric.olivier(a)free.fr> 0.20100817-1
+- New foo2lava printer: Xerox Phaser 6121MFP (printer only)
+- Added manual page for foo2zjs-icc2ps
+
+* Thu Jul 22 2010 Cedric Olivier <cedric.olivier(a)free.fr> 0.20100722-1
+- New Printer: Oki C110
+- Change PPD's for Konica Minolta mc1600W, mc1680MF, mc1690MF, mc2490 MF, mc2530 DL, mc4690MF,
+and Oki C110 if cups-devel is installed.
+- Used for reporting marker (toner) levels via PJL on foo2lava printers.
+
+* Thu May 11 2010 Cedric Olivier <cedric.olivier(a)free.fr> 0.20100506-2
+- add foo2zjs-dynamic-jbig patch to use jbigkit-devel package instead of static jbig source code
+
+* Fri May 07 2010 Cedric Olivier <cedric.olivier(a)free.fr> 0.20100506-1
+- Update to 20100506
+- New Printers: Oki C5650
+- New Printers: HP LaserJet Pro P1102, P1102w
+- New Printers: HP LaserJet Pro P1566
+- New Printers: HP LaserJet Pro P1606dn
+
+* Wed Mar 10 2010 Cedric Olivier <cedric.olivier(a)free.fr> 0.20100307-1
+- Update to 20100307
+- BugFix and adding new printers supports
* Sat Apr 25 2009 Lubomir Rintel <lkundrak(a)v3.sk> 0.20080826-3
- Add proper scriptlet requires
Index: sources
===================================================================
RCS file: /cvs/free/rpms/foo2zjs/F-13/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 19 Apr 2010 11:59:44 -0000 1.6
+++ sources 3 Nov 2010 17:18:32 -0000 1.7
@@ -1 +1 @@
-c6de65768824d84f01a0fe116014db68 foo2zjs-20100413.tar.gz
+00907246dab06daa16a4cab29c4d6ddd foo2zjs-20101016.tar.gz
13 years, 10 months
rpms/xorg-x11-drv-nvidia-96xx/devel blacklist-nouveau.conf, 1.4, 1.5 filter-provides.sh, 1.2, 1.3 filter-requires.sh, 1.4, 1.5 nvidia-96xx-README.Fedora, 1.4, 1.5 nvidia-96xx-config-display, 1.4, 1.5 nvidia-96xx-init, 1.4, 1.5 sources, 1.6, 1.7 xorg-x11-drv-nvidia-96xx.spec, 1.18, 1.19 .cvsignore, 1.5, 1.6 dead.package, 1.1, NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia-96xx/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv19735/devel
Modified Files:
.cvsignore
Added Files:
blacklist-nouveau.conf filter-provides.sh filter-requires.sh
nvidia-96xx-README.Fedora nvidia-96xx-config-display
nvidia-96xx-init sources xorg-x11-drv-nvidia-96xx.spec
Removed Files:
dead.package
Log Message:
Re-import
Index: blacklist-nouveau.conf
===================================================================
RCS file: blacklist-nouveau.conf
diff -N blacklist-nouveau.conf
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ blacklist-nouveau.conf 3 Nov 2010 16:09:27 -0000 1.5
@@ -0,0 +1,4 @@
+# RPM Fusion blacklist for nouveau driver - you need to run as root:
+# dracut -f /boot/initramfs-$(uname -r).img $(uname -r)
+# if nouveau is loaded despite this file.
+blacklist nouveau
Index: filter-provides.sh
===================================================================
RCS file: filter-provides.sh
diff -N filter-provides.sh
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ filter-provides.sh 3 Nov 2010 16:09:27 -0000 1.3
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+if [ -x /usr/lib/rpm/redhat/find-provides ]; then
+ FINDPROV=/usr/lib/rpm/redhat/find-provides
+else
+ FINDPROV=/usr/lib/rpm/find-provides
+fi
+
+$FINDPROV $* | sed -e '/libnvidia-tls.so/d' | sed -e '/libGLcore.so/d' | sed -e '/libGL.so/d'
+
Index: filter-requires.sh
===================================================================
RCS file: filter-requires.sh
diff -N filter-requires.sh
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ filter-requires.sh 3 Nov 2010 16:09:27 -0000 1.5
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+if [ -x /usr/lib/rpm/redhat/find-requires ]; then
+ FINDREQ=/usr/lib/rpm/redhat/find-requires
+else
+ FINDREQ=/usr/lib/rpm/find-requires
+fi
+
+$FINDREQ $* | sed -e '/libnvidia-tls.so/d' | sed -e '/libGLcore.so/d' | sed -e '/libGL.so/d'
+
Index: nvidia-96xx-README.Fedora
===================================================================
RCS file: nvidia-96xx-README.Fedora
diff -N nvidia-96xx-README.Fedora
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ nvidia-96xx-README.Fedora 3 Nov 2010 16:09:27 -0000 1.5
@@ -0,0 +1,112 @@
+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.
Index: nvidia-96xx-config-display
===================================================================
RCS file: nvidia-96xx-config-display
diff -N nvidia-96xx-config-display
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ nvidia-96xx-config-display 3 Nov 2010 16:09:27 -0000 1.5
@@ -0,0 +1,146 @@
+#!/usr/bin/python -tt
+# -*- coding: UTF-8 -*-
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 only
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Library General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# Copyright 2003, 2004 Peter Backlund
+# Copyright 2004 Thorsten Leemhuis
+# Copyright 2006 Van Assche Alphonse
+# Copyright 2006, 2007 Stewart Adam
+
+import string
+import os
+import sys
+
+from livnaConfigDisplay.const import *
+from livnaConfigDisplay.const import _
+
+import livnaConfigDisplay.ConfigDisplay
+from livnaConfigDisplay.GlxConfig import *
+from livnaConfigDisplay import Utils
+from livnaConfigDisplay.ConfigFile import ConfigFile
+
+class nvidiaConfigDisplay(GlxConfig):
+ def __init__(self):
+ GlxConfig.__init__(self)
+ self.vendor = 'nvidia-96xx'
+ self.majorVendor = Utils.getMajorVendor()
+ if self.vendor != Utils.getVendor():
+ print _('The initscript and installed driver vendors do not match!')
+ sys.exit(1)
+ self.ldconf = LD_CONF_FILE % (self.vendor)
+ try:
+ self.doAllBackups()
+ except livnaConfigDisplayError, (bkupErrMsg):
+ print bkupErrMsg
+ sys.exit(1)
+ self.xconfig, self.xconfigpath = self.loadXconfig()
+ self.config = ConfigFile(STATUS_FILE)
+ self.TOP_MOD_DIR = self.getModTopDir()
+
+ # finally, run arg checks.
+ self.run()
+
+
+ def enable(self, isAutoConfigure = True):
+ # Backup the file before make any change.
+ currentDriver = self.getDriver()
+ # Already enabled?
+ if currentDriver == self.majorVendor:
+ print _('Driver already enabled.')
+ return
+ # nVidia modules
+ self.addModulePath("/extensions/nvidia", self.TOP_MOD_DIR)
+ # 'remembering' magic's in here.
+ self.config.setOldDriver(currentDriver)
+ #currentDriver = self.config.getOldDriver()
+ self.toggleDriver(currentDriver, self.majorVendor)
+ # Disable dri and GLcore modules - these are no
+ self.removeModule("dri")
+ self.removeModule("GLcore")
+ # Add glx/dbe/extmod modules when modules section exists
+ if self.xconfig.modules:
+ for module in ["glx", "dbe", "extmod"]:
+ if self.onlyHasModule(module):
+ self.removeModule(module)
+ break
+ else:
+ self.addModule(module)
+ # Problems with Compiz without these.
+ self.addOption(self.majorVendor,"AddARGBGLXVisuals", "True")
+ #self.addOption(self.majorVendor,"DisableGLXRootClipping", "True")
+ Utils.writeXorgConf(self.xconfig, self.xconfigpath)
+ # We have to read saved status file to restore the Xorg configuration.
+ self.restoreconf()
+
+
+ def disable(self, isAutoConfigure = True):
+ self.removeModulePath("/extensions/nvidia", self.TOP_MOD_DIR)
+ # Check if it's already disabled
+ if self.getDriver() != self.majorVendor:
+ print _('Driver already disabled.')
+ return
+ # Backup the file before make any change.
+ prevDriver = self.config.getOldDriver()
+ if prevDriver == self.majorVendor:
+ print _('Will not allow reverting from driver \'%s\' to \'%s\'.') % (self.vendor, self.vendor)
+ print _('Using the \'nouveau\' driver instead.')
+ prevDriver = "nouveau"
+ self.config.setOldDriver("nouveau")
+ self.removeOption(self.majorVendor,"AddARGBGLXVisuals")
+ self.removeOption(self.majorVendor,"DisableGLXRootClipping")
+ self.toggleDriver(self.majorVendor, prevDriver)
+ Utils.writeXorgConf(self.xconfig, self.xconfigpath)
+ # We have to save the status file so it can be restored later
+ self.storeconf()
+ # And return to the Fedora default.
+ self.enableAiglx()
+
+ def printUsage(self):
+ print _("Usage: ") + self.vendor + _("-config-display [ enable|disable ]")
+
+ def run(self):
+ # Check number of arguments
+ # arg = action
+ if len(sys.argv) == 2:
+ arg = sys.argv[1]
+ else:
+ print _('Wrong number of arguments')
+ self.printUsage()
+ sys.exit(1)
+ # Check value of argument
+ if arg.lower() != "enable" and arg.lower() != "disable":
+ print _('Invalid command: %s') % arg.lower()
+ self.printUsage()
+ sys.exit(1)
+ try:
+ if arg == "enable":
+ if self.getActive():
+ self.enable()
+ else:
+ print _('livna-config-display\'s `active\' state is False - Exiting')
+ elif arg == "disable":
+ if self.getActive():
+ self.disable()
+ except:
+ raise # Uncomment me to show the real error
+ print MSG_CONF_APPLY_ERROR
+ try:
+ self.doAllRestores()
+ sys.exit(1)
+ except livnaConfigDisplayError, (bkupErrMsg):
+ #raise # Uncomment me to show the real error
+ print MSG_CONF_RESTORE_ERROR + '\n' + MSG_TRACEBACK % (str(errMsg)) + '\n\n' + str(bkupErrMsg)
+ sys.exit(1)
+
+app = nvidiaConfigDisplay()
Index: nvidia-96xx-init
===================================================================
RCS file: nvidia-96xx-init
diff -N nvidia-96xx-init
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ nvidia-96xx-init 3 Nov 2010 16:09:27 -0000 1.5
@@ -0,0 +1,120 @@
+#!/bin/sh
+#
+# chkconfig: 2345 8 92
+# description: This script will check if a nvidia 96xx kernel module is\
+# present for the running kernel and modify the xorg.conf to \
+# the appropriate configuration.
+
+# Source function library.
+. /etc/rc.d/init.d/functions
+
+name='nvidia-96xx'
+exec="/usr/sbin/$name-config-display"
+prog="`basename $exec`"
+lockfile="/var/lock/subsys/$name"
+
+RETVAL=0
+modname="nvidia.ko"
+modpath="/lib/modules/$(uname -r)"
+# Default to no module
+module="noneWithSomeCrazyNameSoItsNeverFound"
+# If one exists, then use it.
+if test -e "${modpath}/extra/${modname}";then
+ module="${modpath}/extra/${modname}"
+elif test -e "${modpath}/extra/nvidia/${modname}";then
+ module="${modpath}/extra/nvidia/${modname}"
+elif test -e "${modpath}/kernel/drivers/video/nvidia/${modname}";then
+ module="${modpath}/kernel/drivers/video/nvidia/${modname}"
+elif test -e "${modpath}/extra/nvidia-96xx/${modname}";then
+ module="${modpath}/extra/nvidia-96xx/${modname}"
+elif test -e "${modpath}/kernel/drivers/video/nvidia-96xx/${modname}";then
+ module="${modpath}/kernel/drivers/video/nvidia-96xx/${modname}"
+fi
+
+# Try to modify the below the least possible. If you need to change something, try
+# using the variables above first, as most of the program control is based on
+# the variables above. If something really needs to be changed, try to make
+# the change in all the drivers for the sake of consistency.
+
+# We shouldn't use lock files anymore because the lock file
+# doesn't mean a driver is disabled or enabled. For example, we start()
+# at boot and enable the driver. start() makes a lock file. We stop() on
+# shutdown, which removes the lock file. But what if the user ran *config-display
+# manually? Or if we don't `*config-display disable` in stop()?
+
+start() {
+ if action $"Checking for module $modname:" test -f $module;then
+ action $"Enabling the $name driver:" $exec enable
+ RETVAL=$?
+ else
+ echo -en $"$modname for kernel $(uname -r) was not found." && echo_warning;echo -en '\n'
+ echo -en $"The $name driver will not be enabled until one is found." && echo_warning;echo -en '\n'
+ $exec disable
+ RETVAL=1
+ fi
+ if [ "$RETVAL" -eq "0" ];then
+ #touch $lockfile
+ # this is a nothing assignment so that bash doesn't complain.
+ RETVAL=0
+ else
+ # Let them read the errors or warnings
+ sleep 3
+ fi
+ return
+}
+
+stop() {
+ #action $"Disabling the $name driver:" $exec disable
+ #RETVAL=$?
+ RETVAL=0
+ #if [ "$RETVAL" -eq 0 ];then
+ # rm -f $lockfile
+ #fi
+ return
+}
+
+restart() {
+ stop
+ start
+}
+
+reload() {
+ restart
+}
+
+status() {
+ #if [ -e $lockfile ];then
+ if [ -f $module ] && lsmod | grep ^${modname%%.ko} &>/dev/null ;then
+ echo $"$modname for kernel $(uname -r) was found."
+ echo $"The driver is enabled."
+ else
+ echo $"$modname for kernel $(uname -r) was not found."
+ echo $"The $name driver cannot be enabled until one is found."
+ fi
+ #else
+ # echo $"The $name driver has not been enabled."
+ #fi
+ RETVAL=0
+}
+
+fdrstatus() {
+ status $prog
+}
+
+case "$1" in
+ start|stop|restart|reload)
+ $1
+ ;;
+ status)
+ fdrstatus
+ ;;
+ condrestart)
+ restart
+ ;;
+ *)
+ echo $"Usage: $0 {start|stop|status|restart|condrestart|reload}"
+ exit 1
+ ;;
+esac
+
+exit $RETVAL
Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ sources 3 Nov 2010 16:09:27 -0000 1.7
@@ -0,0 +1,2 @@
+53e98129d885a1b004aabc42a989fa73 NVIDIA-Linux-x86-96.43.19-pkg0.run
+7ff779e299b938b880baff6cd970ab51 NVIDIA-Linux-x86_64-96.43.19-pkg0.run
Index: xorg-x11-drv-nvidia-96xx.spec
===================================================================
RCS file: xorg-x11-drv-nvidia-96xx.spec
diff -N xorg-x11-drv-nvidia-96xx.spec
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ xorg-x11-drv-nvidia-96xx.spec 3 Nov 2010 16:09:27 -0000 1.19
@@ -0,0 +1,865 @@
+%define nvidialibdir %{_libdir}/nvidia
+
+# Tweak to have debuginfo - part 1/2
+%if 0%{?fedora} >= 7
+%define __debug_install_post %{_builddir}/%{?buildsubdir}/find-debuginfo.sh %{_builddir}/%{?buildsubdir}\
+%{nil}
+%endif
+
+Name: xorg-x11-drv-nvidia-96xx
+Version: 96.43.19
+Release: 1%{?dist}
+Summary: NVIDIA's 96xx series proprietary display driver for NVIDIA graphic cards
+
+Group: User Interface/X Hardware Support
+License: Redistributable, no modification permitted
+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
+Source6: blacklist-nouveau.conf
+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.
+Source92: filter-provides.sh
+%define _use_internal_dependency_generator 0
+%define __find_requires %{SOURCE91}
+%define __find_provides %{SOURCE92}
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%if 0%{?fedora} > 11 || 0%{?rhel} > 5
+ExclusiveArch: i686 x86_64
+%else 0%{?fedora} == 11
+ExclusiveArch: i586 x86_64
+%else
+ExclusiveArch: i386 x86_64
+%endif
+Requires: nvidia-xconfig
+Requires: nvidia-settings
+
+Requires: nvidia-96xx-kmod >= %{version}
+Requires(post): nvidia-96xx-kmod >= %{version}
+
+# Needed in all nvidia or fglrx driver packages
+BuildRequires: prelink
+Requires: which
+Requires: livna-config-display
+Requires: %{name}-libs-%{_target_cpu} = %{version}-%{release}
+
+Requires(post): livna-config-display
+Requires(preun): livna-config-display
+Requires(post): chkconfig
+Requires(post): ldconfig
+Requires(preun): chkconfig
+
+Provides: nvidia-96xx-kmod-common = %{version}
+
+Conflicts: xorg-x11-drv-nvidia-legacy
+Conflicts: xorg-x11-drv-nvidia-beta
+Conflicts: xorg-x11-drv-nvidia-newest
+Conflicts: xorg-x11-drv-nvidia-173xx
+Conflicts: xorg-x11-drv-nvidia-71xx
+Conflicts: xorg-x11-drv-nvidia
+Conflicts: xorg-x11-drv-fglrx
+
+Obsoletes: nvidia-96xx-kmod < %{version}
+
+Obsoletes: nvidia-x11-drv-96xx < %{version}-%{release}
+Provides: nvidia-x11-drv-96xx = %{version}-%{release}
+
+%description
+This package provides the legacy NVIDIA display driver of the 96xx serie
+which allows for hardware accelerated rendering with NVIDIA chipsets
+Legacy releases for GeForce 2 through GeForce 4 series GPUs.
+GeForce 8 and above are NOT supported by this release.
+
+For the full product support list, please consult the release notes
+for driver version %{version}.
+
+
+%package devel
+Summary: Development files for %{name}
+Group: Development/Libraries
+Requires: %{name}-libs-%{_target_cpu} = %{version}-%{release}
+
+%description devel
+This package provides the development files of the %{name} package,
+such as OpenGL headers.
+
+%package libs
+Summary: Libraries for %{name}
+Group: User Interface/X Hardware Support
+Requires: %{name} = %{version}-%{release}
+Provides: %{name}-libs-%{_target_cpu} = %{version}-%{release}
+%ifarch %{ix86}
+Provides: %{name}-libs-32bit = %{version}-%{release}
+Obsoletes: %{name}-libs-32bit <= %{version}-%{release}
+%endif
+
+%description libs
+This package provides the shared libraries for %{name}.
+
+
+%prep
+%setup -q -c -T
+sh %{SOURCE0} --extract-only --target nvidiapkg-x86
+sh %{SOURCE1} --extract-only --target nvidiapkg-x64
+tar -cjf nvidia-kmod-data-%{version}.tar.bz2 nvidiapkg-*/LICENSE nvidiapkg-*/usr/src/
+
+# Tweak to have debuginfo - part 2/2
+%if 0%{?fedora} >= 7
+cp -p %{_prefix}/lib/rpm/find-debuginfo.sh .
+sed -i -e 's|strict=true|strict=false|' find-debuginfo.sh
+%endif
+
+%ifarch %{ix86}
+ln -s nvidiapkg-x86 nvidiapkg
+%else
+ln -s nvidiapkg-x64 nvidiapkg
+%endif
+mv nvidiapkg/LICENSE nvidiapkg/usr/share/doc/
+# More docs
+cp %{SOURCE11} nvidiapkg/usr/share/doc/README.Fedora
+find nvidiapkg/usr/share/doc/ -type f | xargs chmod 0644
+
+
+%build
+# Nothing to build
+echo "Nothing to build"
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+set +x
+for file in $(cd nvidiapkg &> /dev/null; find . -type f | grep -v -e 'makeself.sh$' -e 'mkprecompiled$' -e 'tls_test$' -e 'tls_test_dso.so$' -e 'nvidia-settings.desktop$' -e '^./Makefile' -e '^./nvidia-installer' -e '^./pkg-history.txt' -e '^./.manifest' -e '/usr/share/doc/' -e 'libGL.la$' -e 'drivers/nvidia_drv.o$' -e 'nvidia-installer.1.gz$' -e '^./usr/src/')
+do
+ if [[ ! "/${file##./usr/lib/}" = "/${file}" ]]
+ then
+ install -D -p -m 0755 nvidiapkg/${file} $RPM_BUILD_ROOT/%{nvidialibdir}/${file##./usr/lib/}
+ elif [[ ! "/${file##./usr/X11R6/lib/modules/extensions}" = "/${file}" ]]
+ then
+ install -D -p -m 0755 nvidiapkg/${file} $RPM_BUILD_ROOT/%{_libdir}/xorg/modules/extensions/nvidia/${file##./usr/X11R6/lib/modules/extensions}
+ elif [[ ! "/${file##./usr/X11R6/lib/modules}" = "/${file}" ]]
+ then
+ install -D -p -m 0755 nvidiapkg/${file} $RPM_BUILD_ROOT/%{_libdir}/xorg/modules/${file##./usr/X11R6/lib/modules}
+ elif [[ ! "/${file##./usr/X11R6/lib/}" = "/${file}" ]]
+ then
+ install -D -p -m 0755 nvidiapkg/${file} $RPM_BUILD_ROOT/%{nvidialibdir}/${file##./usr/X11R6/lib/}
+ elif [[ ! "/${file##./usr/include/}" = "/${file}" ]]
+ then
+ install -D -p -m 0644 nvidiapkg/${file} $RPM_BUILD_ROOT/%{_includedir}/nvidia/${file##./usr/include/}
+ elif [[ ! "/${file##./usr/bin/}" = "/${file}" ]]
+ then
+ if [[ ! "/${file##./usr/bin/nvidia-xconfig}" = "/${file}" ]]
+ then
+ install -D -p -m 0755 nvidiapkg/${file} $RPM_BUILD_ROOT/usr/sbin/${file##./usr/bin/}
+ elif [[ ! "/${file##./usr/bin/nvidia-bug-report.sh}" = "/${file}" ]]
+ then
+ install -D -p -m 0755 nvidiapkg/${file} $RPM_BUILD_ROOT/usr/bin/${file##./usr/bin/}
+ else
+ install -D -p -m 0755 nvidiapkg/${file} $RPM_BUILD_ROOT/${file}
+ fi
+ elif [[ ! "/${file##./usr/share/man/}" = "/${file}" ]]
+ then
+ install -D -p -m 0644 nvidiapkg/${file} $RPM_BUILD_ROOT/%{_mandir}/${file##./usr/share/man/}
+ gunzip $RPM_BUILD_ROOT/%{_mandir}/${file##./usr/share/man/}
+ elif [[ ! "/${file##./usr/share/pixmaps/}" = "/${file}" ]]
+ then
+ install -D -p -m 0644 nvidiapkg/${file} $RPM_BUILD_ROOT/%{_datadir}/pixmaps/${file##./usr/share/pixmaps/}
+ else
+ echo ${file} found -- don\'t know how to handle
+ exit 1
+ fi
+done
+set -x
+
+# Change perms on static libs. Can't fathom how to do it nicely above.
+find $RPM_BUILD_ROOT/%{nvidialibdir} -type f -name "*.a" -exec chmod 0644 '{}' \;
+
+# Fixme: should we do this directly in above for-loop? Yes, we should! No, please don't!
+ln -s libGLcore.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libGLcore.so
+ln -s libGLcore.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libGLcore.so.1
+ln -s libGL.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libGL.so
+ln -s libGL.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libGL.so.1
+ln -s libnvidia-tls.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libnvidia-tls.so.1
+ln -s libnvidia-tls.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/tls/libnvidia-tls.so.1
+ln -s libnvidia-cfg.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libnvidia-cfg.so.1
+ln -s libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libXvMCNVIDIA.so
+ln -s libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libXvMCNVIDIA_dynamic.so.1
+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 initscript
+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/
+install -pm 0644 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/
+
+# ld.so.conf.d file
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
+echo "%{nvidialibdir}" > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia-96xx-%{_lib}.conf
+
+# Remove execstack needs on F-12 and laters
+%if 0
+find $RPM_BUILD_ROOT%{nvidialibdir} -name '*.so.*' -type f -exec execstack -c {} ';'
+execstack -c $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/nvidia/libglx.so.%{version}
+execstack -c $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/nvidia_drv.so
+%ifarch x86_64
+execstack -c $RPM_BUILD_ROOT%{_bindir}/nvidia-settings
+execstack -c $RPM_BUILD_ROOT%{_sbindir}/nvidia-xconfig
+%endif
+%endif
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%post
+if [ "$1" -eq "1" ]; then
+ # Enable nvidia driver when installing
+ %{_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 ||:
+ 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
+if [ -x /usr/sbin/setsebool ] ; then
+ SELINUXEXECSTACK=`cat /selinux/booleans/allow_execstack 2>/dev/null`
+ if [ "${SELINUXEXECSTACK}" == "0 0" ] ; then
+ /usr/sbin/setsebool -P allow_execstack on &>/dev/null
+ fi
+fi ||:
+
+%post libs -p /sbin/ldconfig
+
+%preun
+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 ||:
+fi ||:
+
+%postun libs -p /sbin/ldconfig
+
+%files
+%defattr(-,root,root,-)
+%doc nvidiapkg/usr/share/doc/*
+%config(noreplace) %{_sysconfdir}/modprobe.d/blacklist-nouveau.conf
+%{_initrddir}/nvidia-96xx
+%exclude %{_bindir}/nvidia-settings
+%exclude %{_sbindir}/nvidia-xconfig
+%{_bindir}/nvidia-bug-report.sh
+%{_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
+%{_libdir}/xorg/modules/extensions/nvidia/*.so*
+#/no_multilib
+%{_datadir}/pixmaps/*.png
+%exclude %{_mandir}/man1/nvidia-settings.*
+%exclude %{_mandir}/man1/nvidia-xconfig.*
+
+%files libs
+%defattr(-,root,root,-)
+%config %{_sysconfdir}/ld.so.conf.d/nvidia-96xx-%{_lib}.conf
+%dir %{nvidialibdir}
+%dir %{nvidialibdir}/tls
+%{nvidialibdir}/*.so.*
+%{nvidialibdir}/tls/*.so.*
+
+%files devel
+%defattr(-,root,root,-)
+%dir %{_includedir}/nvidia
+%dir %{_includedir}/nvidia/GL
+%{_includedir}/nvidia/GL/*.h
+%{nvidialibdir}/libXvMCNVIDIA.a
+%{nvidialibdir}/*.so
+
+
+%changelog
+* Wed Nov 03 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 96.43.19-1
+- Update to 96.43.19
+
+* Sat Aug 14 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 96.43.18-1
+- Update to 96.43.18
+- Fallback to nouveau instead of nv
+- Add post section to change boot option with grubby
+- Add post section Enabled Selinux allow_execstack boolean.
+
+* Sat Mar 27 2010 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 96.43.16-1
+- Update to 96.43.16
+
+* Fri Nov 27 2009 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 96.43.14-3
+- Remove duplicate desktop file
+
+* Tue Nov 24 2009 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 96.43.14-2
+- Use nvidia-xconfig and nvidia-settings built from sources.
+
+* Sat Nov 14 2009 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 96.43.14-1
+- Update to 96.43.14
+- Update blacklist-nouveau.conf for F-12
+- Remove execstack on nvidia binaries and libraries.
+
+* Sat Oct 10 2009 kwizart < kwizart at gmail.com > - 96.43.13-2
+- Avoid Requires/Provides of the libGL.so.1 . rfbz#859
+
+* Mon Aug 31 2009 kwizart < kwizart at gmail.com > - 96.43.13-1
+- Update to 96.43.13 (beta)
+
+* Tue Jun 9 2009 kwizart < kwizart at gmail.com > - 96.43.11-5
+- F-11 version.
+
+* Sun Jun 7 2009 kwizart < kwizart at gmail.com > - 96.43.11-4
+- blacklist nouveau by default.
+
+* Fri Apr 3 2009 kwizart < kwizart at gmail.com > - 96.43.11-3
+- Fix x86 Arch for fedora >= 11
+
+* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.11-2
+- rebuild for new F11 features
+
+* Wed Feb 25 2009 kwizart < kwizart at gmail.com > - 96.43.11-1
+- Update to 96.43.11 (stable)
+
+* Sun Feb 22 2009 Stewart Adam <s.adam at diffingo.com> - 96.43.09-4
+- Make devel subpackage depend on lib subpackage of the same arch
+
+* Mon Nov 10 2008 kwizart < kwizart at gmail.com > - 96.43.09-3
+- Clean the spec.
+
+* Tue Nov 4 2008 Stewart Adam <s.adam at diffingo.com> - 96.43.09-2
+- Fix upgrade path for FreshRPMs users
+
+* Thu Oct 30 2008 kwizart < kwizart at gmail.com > - 96.43.09-1
+- Update to 96.43.09 (beta)
+ Preliminary support for xorg-server 1.5
+
+* Sat Jul 19 2008 Stewart Adam <s.adam at diffingo.com> - 96.43.07-1
+- Update to 96.43.07
+
+* Wed May 28 2008 Stewart Adam <s.adam at diffingo.com> - 96.43.05-5
+- Only modify modprobe.conf if it exists
+
+* Fri Feb 22 2008 Stewart Adam <s.adam AT diffingo DOT com> - 96.43.05-4
+- Fix typo in filter requires script
+
+* Wed Feb 20 2008 kwizart < kwizart at gmail.com > - 96.43.05-3
+- Fix debuginfo package creation.
+- Add libGLcore.so to the filter list.
+- Only requires versioned libGL on x86_64 (no problem on x86).
+
+* Thu Feb 7 2008 Stewart Adam <s.adam AT diffingo DOT com> - 96.43.05-2
+- Filter requires on main package so we don't pull in xorg-x11-drv-nvidia*-libs
+
+* Mon Feb 4 2008 kwizart < kwizart at gmail.com > - 96.43.05-1
+- Update to 96.43.05
+- New scheme synchronized from the main nvidia package.
+
+* Tue Nov 20 2007 Stewart Adam <s.adam AT diffingo DOT com> - 96.43.01-4
+- Add Requires: which (bz#1662)
+
+* Tue Nov 6 2007 Stewart Adam <s.adam AT diffingo DOT com> - 96.43.01-3.1
+- Fix typo in initscript (bz#1707)
+
+* Thu Nov 1 2007 Stewart Adam <s.adam AT diffingo DOT com> - 96.43.01-3
+- Initscript improvements
+- Minor bugfixes with scriptlets (don't echo "already disabled" type messages)
+
+* Wed Oct 3 2007 kwizart < kwizart at gmail.com > - 96.43.01-2
+- Strip binaries and libs even if no debug is made with F-8
+
+* Wed Oct 3 2007 kwizart < kwizart at gmail.com > - 96.43.01-1
+- Update to 96.43.01
+- Add no replace for profile.d
+
+* Sat Sep 8 2007 Stewart Adam < s.adam AT diffingo DOT com > - 1.0.9639-3
+- Fix %%post if clause (bz#1632)
+
+* Fri Jun 15 2007 kwizart < kwizart at gmail.com > - 1.0.9639-2
+- F7 SELinux fixes (continued)
+- Add a new post scriptlet to remove those legacy-layout udev files
+
+* Mon Jun 4 2007 kwizart < kwizart at gmail.com > - 1.0.9639-1
+- Update to 1.0.9639
+
+* Sat Jun 2 2007 Stewart Adam < s.adam AT diffingo DOT com > - 1.0.9631-12
+- Don't use legacy udev layout (Thanks Finalzone for the workaround)
+
+* Sat Apr 28 2007 Stewart Adam < s.adam AT diffingo DOT com > - 1.0.9631-11
+- Fixes in the config-display (vendor > majorVendor)
+
+* Fri Mar 9 2007 Stewart Adam < s.adam AT diffingo DOT com > - 1.0.9631-10
+- Fix up scriptlets a little so that 'Driver already enabled|disabled'
+ doesn't always appear on install or remove
+- Update *-config-display files for majorVendor and not plain vendor
+- Fix typo in the last changelog entry's name
+
+* Wed Mar 7 2007 Stewart Adam < s.adam AT diffingo DOT com > - 1.0.9631-9
+- Actaully move paths to 96xx, don't just rename the patches and sources
+
+* Sat Feb 24 2007 Stewart Adam < s.adam AT diffingo DOT com > - 1.0.9631-8
+- Bump for new tag
+- fi to end if!
+
+* Sat Feb 24 2007 Stewart Adam < s.adam AT diffingo DOT com > - 1.0.9631-7
+- Standardize all summaries and descriptions with other nvidia and fglrx
+ packages
+- Standardize initscript and *config-display with other nvidia and fglrx
+ packages
+- Move paths from nvidia-glx to nvidia-96xx
+- Start merge with livna-config-display
+
+* Wed Feb 7 2007 kwizart < kwizar at gmail.com > - 1.0.9631-6
+- Rebuild for Fedora Core 7 test1
+
+* Wed Jan 17 2007 kwizart < kwizart at gmail.com > - 1.0.9631-5
+- fix nvidia-glx-init directory (nvidia-96xx)
+
+* Sat Jan 13 2007 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.9631-4
+- fix obsoletes/provides
+- run ldconfig in post for libs-32bit
+- some minor cleanups
+
+* Sun Jan 7 2007 kwizart < kwizart at gmail.com > - 1.0.9631-3
+- Fix perm in SOURCES.
+- Fix ldconfig with libs-32bit
+- No debug_package
+- Drop config with ld.so.conf.d and modprobe.d cause rpmlint errors
+
+* Thu Dec 28 2006 kwizart < kwizart at gmail.com > - 1.0.9631-2
+- New legacy version named kmod-nvidia-96xx
+
+* Thu Dec 07 2006 kwizart < kwizart at gmail.com > - 1.0.9631-1
+- Update to 1.0.9631-1
+
+* Tue Nov 07 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.9629-1
+- update to release 1.0.9629
+
+* Tue Oct 31 2006 Dams <anvil[AT]livna.org> - 1.0.9626-3
+- Another nvidia-config-display update to fix dumb modules section
+
+* Tue Oct 24 2006 Dams <anvil[AT]livna.org> - 1.0.9626-2
+- Yet another updated nvidia-config-display : importing python modules
+ we use is usualy a good idea
+- Updated nvidia-config-display
+
+* Sun Oct 22 2006 Stewart Adam <s.adam AT diffingo DOT com> - 1.0.9626-1
+- update to release 1.0.9626
+
+* Fri Oct 20 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.8776-1
+- update to 1.0.8776-1 -- fixes CVE-2006-5379
+
+* Thu Aug 24 2006 Niko Mirthes (straw) <nmirthes AT gmail DOT com> - 1.0.8774-1
+- Nvidia added a png for nvidia-settings, for-loop adjusted accordingly
+- update to release 1.0.8774
+
+* Wed Aug 09 2006 Niko Mirthes (straw) <nmirthes AT gmail DOT com> - 1.0.8762-6
+- small changes to sync with legacy package
+- place nvidia-bug-report.sh in /usr/bin
+
+* Mon Aug 07 2006 Niko Mirthes (straw) <nmirthes AT gmail DOT com> - 1.0.8762-5
+- more minor changes to spacing and general layout
+
+* Fri Aug 04 2006 Niko Mirthes (straw) <nmirthes AT gmail DOT com> - 1.0.8762-4
+- minor changes to spacing, removal of random tabs, re-arrangements
+- remove GNOME category from the desktop file
+
+* Thu May 25 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.8762-3
+- Obsolete old kmods
+
+* Thu May 24 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.8762-2
+- add missing defattr to files section for sub-package libs-32bit
+
+* Wed May 24 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.8762-1
+- update to 1.0.8762
+
+* Tue May 16 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.8756-3
+- Conflict with xorg-x11-drv-fglrx and selinux-policy < 2.2.29-2.fc5
+- Ship bug-reporting tool as normal executable and not in %%doc
+
+* Sun May 14 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0.8756-2
+- Require nvidia-kmod instead of kmod-nvidia (#970).
+
+* Sat Apr 08 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.8756-1
+- Update to 8756
+- put 32bit libs in their own package
+
+* Wed Mar 29 2006 Niko Mirthes (straw) <nmirthes AT gmail DOT com> - 1.0.8178-9
+- make every use of the 'install' command consistent
+- tweak nvidia-settings' desktop file slightly
+
+* Thu Mar 23 2006 Niko Mirthes (straw) <nmirthes AT gmail DOT com> - 1.0.8178-8
+- switch to using modprobe.d rather than editing modprobe.conf directly
+
+* Sat Mar 18 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.8178-7
+- ExclusiveArch i386 and not %%{ix86} -- we don't want to build for athlon&co
+
+* Sat Mar 18 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.8178-6
+- drop unused patches
+
+* Sat Mar 18 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.8178-5
+- drop 0.lvn
+
+* Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- add dist
+
+* Wed Feb 08 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.8178-0.lvn.5
+- use lib64 in nvidia-config-display on x86-64
+- fix path to kernel module in init-script
+- add patch from Ville for nvidia-README.Fedora
+- match permissions of xorg 7
+
+* Wed Feb 01 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.8178-0.lvn.4
+- More fixes
+
+* Tue Jan 31 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.8178-0.lvn.3
+- Fix wrong provides
+
+* Mon Jan 30 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.8178-0.lvn.2
+- fix path to kernel module in nvidia-glx-init (thx to Dominik 'Rathann'
+ Mierzejewski)
+- include device files until udev works probably with kernel module
+
+* Sun Jan 22 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.8178-0.lvn.1
+- split into packages for userland and kmod
+- rename to xorg-x11-drv-nvidia; yum/rpm should use mesa-libGL{,-devel} then in
+ the future when seaching for libGL.so{,.1}
+- remove kernel-module part
+- remove old cruft
+- install stuff without Makefile because it forgets mosts a lot of files anyway
+
+* Thu Dec 22 2005 Niko Mirthes (straw) <nmirthes AT gmail DOT com> - 0:1.0.8178-0.lvn.2
+- change nvidia-glx.sh and nvidia-glx.csh to point to README.txt rather than README
+- reference xorg.conf rather than XF86Config in the init script
+- improve readability of instructions and comments, fix some typos
+- drop epoch, as it seems to be affecting dependencies according to rpmlint
+- tweak the nvidia-settings desktop file so it always shows up on the
+ menu in the right location
+- add the manual pages for nvidia-settings and nvidia-xconfig
+- remove header entries from the nvidia-glx files list. they belong in -devel
+- fix changelog entries to refer to 7676 not 7176 (though there was a 7176 x86_64
+ release prior to 7174)
+- add libXvMCNVIDIA.so
+- update to 8178
+
+* Wed Dec 07 2005 Niko Mirthes (straw) <nmirthes AT gmail DOT com> - 0:1.0.8174-0.lvn.1
+- add the manual pages for nvidia-settings and nvidia-xconfig
+- install the new nvidia-xconfig utility and associated libs
+
+* Mon Dec 05 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:1.0.8174-0.lvn.1
+- Update to 8174
+- desktop entry now Categories=Settings (#665)
+- Ship bug-reporting tool in doc (#588)
+- Things from Bug 635, Niko Mirthes (straw) <nmirthes AT gmail DOT com>:
+-- avoid changing time stamps on libs where possible
+-- only add /etc/modprobe.conf entries if they aren't already there
+-- add /etc/modprobe.conf entries one at a time
+-- only remove /etc/modprobe.conf entries at uninstall, not during upgrade
+-- avoid removing any modprobe.conf entries other than our own
+-- match Xorg's install defaults where it makes sense (0444)
+-- a few other minor tweaks to the files lists
+
+* Sun Sep 04 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:1.0.7676-0.lvn.3
+- Conflics with nvidia-glx-legacy
+- Integrate some minor correction suggested by Niko Mirthes
+ <nmirthes AT gmail DOT com> in #475
+
+* Fri Aug 26 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:1.0.7676-0.lvn.2
+- Rename src5: nvidia.init to nvidia-glx-init
+- Fix correct servicename in nvidia-glx-init
+- Run nvidia-glx-init before gdm-early-login; del and readd the script
+ during post
+
+* Sun Aug 21 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:1.0.7676-0.lvn.1
+- Update to 7676
+- Lots of cleanup from me and Niko Mirthes <nmirthes AT gmail DOT com>
+- add NVreg_ModifyDeviceFiles=0 to modprobe.conf (Niko)
+- Drop support for FC2
+- Nearly proper Udev-Support with workarounds around FC-Bug 151527
+
+* Fri Jun 17 2005 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.7174-0.lvn.5
+- Slight change of modprobe.conf rexexp
+
+* Thu Jun 16 2005 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.7174-0.lvn.4
+- Fixed a critical bug in modprobe.conf editing where all lines starting with alias and
+ ending with then a word starting with any of the letters n,v,i,d,i,a,N,V,r,e is removed.
+
+* Mon Jun 13 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:1.0.7174-0.lvn.3
+- Adjust kenrnel-module-stuff for FC4
+- Ship both x86 and x64 in the SRPM
+
+* Sun Jun 12 2005 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.7174-0.lvn.2
+- Only create 16 devices
+- Put libXvMCNVIDIA.a in -devel
+- Don't remove nvidia options in /etc/modprobe.conf
+- Make ld.so.conf file config(noreplace)
+- Use same directory permissions as the kernel
+
+* Sat Apr 2 2005 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.7174-0.lvn.1
+- New upstream release, 7174
+
+* Wed Mar 30 2005 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.7167-0.lvn.5
+- Added x86_64 support patch from Thorsten Leemhuis
+
+* Wed Mar 23 2005 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.7167-0.lvn.4
+- Fix kernel module permissions again (644)
+- Only create 16 /dev/nvidia* devices, 256 is unnecessary
+
+* Fri Mar 18 2005 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.7167-0.lvn.3
+- Fixed kernel-module permissions
+
+* Thu Mar 17 2005 Dams <anvil[AT]livna.org> 0:1.0.7167-0.lvn.2
+- Removed provides on kernel-module and kernel-modules
+
+* Sat Mar 05 2005 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.7167-0.lvn.1
+- New upstream release 1.0.7167
+- Added patch from http://www.nvnews.net/vbulletin/showthread.php?t=47405
+- Removed old patch against 2.6.9
+
+* Sat Feb 05 2005 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6629-0.lvn.7
+- Added a number of post-6629 patches from http://www.minion.de/files/1.0-6629
+- Fixed permissions of nvidia/nvidia.ko
+
+* Fri Jan 21 2005 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6629-0.lvn.6
+- Fix incorrect MAKDEV behaviour and dependency
+
+* Tue Nov 30 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6629-0.lvn.4
+- Fixed creation of /dev/nvidia* on FC2
+
+* Sat Nov 27 2004 Dams <anvil[AT]livna.org> - 0:1.0.6629-0.lvn.3
+- Dont try to print kvariant in description when it's not defined.
+
+* Sun Nov 21 2004 Thorsten Leemhuis <fedora at leemhuis dot info> - 0:1.0.6629-0.lvn.2
+- resulting kernel-module package now depends again on /root/vmlinuz-<kernelver>
+- Use rpmbuildtags driverp and kernelp
+
+* Sat Nov 06 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6629-0.lvn.1
+- New upstream version, 1.0-6629
+- Build without kernel-module-devel by default
+
+* Fri Oct 29 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6111-0.lvn.6
+- Make n-c-display handle misc problems in a better way
+- Fixed wrong icon file name in .desktop file
+- Re-added the mysteriously vanished sleep line in the init script
+ when kernel module wasn't present
+
+* Fri Oct 22 2004 Thorsten Leemhuis <fedora at leemhuis dot info> - 0:1.0.6111-0.lvn.5
+- Use fedora-kmodhelper in the way ntfs or ati-fglrx use it
+- Allow rpm to strip the kernel module. Does not safe that much space ATM but
+ might be a good idea
+- Allow to build driver and kernel-module packages independent of each other
+- Some minor spec-file changes
+
+* Thu Oct 21 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6111-0.lvn.4
+- udev fixes
+- Incorporated fix for missing include line in ld.so.conf from ati-fglrx spec (T Leemhuis)
+
+* Sun Sep 19 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6111-0.lvn.3
+- Remove FC1/kernel 2.4 compability
+- Rename srpm to nvidia-glx
+- Build with kernel-module-devel
+
+* Sun Aug 15 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6111-0.lvn.2
+- Restore ldsoconfd macro
+- Disable autoamtic removal of scripted installation for now; needs testing
+
+* Sat Aug 14 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6111-0.lvn.1
+- Upstream release 6111
+- Fixed init script (again)
+
+* Tue Aug 3 2004 Dams <anvil[AT]livna.org> 0:1.0.6106-0.lvn.4
+- ld.so.conf.d directory detected by spec file
+- Using nvidialibdir in nvidia-glx-devel files section
+- Got rid of yarrow and tettnang macros
+- libGL.so.1 symlink in tls directory always present
+
+* Mon Jul 19 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6106-0.lvn.3
+- Fixed script bug that would empty prelink.conf
+- Added symlink to non-tls libGL.so.1 on FC1
+
+* Tue Jul 13 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6106-0.lvn.2.3
+- Updated init script to reflect name change -xfree86 -> -display
+
+* Mon Jul 12 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6106-0.lvn.2.2
+- Fixed backup file naming
+
+* Sun Jul 11 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6106-0.lvn.2.1
+- Restore working macros
+- Always package the gui tool
+
+* Sun Jul 11 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6106-0.lvn.2
+- Renamed nvidia-config-xfree86 to nvidia-config-display
+- Fixed symlinks
+- Use ld.so.conf.d on FC2
+- Remove script installation in pre
+- Use system-config-display icon for nvidia-settings
+- 2 second delay in init script when kernel module not found
+- Make nvidia-config-display fail more gracefully
+- Add blacklist entry to prelink.conf on FC1
+
+* Mon Jul 05 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6106-0.lvn.1
+- New upstream release
+- First attempt to support FC2
+- Dropped dependency on XFree86
+
+* Mon Feb 09 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.5336-0.lvn.3
+- Use pkg0
+
+* Sun Feb 08 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.5336-0.lvn.2
+- New Makefile variable SYSSRC to point to kernel sources.
+- kmodhelper fixes.
+
+* Fri Jan 30 2004 Keith G. Robertson-Turner <nvidia-devel[AT]genesis-x.nildram.co.uk> 0:1.0.5336-0.lvn.1
+- New upstream release
+- Removed (now obsolete) kernel-2.6 patch
+- Install target changed upstream, from "nvidia.o" to "module"
+- Linked nv/Makefile.kbuild to (now missing) nv/Makefile
+
+* Sun Jan 25 2004 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.18
+- Updated nvidia-config-display
+- Now requiring pyxf86config
+
+* Mon Jan 19 2004 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.17
+- Added nvidiasettings macro to enable/disable gui packaging
+
+* Mon Jan 19 2004 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.16
+- Updated minion.de patches
+- Added some explicit requires
+- Test nvidia-config-xfree86 presence in kernel-module package
+ scriptlets
+
+* Mon Jan 12 2004 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.15
+- Updated Readme.fedora
+- nvidia-glx-devel package
+
+* Sat Jan 3 2004 Dams <anvil[AT]livna.org> 0:1.0.5328-0.lvn.14
+- Hopefully fixed kernel variant thingy
+
+* Fri Jan 2 2004 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.13
+- Support for other kernel variants (bigmem, etc..)
+- Changed URL in Source0
+
+* Tue Dec 30 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.13
+- Dropped nvidia pkgX information in release tag.
+
+* Tue Dec 30 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.12.pkg0
+- Renamed kernel module package in a kernel-module-nvidia-`uname -r` way
+- Using fedora.us kmodhelper for kernel macro
+- Using nvidia pkg0 archive
+
+* Sun Dec 21 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.11.pkg1
+- kernel-module-nvidia package provides kernel-module
+- We wont own devices anymore. And we wont re-create them if they are
+ already present
+
+* Sun Dec 21 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.10.pkg1
+- Yet another initscript update. Really.
+- Scriptlets updated too
+
+* Sun Dec 21 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.9.pkg1
+- Fixed alias in modprobe.conf for 2.6
+
+* Sun Dec 21 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.8.pkg1
+- Another initscript update
+
+* Sun Dec 21 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.7.pkg1
+- kernel module requires kernel same kversion
+- initscript updated again
+- Dont conflict, nor obsolete XFree86-Mesa-libGL. Using ld.so.conf to
+ make libGL from nvidia first found. Hope Mike Harris will appreciate.
+
+* Sun Dec 21 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.6.pkg1
+- kernel-module-nvidia requires kernel same version-release
+
+* Sat Dec 20 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.6.pkg1
+- Updated initscript
+
+* Fri Dec 19 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.5.pkg1
+- lvn repository tag
+
+* Fri Dec 19 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.fdr.5.pkg1
+- Added initscript to toggle nvidia driver according to running kernel
+ and installed kernel-module-nvidia packages
+- Updated scriptlets
+
+* Thu Dec 18 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.fdr.4.pkg1
+- Arch detection
+- Url in patch0
+
+* Tue Dec 16 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.fdr.3.pkg1
+- Desktop entry for nvidia-settings
+- s/kernel-module-{name}/kernel-module-nvidia
+- nvidia-glx doesnt requires kernel-module-nvidia-driver anymore
+- Using modprobe.conf for 2.6 kernel
+- Hopefully fixed symlinks
+
+* Mon Dec 15 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.fdr.2.pkg1
+- Building kernel module for defined kernel
+- kernel module for 2.6 is nvidia.ko
+- Patch not to install kernel module on make install
+- Updated patch for 2.6
+- depmod in scriptlet for defined kernel
+- nvidia-glx conflicting XFree86-Mesa-libGL because we 0wn all its
+ symlink now
+- Dont override libGL.so symlink because it belongs to XFree86-devel
+- Added nvidia 'pkgfoo' info to packages release
+- Spec file cleanup
+
+* Fri Dec 12 2003 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.4620-0.fdr.2
+- Fixed repairing of a link in post-uninstall
+- Obsolete Mesa instead of Conflict with it, enables automatic removal.
+
+* Mon Dec 08 2003 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.4620-0.fdr.1
+- Added support for 2.6 kernels
+- Cleaned up build section, removed the need for patching Makefiles.
+- Added missing BuildReq gcc32
+- Don't package libs twice, only in /usr/lib/tls/nvidia
+- Made config cript executable and put it into /usr/sbin
+- Moved kernel module to kernel/drivers/video/nvidia/
+- Fixed libGL.so and libGLcore.so.1 links to allow linking against OpenGL libraries
+
+* Mon Dec 08 2003 Keith G. Robertson-Turner <nvidia-devel at genesis-x.nildram.co.uk> - 0:1.0.4620-0.fdr.0
+- New beta 4620 driver
+- New GUI control panel
+- Some minor fixes
+
+* Thu Nov 20 2003 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.4496-0.fdr.10.1
+- Finally fixed SMP builds.
+
+* Wed Nov 19 2003 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.4496-0.fdr.9
+- Don't make nvidia-glx depend on kernel-smp
+
+* Tue Nov 18 2003 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.4496-0.fdr.8
+- Some build fixes
+
+* Tue Nov 11 2003 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.4496-0.fdr.7
+- Added CC=gcc32
+- Fixed upgrading issue
+- Added driver switching capabilities to config script.
+
+* Fri Nov 07 2003 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.4496-0.fdr.4
+- Added conflict with XFree86-Mesa-libGL.
+- Disabled showing of the README.Fedora after installation.
+
+* Sun Oct 12 2003 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.4496-0.fdr.3
+- Added NVidia configuration script written in Python.
+- Some cleanup of files section
+- For more info, see https://bugzilla.fedora.us/show_bug.cgi?id=402
+
+* Tue Jul 08 2003 Andreas Bierfert (awjb) <andreas.bierfert[AT]awbsworld.de> - 0:1.0.4363-0.fdr.2
+- renamed /sbin/makedevices.sh /sbin/nvidia-makedevices.sh ( noticed by
+ Panu Matilainen )
+- Fixed name problem
+* Sun Jun 22 2003 Andreas Bierfert (awjb) <andreas.bierfert[AT]awbsworld.de> - 0:1.0.4363-0.fdr.1
+- Initial RPM release, still some ugly stuff in there but should work...
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-96xx/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 14 Nov 2009 21:34:55 -0000 1.5
+++ .cvsignore 3 Nov 2010 16:09:27 -0000 1.6
@@ -1,2 +1,2 @@
-NVIDIA-Linux-x86-96.43.14-pkg0.run
-NVIDIA-Linux-x86_64-96.43.14-pkg0.run
+NVIDIA-Linux-x86-96.43.19-pkg0.run
+NVIDIA-Linux-x86_64-96.43.19-pkg0.run
--- dead.package DELETED ---
13 years, 10 months
rpms/xorg-x11-drv-nvidia-96xx/F-14 blacklist-nouveau.conf, 1.4, 1.5 filter-provides.sh, 1.2, 1.3 filter-requires.sh, 1.4, 1.5 nvidia-96xx-README.Fedora, 1.4, 1.5 nvidia-96xx-config-display, 1.4, 1.5 nvidia-96xx-init, 1.4, 1.5 sources, 1.6, 1.7 xorg-x11-drv-nvidia-96xx.spec, 1.18, 1.19 .cvsignore, 1.5, 1.6 dead.package, 1.1, 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-serv19364/F-14
Modified Files:
.cvsignore
Added Files:
blacklist-nouveau.conf filter-provides.sh filter-requires.sh
nvidia-96xx-README.Fedora nvidia-96xx-config-display
nvidia-96xx-init sources xorg-x11-drv-nvidia-96xx.spec
Removed Files:
dead.package
Log Message:
Re-import
Index: blacklist-nouveau.conf
===================================================================
RCS file: blacklist-nouveau.conf
diff -N blacklist-nouveau.conf
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ blacklist-nouveau.conf 3 Nov 2010 16:08:36 -0000 1.5
@@ -0,0 +1,4 @@
+# RPM Fusion blacklist for nouveau driver - you need to run as root:
+# dracut -f /boot/initramfs-$(uname -r).img $(uname -r)
+# if nouveau is loaded despite this file.
+blacklist nouveau
Index: filter-provides.sh
===================================================================
RCS file: filter-provides.sh
diff -N filter-provides.sh
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ filter-provides.sh 3 Nov 2010 16:08:36 -0000 1.3
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+if [ -x /usr/lib/rpm/redhat/find-provides ]; then
+ FINDPROV=/usr/lib/rpm/redhat/find-provides
+else
+ FINDPROV=/usr/lib/rpm/find-provides
+fi
+
+$FINDPROV $* | sed -e '/libnvidia-tls.so/d' | sed -e '/libGLcore.so/d' | sed -e '/libGL.so/d'
+
Index: filter-requires.sh
===================================================================
RCS file: filter-requires.sh
diff -N filter-requires.sh
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ filter-requires.sh 3 Nov 2010 16:08:36 -0000 1.5
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+if [ -x /usr/lib/rpm/redhat/find-requires ]; then
+ FINDREQ=/usr/lib/rpm/redhat/find-requires
+else
+ FINDREQ=/usr/lib/rpm/find-requires
+fi
+
+$FINDREQ $* | sed -e '/libnvidia-tls.so/d' | sed -e '/libGLcore.so/d' | sed -e '/libGL.so/d'
+
Index: nvidia-96xx-README.Fedora
===================================================================
RCS file: nvidia-96xx-README.Fedora
diff -N nvidia-96xx-README.Fedora
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ nvidia-96xx-README.Fedora 3 Nov 2010 16:08:36 -0000 1.5
@@ -0,0 +1,112 @@
+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.
Index: nvidia-96xx-config-display
===================================================================
RCS file: nvidia-96xx-config-display
diff -N nvidia-96xx-config-display
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ nvidia-96xx-config-display 3 Nov 2010 16:08:36 -0000 1.5
@@ -0,0 +1,146 @@
+#!/usr/bin/python -tt
+# -*- coding: UTF-8 -*-
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 only
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Library General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# Copyright 2003, 2004 Peter Backlund
+# Copyright 2004 Thorsten Leemhuis
+# Copyright 2006 Van Assche Alphonse
+# Copyright 2006, 2007 Stewart Adam
+
+import string
+import os
+import sys
+
+from livnaConfigDisplay.const import *
+from livnaConfigDisplay.const import _
+
+import livnaConfigDisplay.ConfigDisplay
+from livnaConfigDisplay.GlxConfig import *
+from livnaConfigDisplay import Utils
+from livnaConfigDisplay.ConfigFile import ConfigFile
+
+class nvidiaConfigDisplay(GlxConfig):
+ def __init__(self):
+ GlxConfig.__init__(self)
+ self.vendor = 'nvidia-96xx'
+ self.majorVendor = Utils.getMajorVendor()
+ if self.vendor != Utils.getVendor():
+ print _('The initscript and installed driver vendors do not match!')
+ sys.exit(1)
+ self.ldconf = LD_CONF_FILE % (self.vendor)
+ try:
+ self.doAllBackups()
+ except livnaConfigDisplayError, (bkupErrMsg):
+ print bkupErrMsg
+ sys.exit(1)
+ self.xconfig, self.xconfigpath = self.loadXconfig()
+ self.config = ConfigFile(STATUS_FILE)
+ self.TOP_MOD_DIR = self.getModTopDir()
+
+ # finally, run arg checks.
+ self.run()
+
+
+ def enable(self, isAutoConfigure = True):
+ # Backup the file before make any change.
+ currentDriver = self.getDriver()
+ # Already enabled?
+ if currentDriver == self.majorVendor:
+ print _('Driver already enabled.')
+ return
+ # nVidia modules
+ self.addModulePath("/extensions/nvidia", self.TOP_MOD_DIR)
+ # 'remembering' magic's in here.
+ self.config.setOldDriver(currentDriver)
+ #currentDriver = self.config.getOldDriver()
+ self.toggleDriver(currentDriver, self.majorVendor)
+ # Disable dri and GLcore modules - these are no
+ self.removeModule("dri")
+ self.removeModule("GLcore")
+ # Add glx/dbe/extmod modules when modules section exists
+ if self.xconfig.modules:
+ for module in ["glx", "dbe", "extmod"]:
+ if self.onlyHasModule(module):
+ self.removeModule(module)
+ break
+ else:
+ self.addModule(module)
+ # Problems with Compiz without these.
+ self.addOption(self.majorVendor,"AddARGBGLXVisuals", "True")
+ #self.addOption(self.majorVendor,"DisableGLXRootClipping", "True")
+ Utils.writeXorgConf(self.xconfig, self.xconfigpath)
+ # We have to read saved status file to restore the Xorg configuration.
+ self.restoreconf()
+
+
+ def disable(self, isAutoConfigure = True):
+ self.removeModulePath("/extensions/nvidia", self.TOP_MOD_DIR)
+ # Check if it's already disabled
+ if self.getDriver() != self.majorVendor:
+ print _('Driver already disabled.')
+ return
+ # Backup the file before make any change.
+ prevDriver = self.config.getOldDriver()
+ if prevDriver == self.majorVendor:
+ print _('Will not allow reverting from driver \'%s\' to \'%s\'.') % (self.vendor, self.vendor)
+ print _('Using the \'nouveau\' driver instead.')
+ prevDriver = "nouveau"
+ self.config.setOldDriver("nouveau")
+ self.removeOption(self.majorVendor,"AddARGBGLXVisuals")
+ self.removeOption(self.majorVendor,"DisableGLXRootClipping")
+ self.toggleDriver(self.majorVendor, prevDriver)
+ Utils.writeXorgConf(self.xconfig, self.xconfigpath)
+ # We have to save the status file so it can be restored later
+ self.storeconf()
+ # And return to the Fedora default.
+ self.enableAiglx()
+
+ def printUsage(self):
+ print _("Usage: ") + self.vendor + _("-config-display [ enable|disable ]")
+
+ def run(self):
+ # Check number of arguments
+ # arg = action
+ if len(sys.argv) == 2:
+ arg = sys.argv[1]
+ else:
+ print _('Wrong number of arguments')
+ self.printUsage()
+ sys.exit(1)
+ # Check value of argument
+ if arg.lower() != "enable" and arg.lower() != "disable":
+ print _('Invalid command: %s') % arg.lower()
+ self.printUsage()
+ sys.exit(1)
+ try:
+ if arg == "enable":
+ if self.getActive():
+ self.enable()
+ else:
+ print _('livna-config-display\'s `active\' state is False - Exiting')
+ elif arg == "disable":
+ if self.getActive():
+ self.disable()
+ except:
+ raise # Uncomment me to show the real error
+ print MSG_CONF_APPLY_ERROR
+ try:
+ self.doAllRestores()
+ sys.exit(1)
+ except livnaConfigDisplayError, (bkupErrMsg):
+ #raise # Uncomment me to show the real error
+ print MSG_CONF_RESTORE_ERROR + '\n' + MSG_TRACEBACK % (str(errMsg)) + '\n\n' + str(bkupErrMsg)
+ sys.exit(1)
+
+app = nvidiaConfigDisplay()
Index: nvidia-96xx-init
===================================================================
RCS file: nvidia-96xx-init
diff -N nvidia-96xx-init
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ nvidia-96xx-init 3 Nov 2010 16:08:36 -0000 1.5
@@ -0,0 +1,120 @@
+#!/bin/sh
+#
+# chkconfig: 2345 8 92
+# description: This script will check if a nvidia 96xx kernel module is\
+# present for the running kernel and modify the xorg.conf to \
+# the appropriate configuration.
+
+# Source function library.
+. /etc/rc.d/init.d/functions
+
+name='nvidia-96xx'
+exec="/usr/sbin/$name-config-display"
+prog="`basename $exec`"
+lockfile="/var/lock/subsys/$name"
+
+RETVAL=0
+modname="nvidia.ko"
+modpath="/lib/modules/$(uname -r)"
+# Default to no module
+module="noneWithSomeCrazyNameSoItsNeverFound"
+# If one exists, then use it.
+if test -e "${modpath}/extra/${modname}";then
+ module="${modpath}/extra/${modname}"
+elif test -e "${modpath}/extra/nvidia/${modname}";then
+ module="${modpath}/extra/nvidia/${modname}"
+elif test -e "${modpath}/kernel/drivers/video/nvidia/${modname}";then
+ module="${modpath}/kernel/drivers/video/nvidia/${modname}"
+elif test -e "${modpath}/extra/nvidia-96xx/${modname}";then
+ module="${modpath}/extra/nvidia-96xx/${modname}"
+elif test -e "${modpath}/kernel/drivers/video/nvidia-96xx/${modname}";then
+ module="${modpath}/kernel/drivers/video/nvidia-96xx/${modname}"
+fi
+
+# Try to modify the below the least possible. If you need to change something, try
+# using the variables above first, as most of the program control is based on
+# the variables above. If something really needs to be changed, try to make
+# the change in all the drivers for the sake of consistency.
+
+# We shouldn't use lock files anymore because the lock file
+# doesn't mean a driver is disabled or enabled. For example, we start()
+# at boot and enable the driver. start() makes a lock file. We stop() on
+# shutdown, which removes the lock file. But what if the user ran *config-display
+# manually? Or if we don't `*config-display disable` in stop()?
+
+start() {
+ if action $"Checking for module $modname:" test -f $module;then
+ action $"Enabling the $name driver:" $exec enable
+ RETVAL=$?
+ else
+ echo -en $"$modname for kernel $(uname -r) was not found." && echo_warning;echo -en '\n'
+ echo -en $"The $name driver will not be enabled until one is found." && echo_warning;echo -en '\n'
+ $exec disable
+ RETVAL=1
+ fi
+ if [ "$RETVAL" -eq "0" ];then
+ #touch $lockfile
+ # this is a nothing assignment so that bash doesn't complain.
+ RETVAL=0
+ else
+ # Let them read the errors or warnings
+ sleep 3
+ fi
+ return
+}
+
+stop() {
+ #action $"Disabling the $name driver:" $exec disable
+ #RETVAL=$?
+ RETVAL=0
+ #if [ "$RETVAL" -eq 0 ];then
+ # rm -f $lockfile
+ #fi
+ return
+}
+
+restart() {
+ stop
+ start
+}
+
+reload() {
+ restart
+}
+
+status() {
+ #if [ -e $lockfile ];then
+ if [ -f $module ] && lsmod | grep ^${modname%%.ko} &>/dev/null ;then
+ echo $"$modname for kernel $(uname -r) was found."
+ echo $"The driver is enabled."
+ else
+ echo $"$modname for kernel $(uname -r) was not found."
+ echo $"The $name driver cannot be enabled until one is found."
+ fi
+ #else
+ # echo $"The $name driver has not been enabled."
+ #fi
+ RETVAL=0
+}
+
+fdrstatus() {
+ status $prog
+}
+
+case "$1" in
+ start|stop|restart|reload)
+ $1
+ ;;
+ status)
+ fdrstatus
+ ;;
+ condrestart)
+ restart
+ ;;
+ *)
+ echo $"Usage: $0 {start|stop|status|restart|condrestart|reload}"
+ exit 1
+ ;;
+esac
+
+exit $RETVAL
Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ sources 3 Nov 2010 16:08:36 -0000 1.7
@@ -0,0 +1,2 @@
+53e98129d885a1b004aabc42a989fa73 NVIDIA-Linux-x86-96.43.19-pkg0.run
+7ff779e299b938b880baff6cd970ab51 NVIDIA-Linux-x86_64-96.43.19-pkg0.run
Index: xorg-x11-drv-nvidia-96xx.spec
===================================================================
RCS file: xorg-x11-drv-nvidia-96xx.spec
diff -N xorg-x11-drv-nvidia-96xx.spec
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ xorg-x11-drv-nvidia-96xx.spec 3 Nov 2010 16:08:36 -0000 1.19
@@ -0,0 +1,865 @@
+%define nvidialibdir %{_libdir}/nvidia
+
+# Tweak to have debuginfo - part 1/2
+%if 0%{?fedora} >= 7
+%define __debug_install_post %{_builddir}/%{?buildsubdir}/find-debuginfo.sh %{_builddir}/%{?buildsubdir}\
+%{nil}
+%endif
+
+Name: xorg-x11-drv-nvidia-96xx
+Version: 96.43.19
+Release: 1%{?dist}
+Summary: NVIDIA's 96xx series proprietary display driver for NVIDIA graphic cards
+
+Group: User Interface/X Hardware Support
+License: Redistributable, no modification permitted
+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
+Source6: blacklist-nouveau.conf
+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.
+Source92: filter-provides.sh
+%define _use_internal_dependency_generator 0
+%define __find_requires %{SOURCE91}
+%define __find_provides %{SOURCE92}
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%if 0%{?fedora} > 11 || 0%{?rhel} > 5
+ExclusiveArch: i686 x86_64
+%else 0%{?fedora} == 11
+ExclusiveArch: i586 x86_64
+%else
+ExclusiveArch: i386 x86_64
+%endif
+Requires: nvidia-xconfig
+Requires: nvidia-settings
+
+Requires: nvidia-96xx-kmod >= %{version}
+Requires(post): nvidia-96xx-kmod >= %{version}
+
+# Needed in all nvidia or fglrx driver packages
+BuildRequires: prelink
+Requires: which
+Requires: livna-config-display
+Requires: %{name}-libs-%{_target_cpu} = %{version}-%{release}
+
+Requires(post): livna-config-display
+Requires(preun): livna-config-display
+Requires(post): chkconfig
+Requires(post): ldconfig
+Requires(preun): chkconfig
+
+Provides: nvidia-96xx-kmod-common = %{version}
+
+Conflicts: xorg-x11-drv-nvidia-legacy
+Conflicts: xorg-x11-drv-nvidia-beta
+Conflicts: xorg-x11-drv-nvidia-newest
+Conflicts: xorg-x11-drv-nvidia-173xx
+Conflicts: xorg-x11-drv-nvidia-71xx
+Conflicts: xorg-x11-drv-nvidia
+Conflicts: xorg-x11-drv-fglrx
+
+Obsoletes: nvidia-96xx-kmod < %{version}
+
+Obsoletes: nvidia-x11-drv-96xx < %{version}-%{release}
+Provides: nvidia-x11-drv-96xx = %{version}-%{release}
+
+%description
+This package provides the legacy NVIDIA display driver of the 96xx serie
+which allows for hardware accelerated rendering with NVIDIA chipsets
+Legacy releases for GeForce 2 through GeForce 4 series GPUs.
+GeForce 8 and above are NOT supported by this release.
+
+For the full product support list, please consult the release notes
+for driver version %{version}.
+
+
+%package devel
+Summary: Development files for %{name}
+Group: Development/Libraries
+Requires: %{name}-libs-%{_target_cpu} = %{version}-%{release}
+
+%description devel
+This package provides the development files of the %{name} package,
+such as OpenGL headers.
+
+%package libs
+Summary: Libraries for %{name}
+Group: User Interface/X Hardware Support
+Requires: %{name} = %{version}-%{release}
+Provides: %{name}-libs-%{_target_cpu} = %{version}-%{release}
+%ifarch %{ix86}
+Provides: %{name}-libs-32bit = %{version}-%{release}
+Obsoletes: %{name}-libs-32bit <= %{version}-%{release}
+%endif
+
+%description libs
+This package provides the shared libraries for %{name}.
+
+
+%prep
+%setup -q -c -T
+sh %{SOURCE0} --extract-only --target nvidiapkg-x86
+sh %{SOURCE1} --extract-only --target nvidiapkg-x64
+tar -cjf nvidia-kmod-data-%{version}.tar.bz2 nvidiapkg-*/LICENSE nvidiapkg-*/usr/src/
+
+# Tweak to have debuginfo - part 2/2
+%if 0%{?fedora} >= 7
+cp -p %{_prefix}/lib/rpm/find-debuginfo.sh .
+sed -i -e 's|strict=true|strict=false|' find-debuginfo.sh
+%endif
+
+%ifarch %{ix86}
+ln -s nvidiapkg-x86 nvidiapkg
+%else
+ln -s nvidiapkg-x64 nvidiapkg
+%endif
+mv nvidiapkg/LICENSE nvidiapkg/usr/share/doc/
+# More docs
+cp %{SOURCE11} nvidiapkg/usr/share/doc/README.Fedora
+find nvidiapkg/usr/share/doc/ -type f | xargs chmod 0644
+
+
+%build
+# Nothing to build
+echo "Nothing to build"
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+set +x
+for file in $(cd nvidiapkg &> /dev/null; find . -type f | grep -v -e 'makeself.sh$' -e 'mkprecompiled$' -e 'tls_test$' -e 'tls_test_dso.so$' -e 'nvidia-settings.desktop$' -e '^./Makefile' -e '^./nvidia-installer' -e '^./pkg-history.txt' -e '^./.manifest' -e '/usr/share/doc/' -e 'libGL.la$' -e 'drivers/nvidia_drv.o$' -e 'nvidia-installer.1.gz$' -e '^./usr/src/')
+do
+ if [[ ! "/${file##./usr/lib/}" = "/${file}" ]]
+ then
+ install -D -p -m 0755 nvidiapkg/${file} $RPM_BUILD_ROOT/%{nvidialibdir}/${file##./usr/lib/}
+ elif [[ ! "/${file##./usr/X11R6/lib/modules/extensions}" = "/${file}" ]]
+ then
+ install -D -p -m 0755 nvidiapkg/${file} $RPM_BUILD_ROOT/%{_libdir}/xorg/modules/extensions/nvidia/${file##./usr/X11R6/lib/modules/extensions}
+ elif [[ ! "/${file##./usr/X11R6/lib/modules}" = "/${file}" ]]
+ then
+ install -D -p -m 0755 nvidiapkg/${file} $RPM_BUILD_ROOT/%{_libdir}/xorg/modules/${file##./usr/X11R6/lib/modules}
+ elif [[ ! "/${file##./usr/X11R6/lib/}" = "/${file}" ]]
+ then
+ install -D -p -m 0755 nvidiapkg/${file} $RPM_BUILD_ROOT/%{nvidialibdir}/${file##./usr/X11R6/lib/}
+ elif [[ ! "/${file##./usr/include/}" = "/${file}" ]]
+ then
+ install -D -p -m 0644 nvidiapkg/${file} $RPM_BUILD_ROOT/%{_includedir}/nvidia/${file##./usr/include/}
+ elif [[ ! "/${file##./usr/bin/}" = "/${file}" ]]
+ then
+ if [[ ! "/${file##./usr/bin/nvidia-xconfig}" = "/${file}" ]]
+ then
+ install -D -p -m 0755 nvidiapkg/${file} $RPM_BUILD_ROOT/usr/sbin/${file##./usr/bin/}
+ elif [[ ! "/${file##./usr/bin/nvidia-bug-report.sh}" = "/${file}" ]]
+ then
+ install -D -p -m 0755 nvidiapkg/${file} $RPM_BUILD_ROOT/usr/bin/${file##./usr/bin/}
+ else
+ install -D -p -m 0755 nvidiapkg/${file} $RPM_BUILD_ROOT/${file}
+ fi
+ elif [[ ! "/${file##./usr/share/man/}" = "/${file}" ]]
+ then
+ install -D -p -m 0644 nvidiapkg/${file} $RPM_BUILD_ROOT/%{_mandir}/${file##./usr/share/man/}
+ gunzip $RPM_BUILD_ROOT/%{_mandir}/${file##./usr/share/man/}
+ elif [[ ! "/${file##./usr/share/pixmaps/}" = "/${file}" ]]
+ then
+ install -D -p -m 0644 nvidiapkg/${file} $RPM_BUILD_ROOT/%{_datadir}/pixmaps/${file##./usr/share/pixmaps/}
+ else
+ echo ${file} found -- don\'t know how to handle
+ exit 1
+ fi
+done
+set -x
+
+# Change perms on static libs. Can't fathom how to do it nicely above.
+find $RPM_BUILD_ROOT/%{nvidialibdir} -type f -name "*.a" -exec chmod 0644 '{}' \;
+
+# Fixme: should we do this directly in above for-loop? Yes, we should! No, please don't!
+ln -s libGLcore.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libGLcore.so
+ln -s libGLcore.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libGLcore.so.1
+ln -s libGL.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libGL.so
+ln -s libGL.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libGL.so.1
+ln -s libnvidia-tls.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libnvidia-tls.so.1
+ln -s libnvidia-tls.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/tls/libnvidia-tls.so.1
+ln -s libnvidia-cfg.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libnvidia-cfg.so.1
+ln -s libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libXvMCNVIDIA.so
+ln -s libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libXvMCNVIDIA_dynamic.so.1
+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 initscript
+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/
+install -pm 0644 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/
+
+# ld.so.conf.d file
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
+echo "%{nvidialibdir}" > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia-96xx-%{_lib}.conf
+
+# Remove execstack needs on F-12 and laters
+%if 0
+find $RPM_BUILD_ROOT%{nvidialibdir} -name '*.so.*' -type f -exec execstack -c {} ';'
+execstack -c $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/nvidia/libglx.so.%{version}
+execstack -c $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/nvidia_drv.so
+%ifarch x86_64
+execstack -c $RPM_BUILD_ROOT%{_bindir}/nvidia-settings
+execstack -c $RPM_BUILD_ROOT%{_sbindir}/nvidia-xconfig
+%endif
+%endif
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%post
+if [ "$1" -eq "1" ]; then
+ # Enable nvidia driver when installing
+ %{_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 ||:
+ 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
+if [ -x /usr/sbin/setsebool ] ; then
+ SELINUXEXECSTACK=`cat /selinux/booleans/allow_execstack 2>/dev/null`
+ if [ "${SELINUXEXECSTACK}" == "0 0" ] ; then
+ /usr/sbin/setsebool -P allow_execstack on &>/dev/null
+ fi
+fi ||:
+
+%post libs -p /sbin/ldconfig
+
+%preun
+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 ||:
+fi ||:
+
+%postun libs -p /sbin/ldconfig
+
+%files
+%defattr(-,root,root,-)
+%doc nvidiapkg/usr/share/doc/*
+%config(noreplace) %{_sysconfdir}/modprobe.d/blacklist-nouveau.conf
+%{_initrddir}/nvidia-96xx
+%exclude %{_bindir}/nvidia-settings
+%exclude %{_sbindir}/nvidia-xconfig
+%{_bindir}/nvidia-bug-report.sh
+%{_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
+%{_libdir}/xorg/modules/extensions/nvidia/*.so*
+#/no_multilib
+%{_datadir}/pixmaps/*.png
+%exclude %{_mandir}/man1/nvidia-settings.*
+%exclude %{_mandir}/man1/nvidia-xconfig.*
+
+%files libs
+%defattr(-,root,root,-)
+%config %{_sysconfdir}/ld.so.conf.d/nvidia-96xx-%{_lib}.conf
+%dir %{nvidialibdir}
+%dir %{nvidialibdir}/tls
+%{nvidialibdir}/*.so.*
+%{nvidialibdir}/tls/*.so.*
+
+%files devel
+%defattr(-,root,root,-)
+%dir %{_includedir}/nvidia
+%dir %{_includedir}/nvidia/GL
+%{_includedir}/nvidia/GL/*.h
+%{nvidialibdir}/libXvMCNVIDIA.a
+%{nvidialibdir}/*.so
+
+
+%changelog
+* Wed Nov 03 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 96.43.19-1
+- Update to 96.43.19
+
+* Sat Aug 14 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 96.43.18-1
+- Update to 96.43.18
+- Fallback to nouveau instead of nv
+- Add post section to change boot option with grubby
+- Add post section Enabled Selinux allow_execstack boolean.
+
+* Sat Mar 27 2010 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 96.43.16-1
+- Update to 96.43.16
+
+* Fri Nov 27 2009 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 96.43.14-3
+- Remove duplicate desktop file
+
+* Tue Nov 24 2009 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 96.43.14-2
+- Use nvidia-xconfig and nvidia-settings built from sources.
+
+* Sat Nov 14 2009 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 96.43.14-1
+- Update to 96.43.14
+- Update blacklist-nouveau.conf for F-12
+- Remove execstack on nvidia binaries and libraries.
+
+* Sat Oct 10 2009 kwizart < kwizart at gmail.com > - 96.43.13-2
+- Avoid Requires/Provides of the libGL.so.1 . rfbz#859
+
+* Mon Aug 31 2009 kwizart < kwizart at gmail.com > - 96.43.13-1
+- Update to 96.43.13 (beta)
+
+* Tue Jun 9 2009 kwizart < kwizart at gmail.com > - 96.43.11-5
+- F-11 version.
+
+* Sun Jun 7 2009 kwizart < kwizart at gmail.com > - 96.43.11-4
+- blacklist nouveau by default.
+
+* Fri Apr 3 2009 kwizart < kwizart at gmail.com > - 96.43.11-3
+- Fix x86 Arch for fedora >= 11
+
+* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.11-2
+- rebuild for new F11 features
+
+* Wed Feb 25 2009 kwizart < kwizart at gmail.com > - 96.43.11-1
+- Update to 96.43.11 (stable)
+
+* Sun Feb 22 2009 Stewart Adam <s.adam at diffingo.com> - 96.43.09-4
+- Make devel subpackage depend on lib subpackage of the same arch
+
+* Mon Nov 10 2008 kwizart < kwizart at gmail.com > - 96.43.09-3
+- Clean the spec.
+
+* Tue Nov 4 2008 Stewart Adam <s.adam at diffingo.com> - 96.43.09-2
+- Fix upgrade path for FreshRPMs users
+
+* Thu Oct 30 2008 kwizart < kwizart at gmail.com > - 96.43.09-1
+- Update to 96.43.09 (beta)
+ Preliminary support for xorg-server 1.5
+
+* Sat Jul 19 2008 Stewart Adam <s.adam at diffingo.com> - 96.43.07-1
+- Update to 96.43.07
+
+* Wed May 28 2008 Stewart Adam <s.adam at diffingo.com> - 96.43.05-5
+- Only modify modprobe.conf if it exists
+
+* Fri Feb 22 2008 Stewart Adam <s.adam AT diffingo DOT com> - 96.43.05-4
+- Fix typo in filter requires script
+
+* Wed Feb 20 2008 kwizart < kwizart at gmail.com > - 96.43.05-3
+- Fix debuginfo package creation.
+- Add libGLcore.so to the filter list.
+- Only requires versioned libGL on x86_64 (no problem on x86).
+
+* Thu Feb 7 2008 Stewart Adam <s.adam AT diffingo DOT com> - 96.43.05-2
+- Filter requires on main package so we don't pull in xorg-x11-drv-nvidia*-libs
+
+* Mon Feb 4 2008 kwizart < kwizart at gmail.com > - 96.43.05-1
+- Update to 96.43.05
+- New scheme synchronized from the main nvidia package.
+
+* Tue Nov 20 2007 Stewart Adam <s.adam AT diffingo DOT com> - 96.43.01-4
+- Add Requires: which (bz#1662)
+
+* Tue Nov 6 2007 Stewart Adam <s.adam AT diffingo DOT com> - 96.43.01-3.1
+- Fix typo in initscript (bz#1707)
+
+* Thu Nov 1 2007 Stewart Adam <s.adam AT diffingo DOT com> - 96.43.01-3
+- Initscript improvements
+- Minor bugfixes with scriptlets (don't echo "already disabled" type messages)
+
+* Wed Oct 3 2007 kwizart < kwizart at gmail.com > - 96.43.01-2
+- Strip binaries and libs even if no debug is made with F-8
+
+* Wed Oct 3 2007 kwizart < kwizart at gmail.com > - 96.43.01-1
+- Update to 96.43.01
+- Add no replace for profile.d
+
+* Sat Sep 8 2007 Stewart Adam < s.adam AT diffingo DOT com > - 1.0.9639-3
+- Fix %%post if clause (bz#1632)
+
+* Fri Jun 15 2007 kwizart < kwizart at gmail.com > - 1.0.9639-2
+- F7 SELinux fixes (continued)
+- Add a new post scriptlet to remove those legacy-layout udev files
+
+* Mon Jun 4 2007 kwizart < kwizart at gmail.com > - 1.0.9639-1
+- Update to 1.0.9639
+
+* Sat Jun 2 2007 Stewart Adam < s.adam AT diffingo DOT com > - 1.0.9631-12
+- Don't use legacy udev layout (Thanks Finalzone for the workaround)
+
+* Sat Apr 28 2007 Stewart Adam < s.adam AT diffingo DOT com > - 1.0.9631-11
+- Fixes in the config-display (vendor > majorVendor)
+
+* Fri Mar 9 2007 Stewart Adam < s.adam AT diffingo DOT com > - 1.0.9631-10
+- Fix up scriptlets a little so that 'Driver already enabled|disabled'
+ doesn't always appear on install or remove
+- Update *-config-display files for majorVendor and not plain vendor
+- Fix typo in the last changelog entry's name
+
+* Wed Mar 7 2007 Stewart Adam < s.adam AT diffingo DOT com > - 1.0.9631-9
+- Actaully move paths to 96xx, don't just rename the patches and sources
+
+* Sat Feb 24 2007 Stewart Adam < s.adam AT diffingo DOT com > - 1.0.9631-8
+- Bump for new tag
+- fi to end if!
+
+* Sat Feb 24 2007 Stewart Adam < s.adam AT diffingo DOT com > - 1.0.9631-7
+- Standardize all summaries and descriptions with other nvidia and fglrx
+ packages
+- Standardize initscript and *config-display with other nvidia and fglrx
+ packages
+- Move paths from nvidia-glx to nvidia-96xx
+- Start merge with livna-config-display
+
+* Wed Feb 7 2007 kwizart < kwizar at gmail.com > - 1.0.9631-6
+- Rebuild for Fedora Core 7 test1
+
+* Wed Jan 17 2007 kwizart < kwizart at gmail.com > - 1.0.9631-5
+- fix nvidia-glx-init directory (nvidia-96xx)
+
+* Sat Jan 13 2007 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.9631-4
+- fix obsoletes/provides
+- run ldconfig in post for libs-32bit
+- some minor cleanups
+
+* Sun Jan 7 2007 kwizart < kwizart at gmail.com > - 1.0.9631-3
+- Fix perm in SOURCES.
+- Fix ldconfig with libs-32bit
+- No debug_package
+- Drop config with ld.so.conf.d and modprobe.d cause rpmlint errors
+
+* Thu Dec 28 2006 kwizart < kwizart at gmail.com > - 1.0.9631-2
+- New legacy version named kmod-nvidia-96xx
+
+* Thu Dec 07 2006 kwizart < kwizart at gmail.com > - 1.0.9631-1
+- Update to 1.0.9631-1
+
+* Tue Nov 07 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.9629-1
+- update to release 1.0.9629
+
+* Tue Oct 31 2006 Dams <anvil[AT]livna.org> - 1.0.9626-3
+- Another nvidia-config-display update to fix dumb modules section
+
+* Tue Oct 24 2006 Dams <anvil[AT]livna.org> - 1.0.9626-2
+- Yet another updated nvidia-config-display : importing python modules
+ we use is usualy a good idea
+- Updated nvidia-config-display
+
+* Sun Oct 22 2006 Stewart Adam <s.adam AT diffingo DOT com> - 1.0.9626-1
+- update to release 1.0.9626
+
+* Fri Oct 20 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.8776-1
+- update to 1.0.8776-1 -- fixes CVE-2006-5379
+
+* Thu Aug 24 2006 Niko Mirthes (straw) <nmirthes AT gmail DOT com> - 1.0.8774-1
+- Nvidia added a png for nvidia-settings, for-loop adjusted accordingly
+- update to release 1.0.8774
+
+* Wed Aug 09 2006 Niko Mirthes (straw) <nmirthes AT gmail DOT com> - 1.0.8762-6
+- small changes to sync with legacy package
+- place nvidia-bug-report.sh in /usr/bin
+
+* Mon Aug 07 2006 Niko Mirthes (straw) <nmirthes AT gmail DOT com> - 1.0.8762-5
+- more minor changes to spacing and general layout
+
+* Fri Aug 04 2006 Niko Mirthes (straw) <nmirthes AT gmail DOT com> - 1.0.8762-4
+- minor changes to spacing, removal of random tabs, re-arrangements
+- remove GNOME category from the desktop file
+
+* Thu May 25 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.8762-3
+- Obsolete old kmods
+
+* Thu May 24 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.8762-2
+- add missing defattr to files section for sub-package libs-32bit
+
+* Wed May 24 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.8762-1
+- update to 1.0.8762
+
+* Tue May 16 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.8756-3
+- Conflict with xorg-x11-drv-fglrx and selinux-policy < 2.2.29-2.fc5
+- Ship bug-reporting tool as normal executable and not in %%doc
+
+* Sun May 14 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0.8756-2
+- Require nvidia-kmod instead of kmod-nvidia (#970).
+
+* Sat Apr 08 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.8756-1
+- Update to 8756
+- put 32bit libs in their own package
+
+* Wed Mar 29 2006 Niko Mirthes (straw) <nmirthes AT gmail DOT com> - 1.0.8178-9
+- make every use of the 'install' command consistent
+- tweak nvidia-settings' desktop file slightly
+
+* Thu Mar 23 2006 Niko Mirthes (straw) <nmirthes AT gmail DOT com> - 1.0.8178-8
+- switch to using modprobe.d rather than editing modprobe.conf directly
+
+* Sat Mar 18 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.8178-7
+- ExclusiveArch i386 and not %%{ix86} -- we don't want to build for athlon&co
+
+* Sat Mar 18 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.8178-6
+- drop unused patches
+
+* Sat Mar 18 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.8178-5
+- drop 0.lvn
+
+* Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- add dist
+
+* Wed Feb 08 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.8178-0.lvn.5
+- use lib64 in nvidia-config-display on x86-64
+- fix path to kernel module in init-script
+- add patch from Ville for nvidia-README.Fedora
+- match permissions of xorg 7
+
+* Wed Feb 01 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.8178-0.lvn.4
+- More fixes
+
+* Tue Jan 31 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.8178-0.lvn.3
+- Fix wrong provides
+
+* Mon Jan 30 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.8178-0.lvn.2
+- fix path to kernel module in nvidia-glx-init (thx to Dominik 'Rathann'
+ Mierzejewski)
+- include device files until udev works probably with kernel module
+
+* Sun Jan 22 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.8178-0.lvn.1
+- split into packages for userland and kmod
+- rename to xorg-x11-drv-nvidia; yum/rpm should use mesa-libGL{,-devel} then in
+ the future when seaching for libGL.so{,.1}
+- remove kernel-module part
+- remove old cruft
+- install stuff without Makefile because it forgets mosts a lot of files anyway
+
+* Thu Dec 22 2005 Niko Mirthes (straw) <nmirthes AT gmail DOT com> - 0:1.0.8178-0.lvn.2
+- change nvidia-glx.sh and nvidia-glx.csh to point to README.txt rather than README
+- reference xorg.conf rather than XF86Config in the init script
+- improve readability of instructions and comments, fix some typos
+- drop epoch, as it seems to be affecting dependencies according to rpmlint
+- tweak the nvidia-settings desktop file so it always shows up on the
+ menu in the right location
+- add the manual pages for nvidia-settings and nvidia-xconfig
+- remove header entries from the nvidia-glx files list. they belong in -devel
+- fix changelog entries to refer to 7676 not 7176 (though there was a 7176 x86_64
+ release prior to 7174)
+- add libXvMCNVIDIA.so
+- update to 8178
+
+* Wed Dec 07 2005 Niko Mirthes (straw) <nmirthes AT gmail DOT com> - 0:1.0.8174-0.lvn.1
+- add the manual pages for nvidia-settings and nvidia-xconfig
+- install the new nvidia-xconfig utility and associated libs
+
+* Mon Dec 05 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:1.0.8174-0.lvn.1
+- Update to 8174
+- desktop entry now Categories=Settings (#665)
+- Ship bug-reporting tool in doc (#588)
+- Things from Bug 635, Niko Mirthes (straw) <nmirthes AT gmail DOT com>:
+-- avoid changing time stamps on libs where possible
+-- only add /etc/modprobe.conf entries if they aren't already there
+-- add /etc/modprobe.conf entries one at a time
+-- only remove /etc/modprobe.conf entries at uninstall, not during upgrade
+-- avoid removing any modprobe.conf entries other than our own
+-- match Xorg's install defaults where it makes sense (0444)
+-- a few other minor tweaks to the files lists
+
+* Sun Sep 04 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:1.0.7676-0.lvn.3
+- Conflics with nvidia-glx-legacy
+- Integrate some minor correction suggested by Niko Mirthes
+ <nmirthes AT gmail DOT com> in #475
+
+* Fri Aug 26 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:1.0.7676-0.lvn.2
+- Rename src5: nvidia.init to nvidia-glx-init
+- Fix correct servicename in nvidia-glx-init
+- Run nvidia-glx-init before gdm-early-login; del and readd the script
+ during post
+
+* Sun Aug 21 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:1.0.7676-0.lvn.1
+- Update to 7676
+- Lots of cleanup from me and Niko Mirthes <nmirthes AT gmail DOT com>
+- add NVreg_ModifyDeviceFiles=0 to modprobe.conf (Niko)
+- Drop support for FC2
+- Nearly proper Udev-Support with workarounds around FC-Bug 151527
+
+* Fri Jun 17 2005 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.7174-0.lvn.5
+- Slight change of modprobe.conf rexexp
+
+* Thu Jun 16 2005 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.7174-0.lvn.4
+- Fixed a critical bug in modprobe.conf editing where all lines starting with alias and
+ ending with then a word starting with any of the letters n,v,i,d,i,a,N,V,r,e is removed.
+
+* Mon Jun 13 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:1.0.7174-0.lvn.3
+- Adjust kenrnel-module-stuff for FC4
+- Ship both x86 and x64 in the SRPM
+
+* Sun Jun 12 2005 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.7174-0.lvn.2
+- Only create 16 devices
+- Put libXvMCNVIDIA.a in -devel
+- Don't remove nvidia options in /etc/modprobe.conf
+- Make ld.so.conf file config(noreplace)
+- Use same directory permissions as the kernel
+
+* Sat Apr 2 2005 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.7174-0.lvn.1
+- New upstream release, 7174
+
+* Wed Mar 30 2005 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.7167-0.lvn.5
+- Added x86_64 support patch from Thorsten Leemhuis
+
+* Wed Mar 23 2005 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.7167-0.lvn.4
+- Fix kernel module permissions again (644)
+- Only create 16 /dev/nvidia* devices, 256 is unnecessary
+
+* Fri Mar 18 2005 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.7167-0.lvn.3
+- Fixed kernel-module permissions
+
+* Thu Mar 17 2005 Dams <anvil[AT]livna.org> 0:1.0.7167-0.lvn.2
+- Removed provides on kernel-module and kernel-modules
+
+* Sat Mar 05 2005 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.7167-0.lvn.1
+- New upstream release 1.0.7167
+- Added patch from http://www.nvnews.net/vbulletin/showthread.php?t=47405
+- Removed old patch against 2.6.9
+
+* Sat Feb 05 2005 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6629-0.lvn.7
+- Added a number of post-6629 patches from http://www.minion.de/files/1.0-6629
+- Fixed permissions of nvidia/nvidia.ko
+
+* Fri Jan 21 2005 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6629-0.lvn.6
+- Fix incorrect MAKDEV behaviour and dependency
+
+* Tue Nov 30 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6629-0.lvn.4
+- Fixed creation of /dev/nvidia* on FC2
+
+* Sat Nov 27 2004 Dams <anvil[AT]livna.org> - 0:1.0.6629-0.lvn.3
+- Dont try to print kvariant in description when it's not defined.
+
+* Sun Nov 21 2004 Thorsten Leemhuis <fedora at leemhuis dot info> - 0:1.0.6629-0.lvn.2
+- resulting kernel-module package now depends again on /root/vmlinuz-<kernelver>
+- Use rpmbuildtags driverp and kernelp
+
+* Sat Nov 06 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6629-0.lvn.1
+- New upstream version, 1.0-6629
+- Build without kernel-module-devel by default
+
+* Fri Oct 29 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6111-0.lvn.6
+- Make n-c-display handle misc problems in a better way
+- Fixed wrong icon file name in .desktop file
+- Re-added the mysteriously vanished sleep line in the init script
+ when kernel module wasn't present
+
+* Fri Oct 22 2004 Thorsten Leemhuis <fedora at leemhuis dot info> - 0:1.0.6111-0.lvn.5
+- Use fedora-kmodhelper in the way ntfs or ati-fglrx use it
+- Allow rpm to strip the kernel module. Does not safe that much space ATM but
+ might be a good idea
+- Allow to build driver and kernel-module packages independent of each other
+- Some minor spec-file changes
+
+* Thu Oct 21 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6111-0.lvn.4
+- udev fixes
+- Incorporated fix for missing include line in ld.so.conf from ati-fglrx spec (T Leemhuis)
+
+* Sun Sep 19 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6111-0.lvn.3
+- Remove FC1/kernel 2.4 compability
+- Rename srpm to nvidia-glx
+- Build with kernel-module-devel
+
+* Sun Aug 15 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6111-0.lvn.2
+- Restore ldsoconfd macro
+- Disable autoamtic removal of scripted installation for now; needs testing
+
+* Sat Aug 14 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6111-0.lvn.1
+- Upstream release 6111
+- Fixed init script (again)
+
+* Tue Aug 3 2004 Dams <anvil[AT]livna.org> 0:1.0.6106-0.lvn.4
+- ld.so.conf.d directory detected by spec file
+- Using nvidialibdir in nvidia-glx-devel files section
+- Got rid of yarrow and tettnang macros
+- libGL.so.1 symlink in tls directory always present
+
+* Mon Jul 19 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6106-0.lvn.3
+- Fixed script bug that would empty prelink.conf
+- Added symlink to non-tls libGL.so.1 on FC1
+
+* Tue Jul 13 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6106-0.lvn.2.3
+- Updated init script to reflect name change -xfree86 -> -display
+
+* Mon Jul 12 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6106-0.lvn.2.2
+- Fixed backup file naming
+
+* Sun Jul 11 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6106-0.lvn.2.1
+- Restore working macros
+- Always package the gui tool
+
+* Sun Jul 11 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6106-0.lvn.2
+- Renamed nvidia-config-xfree86 to nvidia-config-display
+- Fixed symlinks
+- Use ld.so.conf.d on FC2
+- Remove script installation in pre
+- Use system-config-display icon for nvidia-settings
+- 2 second delay in init script when kernel module not found
+- Make nvidia-config-display fail more gracefully
+- Add blacklist entry to prelink.conf on FC1
+
+* Mon Jul 05 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6106-0.lvn.1
+- New upstream release
+- First attempt to support FC2
+- Dropped dependency on XFree86
+
+* Mon Feb 09 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.5336-0.lvn.3
+- Use pkg0
+
+* Sun Feb 08 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.5336-0.lvn.2
+- New Makefile variable SYSSRC to point to kernel sources.
+- kmodhelper fixes.
+
+* Fri Jan 30 2004 Keith G. Robertson-Turner <nvidia-devel[AT]genesis-x.nildram.co.uk> 0:1.0.5336-0.lvn.1
+- New upstream release
+- Removed (now obsolete) kernel-2.6 patch
+- Install target changed upstream, from "nvidia.o" to "module"
+- Linked nv/Makefile.kbuild to (now missing) nv/Makefile
+
+* Sun Jan 25 2004 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.18
+- Updated nvidia-config-display
+- Now requiring pyxf86config
+
+* Mon Jan 19 2004 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.17
+- Added nvidiasettings macro to enable/disable gui packaging
+
+* Mon Jan 19 2004 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.16
+- Updated minion.de patches
+- Added some explicit requires
+- Test nvidia-config-xfree86 presence in kernel-module package
+ scriptlets
+
+* Mon Jan 12 2004 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.15
+- Updated Readme.fedora
+- nvidia-glx-devel package
+
+* Sat Jan 3 2004 Dams <anvil[AT]livna.org> 0:1.0.5328-0.lvn.14
+- Hopefully fixed kernel variant thingy
+
+* Fri Jan 2 2004 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.13
+- Support for other kernel variants (bigmem, etc..)
+- Changed URL in Source0
+
+* Tue Dec 30 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.13
+- Dropped nvidia pkgX information in release tag.
+
+* Tue Dec 30 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.12.pkg0
+- Renamed kernel module package in a kernel-module-nvidia-`uname -r` way
+- Using fedora.us kmodhelper for kernel macro
+- Using nvidia pkg0 archive
+
+* Sun Dec 21 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.11.pkg1
+- kernel-module-nvidia package provides kernel-module
+- We wont own devices anymore. And we wont re-create them if they are
+ already present
+
+* Sun Dec 21 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.10.pkg1
+- Yet another initscript update. Really.
+- Scriptlets updated too
+
+* Sun Dec 21 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.9.pkg1
+- Fixed alias in modprobe.conf for 2.6
+
+* Sun Dec 21 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.8.pkg1
+- Another initscript update
+
+* Sun Dec 21 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.7.pkg1
+- kernel module requires kernel same kversion
+- initscript updated again
+- Dont conflict, nor obsolete XFree86-Mesa-libGL. Using ld.so.conf to
+ make libGL from nvidia first found. Hope Mike Harris will appreciate.
+
+* Sun Dec 21 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.6.pkg1
+- kernel-module-nvidia requires kernel same version-release
+
+* Sat Dec 20 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.6.pkg1
+- Updated initscript
+
+* Fri Dec 19 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.5.pkg1
+- lvn repository tag
+
+* Fri Dec 19 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.fdr.5.pkg1
+- Added initscript to toggle nvidia driver according to running kernel
+ and installed kernel-module-nvidia packages
+- Updated scriptlets
+
+* Thu Dec 18 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.fdr.4.pkg1
+- Arch detection
+- Url in patch0
+
+* Tue Dec 16 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.fdr.3.pkg1
+- Desktop entry for nvidia-settings
+- s/kernel-module-{name}/kernel-module-nvidia
+- nvidia-glx doesnt requires kernel-module-nvidia-driver anymore
+- Using modprobe.conf for 2.6 kernel
+- Hopefully fixed symlinks
+
+* Mon Dec 15 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.fdr.2.pkg1
+- Building kernel module for defined kernel
+- kernel module for 2.6 is nvidia.ko
+- Patch not to install kernel module on make install
+- Updated patch for 2.6
+- depmod in scriptlet for defined kernel
+- nvidia-glx conflicting XFree86-Mesa-libGL because we 0wn all its
+ symlink now
+- Dont override libGL.so symlink because it belongs to XFree86-devel
+- Added nvidia 'pkgfoo' info to packages release
+- Spec file cleanup
+
+* Fri Dec 12 2003 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.4620-0.fdr.2
+- Fixed repairing of a link in post-uninstall
+- Obsolete Mesa instead of Conflict with it, enables automatic removal.
+
+* Mon Dec 08 2003 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.4620-0.fdr.1
+- Added support for 2.6 kernels
+- Cleaned up build section, removed the need for patching Makefiles.
+- Added missing BuildReq gcc32
+- Don't package libs twice, only in /usr/lib/tls/nvidia
+- Made config cript executable and put it into /usr/sbin
+- Moved kernel module to kernel/drivers/video/nvidia/
+- Fixed libGL.so and libGLcore.so.1 links to allow linking against OpenGL libraries
+
+* Mon Dec 08 2003 Keith G. Robertson-Turner <nvidia-devel at genesis-x.nildram.co.uk> - 0:1.0.4620-0.fdr.0
+- New beta 4620 driver
+- New GUI control panel
+- Some minor fixes
+
+* Thu Nov 20 2003 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.4496-0.fdr.10.1
+- Finally fixed SMP builds.
+
+* Wed Nov 19 2003 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.4496-0.fdr.9
+- Don't make nvidia-glx depend on kernel-smp
+
+* Tue Nov 18 2003 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.4496-0.fdr.8
+- Some build fixes
+
+* Tue Nov 11 2003 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.4496-0.fdr.7
+- Added CC=gcc32
+- Fixed upgrading issue
+- Added driver switching capabilities to config script.
+
+* Fri Nov 07 2003 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.4496-0.fdr.4
+- Added conflict with XFree86-Mesa-libGL.
+- Disabled showing of the README.Fedora after installation.
+
+* Sun Oct 12 2003 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.4496-0.fdr.3
+- Added NVidia configuration script written in Python.
+- Some cleanup of files section
+- For more info, see https://bugzilla.fedora.us/show_bug.cgi?id=402
+
+* Tue Jul 08 2003 Andreas Bierfert (awjb) <andreas.bierfert[AT]awbsworld.de> - 0:1.0.4363-0.fdr.2
+- renamed /sbin/makedevices.sh /sbin/nvidia-makedevices.sh ( noticed by
+ Panu Matilainen )
+- Fixed name problem
+* Sun Jun 22 2003 Andreas Bierfert (awjb) <andreas.bierfert[AT]awbsworld.de> - 0:1.0.4363-0.fdr.1
+- Initial RPM release, still some ugly stuff in there but should work...
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-96xx/F-14/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 14 Nov 2009 21:34:55 -0000 1.5
+++ .cvsignore 3 Nov 2010 16:08:36 -0000 1.6
@@ -1,2 +1,2 @@
-NVIDIA-Linux-x86-96.43.14-pkg0.run
-NVIDIA-Linux-x86_64-96.43.14-pkg0.run
+NVIDIA-Linux-x86-96.43.19-pkg0.run
+NVIDIA-Linux-x86_64-96.43.19-pkg0.run
--- dead.package DELETED ---
13 years, 10 months
rpms/xorg-x11-drv-nvidia-96xx/F-13 blacklist-nouveau.conf, 1.4, 1.5 filter-provides.sh, 1.2, 1.3 filter-requires.sh, 1.4, 1.5 nvidia-96xx-README.Fedora, 1.4, 1.5 nvidia-96xx-config-display, 1.4, 1.5 nvidia-96xx-init, 1.4, 1.5 sources, 1.6, 1.7 xorg-x11-drv-nvidia-96xx.spec, 1.18, 1.19 .cvsignore, 1.5, 1.6 dead.package, 1.1, NONE
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-serv18318/F-13
Modified Files:
.cvsignore
Added Files:
blacklist-nouveau.conf filter-provides.sh filter-requires.sh
nvidia-96xx-README.Fedora nvidia-96xx-config-display
nvidia-96xx-init sources xorg-x11-drv-nvidia-96xx.spec
Removed Files:
dead.package
Log Message:
Re-import F-13 branch now that Xorg server is supported.
Index: blacklist-nouveau.conf
===================================================================
RCS file: blacklist-nouveau.conf
diff -N blacklist-nouveau.conf
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ blacklist-nouveau.conf 3 Nov 2010 16:02:19 -0000 1.5
@@ -0,0 +1,4 @@
+# RPM Fusion blacklist for nouveau driver - you need to run as root:
+# dracut -f /boot/initramfs-$(uname -r).img $(uname -r)
+# if nouveau is loaded despite this file.
+blacklist nouveau
Index: filter-provides.sh
===================================================================
RCS file: filter-provides.sh
diff -N filter-provides.sh
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ filter-provides.sh 3 Nov 2010 16:02:19 -0000 1.3
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+if [ -x /usr/lib/rpm/redhat/find-provides ]; then
+ FINDPROV=/usr/lib/rpm/redhat/find-provides
+else
+ FINDPROV=/usr/lib/rpm/find-provides
+fi
+
+$FINDPROV $* | sed -e '/libnvidia-tls.so/d' | sed -e '/libGLcore.so/d' | sed -e '/libGL.so/d'
+
Index: filter-requires.sh
===================================================================
RCS file: filter-requires.sh
diff -N filter-requires.sh
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ filter-requires.sh 3 Nov 2010 16:02:19 -0000 1.5
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+if [ -x /usr/lib/rpm/redhat/find-requires ]; then
+ FINDREQ=/usr/lib/rpm/redhat/find-requires
+else
+ FINDREQ=/usr/lib/rpm/find-requires
+fi
+
+$FINDREQ $* | sed -e '/libnvidia-tls.so/d' | sed -e '/libGLcore.so/d' | sed -e '/libGL.so/d'
+
Index: nvidia-96xx-README.Fedora
===================================================================
RCS file: nvidia-96xx-README.Fedora
diff -N nvidia-96xx-README.Fedora
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ nvidia-96xx-README.Fedora 3 Nov 2010 16:02:19 -0000 1.5
@@ -0,0 +1,112 @@
+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.
Index: nvidia-96xx-config-display
===================================================================
RCS file: nvidia-96xx-config-display
diff -N nvidia-96xx-config-display
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ nvidia-96xx-config-display 3 Nov 2010 16:02:19 -0000 1.5
@@ -0,0 +1,146 @@
+#!/usr/bin/python -tt
+# -*- coding: UTF-8 -*-
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 only
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Library General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# Copyright 2003, 2004 Peter Backlund
+# Copyright 2004 Thorsten Leemhuis
+# Copyright 2006 Van Assche Alphonse
+# Copyright 2006, 2007 Stewart Adam
+
+import string
+import os
+import sys
+
+from livnaConfigDisplay.const import *
+from livnaConfigDisplay.const import _
+
+import livnaConfigDisplay.ConfigDisplay
+from livnaConfigDisplay.GlxConfig import *
+from livnaConfigDisplay import Utils
+from livnaConfigDisplay.ConfigFile import ConfigFile
+
+class nvidiaConfigDisplay(GlxConfig):
+ def __init__(self):
+ GlxConfig.__init__(self)
+ self.vendor = 'nvidia-96xx'
+ self.majorVendor = Utils.getMajorVendor()
+ if self.vendor != Utils.getVendor():
+ print _('The initscript and installed driver vendors do not match!')
+ sys.exit(1)
+ self.ldconf = LD_CONF_FILE % (self.vendor)
+ try:
+ self.doAllBackups()
+ except livnaConfigDisplayError, (bkupErrMsg):
+ print bkupErrMsg
+ sys.exit(1)
+ self.xconfig, self.xconfigpath = self.loadXconfig()
+ self.config = ConfigFile(STATUS_FILE)
+ self.TOP_MOD_DIR = self.getModTopDir()
+
+ # finally, run arg checks.
+ self.run()
+
+
+ def enable(self, isAutoConfigure = True):
+ # Backup the file before make any change.
+ currentDriver = self.getDriver()
+ # Already enabled?
+ if currentDriver == self.majorVendor:
+ print _('Driver already enabled.')
+ return
+ # nVidia modules
+ self.addModulePath("/extensions/nvidia", self.TOP_MOD_DIR)
+ # 'remembering' magic's in here.
+ self.config.setOldDriver(currentDriver)
+ #currentDriver = self.config.getOldDriver()
+ self.toggleDriver(currentDriver, self.majorVendor)
+ # Disable dri and GLcore modules - these are no
+ self.removeModule("dri")
+ self.removeModule("GLcore")
+ # Add glx/dbe/extmod modules when modules section exists
+ if self.xconfig.modules:
+ for module in ["glx", "dbe", "extmod"]:
+ if self.onlyHasModule(module):
+ self.removeModule(module)
+ break
+ else:
+ self.addModule(module)
+ # Problems with Compiz without these.
+ self.addOption(self.majorVendor,"AddARGBGLXVisuals", "True")
+ #self.addOption(self.majorVendor,"DisableGLXRootClipping", "True")
+ Utils.writeXorgConf(self.xconfig, self.xconfigpath)
+ # We have to read saved status file to restore the Xorg configuration.
+ self.restoreconf()
+
+
+ def disable(self, isAutoConfigure = True):
+ self.removeModulePath("/extensions/nvidia", self.TOP_MOD_DIR)
+ # Check if it's already disabled
+ if self.getDriver() != self.majorVendor:
+ print _('Driver already disabled.')
+ return
+ # Backup the file before make any change.
+ prevDriver = self.config.getOldDriver()
+ if prevDriver == self.majorVendor:
+ print _('Will not allow reverting from driver \'%s\' to \'%s\'.') % (self.vendor, self.vendor)
+ print _('Using the \'nouveau\' driver instead.')
+ prevDriver = "nouveau"
+ self.config.setOldDriver("nouveau")
+ self.removeOption(self.majorVendor,"AddARGBGLXVisuals")
+ self.removeOption(self.majorVendor,"DisableGLXRootClipping")
+ self.toggleDriver(self.majorVendor, prevDriver)
+ Utils.writeXorgConf(self.xconfig, self.xconfigpath)
+ # We have to save the status file so it can be restored later
+ self.storeconf()
+ # And return to the Fedora default.
+ self.enableAiglx()
+
+ def printUsage(self):
+ print _("Usage: ") + self.vendor + _("-config-display [ enable|disable ]")
+
+ def run(self):
+ # Check number of arguments
+ # arg = action
+ if len(sys.argv) == 2:
+ arg = sys.argv[1]
+ else:
+ print _('Wrong number of arguments')
+ self.printUsage()
+ sys.exit(1)
+ # Check value of argument
+ if arg.lower() != "enable" and arg.lower() != "disable":
+ print _('Invalid command: %s') % arg.lower()
+ self.printUsage()
+ sys.exit(1)
+ try:
+ if arg == "enable":
+ if self.getActive():
+ self.enable()
+ else:
+ print _('livna-config-display\'s `active\' state is False - Exiting')
+ elif arg == "disable":
+ if self.getActive():
+ self.disable()
+ except:
+ raise # Uncomment me to show the real error
+ print MSG_CONF_APPLY_ERROR
+ try:
+ self.doAllRestores()
+ sys.exit(1)
+ except livnaConfigDisplayError, (bkupErrMsg):
+ #raise # Uncomment me to show the real error
+ print MSG_CONF_RESTORE_ERROR + '\n' + MSG_TRACEBACK % (str(errMsg)) + '\n\n' + str(bkupErrMsg)
+ sys.exit(1)
+
+app = nvidiaConfigDisplay()
Index: nvidia-96xx-init
===================================================================
RCS file: nvidia-96xx-init
diff -N nvidia-96xx-init
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ nvidia-96xx-init 3 Nov 2010 16:02:19 -0000 1.5
@@ -0,0 +1,120 @@
+#!/bin/sh
+#
+# chkconfig: 2345 8 92
+# description: This script will check if a nvidia 96xx kernel module is\
+# present for the running kernel and modify the xorg.conf to \
+# the appropriate configuration.
+
+# Source function library.
+. /etc/rc.d/init.d/functions
+
+name='nvidia-96xx'
+exec="/usr/sbin/$name-config-display"
+prog="`basename $exec`"
+lockfile="/var/lock/subsys/$name"
+
+RETVAL=0
+modname="nvidia.ko"
+modpath="/lib/modules/$(uname -r)"
+# Default to no module
+module="noneWithSomeCrazyNameSoItsNeverFound"
+# If one exists, then use it.
+if test -e "${modpath}/extra/${modname}";then
+ module="${modpath}/extra/${modname}"
+elif test -e "${modpath}/extra/nvidia/${modname}";then
+ module="${modpath}/extra/nvidia/${modname}"
+elif test -e "${modpath}/kernel/drivers/video/nvidia/${modname}";then
+ module="${modpath}/kernel/drivers/video/nvidia/${modname}"
+elif test -e "${modpath}/extra/nvidia-96xx/${modname}";then
+ module="${modpath}/extra/nvidia-96xx/${modname}"
+elif test -e "${modpath}/kernel/drivers/video/nvidia-96xx/${modname}";then
+ module="${modpath}/kernel/drivers/video/nvidia-96xx/${modname}"
+fi
+
+# Try to modify the below the least possible. If you need to change something, try
+# using the variables above first, as most of the program control is based on
+# the variables above. If something really needs to be changed, try to make
+# the change in all the drivers for the sake of consistency.
+
+# We shouldn't use lock files anymore because the lock file
+# doesn't mean a driver is disabled or enabled. For example, we start()
+# at boot and enable the driver. start() makes a lock file. We stop() on
+# shutdown, which removes the lock file. But what if the user ran *config-display
+# manually? Or if we don't `*config-display disable` in stop()?
+
+start() {
+ if action $"Checking for module $modname:" test -f $module;then
+ action $"Enabling the $name driver:" $exec enable
+ RETVAL=$?
+ else
+ echo -en $"$modname for kernel $(uname -r) was not found." && echo_warning;echo -en '\n'
+ echo -en $"The $name driver will not be enabled until one is found." && echo_warning;echo -en '\n'
+ $exec disable
+ RETVAL=1
+ fi
+ if [ "$RETVAL" -eq "0" ];then
+ #touch $lockfile
+ # this is a nothing assignment so that bash doesn't complain.
+ RETVAL=0
+ else
+ # Let them read the errors or warnings
+ sleep 3
+ fi
+ return
+}
+
+stop() {
+ #action $"Disabling the $name driver:" $exec disable
+ #RETVAL=$?
+ RETVAL=0
+ #if [ "$RETVAL" -eq 0 ];then
+ # rm -f $lockfile
+ #fi
+ return
+}
+
+restart() {
+ stop
+ start
+}
+
+reload() {
+ restart
+}
+
+status() {
+ #if [ -e $lockfile ];then
+ if [ -f $module ] && lsmod | grep ^${modname%%.ko} &>/dev/null ;then
+ echo $"$modname for kernel $(uname -r) was found."
+ echo $"The driver is enabled."
+ else
+ echo $"$modname for kernel $(uname -r) was not found."
+ echo $"The $name driver cannot be enabled until one is found."
+ fi
+ #else
+ # echo $"The $name driver has not been enabled."
+ #fi
+ RETVAL=0
+}
+
+fdrstatus() {
+ status $prog
+}
+
+case "$1" in
+ start|stop|restart|reload)
+ $1
+ ;;
+ status)
+ fdrstatus
+ ;;
+ condrestart)
+ restart
+ ;;
+ *)
+ echo $"Usage: $0 {start|stop|status|restart|condrestart|reload}"
+ exit 1
+ ;;
+esac
+
+exit $RETVAL
Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ sources 3 Nov 2010 16:02:19 -0000 1.7
@@ -0,0 +1,2 @@
+53e98129d885a1b004aabc42a989fa73 NVIDIA-Linux-x86-96.43.19-pkg0.run
+7ff779e299b938b880baff6cd970ab51 NVIDIA-Linux-x86_64-96.43.19-pkg0.run
Index: xorg-x11-drv-nvidia-96xx.spec
===================================================================
RCS file: xorg-x11-drv-nvidia-96xx.spec
diff -N xorg-x11-drv-nvidia-96xx.spec
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ xorg-x11-drv-nvidia-96xx.spec 3 Nov 2010 16:02:19 -0000 1.19
@@ -0,0 +1,865 @@
+%define nvidialibdir %{_libdir}/nvidia
+
+# Tweak to have debuginfo - part 1/2
+%if 0%{?fedora} >= 7
+%define __debug_install_post %{_builddir}/%{?buildsubdir}/find-debuginfo.sh %{_builddir}/%{?buildsubdir}\
+%{nil}
+%endif
+
+Name: xorg-x11-drv-nvidia-96xx
+Version: 96.43.19
+Release: 1%{?dist}
+Summary: NVIDIA's 96xx series proprietary display driver for NVIDIA graphic cards
+
+Group: User Interface/X Hardware Support
+License: Redistributable, no modification permitted
+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
+Source6: blacklist-nouveau.conf
+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.
+Source92: filter-provides.sh
+%define _use_internal_dependency_generator 0
+%define __find_requires %{SOURCE91}
+%define __find_provides %{SOURCE92}
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%if 0%{?fedora} > 11 || 0%{?rhel} > 5
+ExclusiveArch: i686 x86_64
+%else 0%{?fedora} == 11
+ExclusiveArch: i586 x86_64
+%else
+ExclusiveArch: i386 x86_64
+%endif
+Requires: nvidia-xconfig
+Requires: nvidia-settings
+
+Requires: nvidia-96xx-kmod >= %{version}
+Requires(post): nvidia-96xx-kmod >= %{version}
+
+# Needed in all nvidia or fglrx driver packages
+BuildRequires: prelink
+Requires: which
+Requires: livna-config-display
+Requires: %{name}-libs-%{_target_cpu} = %{version}-%{release}
+
+Requires(post): livna-config-display
+Requires(preun): livna-config-display
+Requires(post): chkconfig
+Requires(post): ldconfig
+Requires(preun): chkconfig
+
+Provides: nvidia-96xx-kmod-common = %{version}
+
+Conflicts: xorg-x11-drv-nvidia-legacy
+Conflicts: xorg-x11-drv-nvidia-beta
+Conflicts: xorg-x11-drv-nvidia-newest
+Conflicts: xorg-x11-drv-nvidia-173xx
+Conflicts: xorg-x11-drv-nvidia-71xx
+Conflicts: xorg-x11-drv-nvidia
+Conflicts: xorg-x11-drv-fglrx
+
+Obsoletes: nvidia-96xx-kmod < %{version}
+
+Obsoletes: nvidia-x11-drv-96xx < %{version}-%{release}
+Provides: nvidia-x11-drv-96xx = %{version}-%{release}
+
+%description
+This package provides the legacy NVIDIA display driver of the 96xx serie
+which allows for hardware accelerated rendering with NVIDIA chipsets
+Legacy releases for GeForce 2 through GeForce 4 series GPUs.
+GeForce 8 and above are NOT supported by this release.
+
+For the full product support list, please consult the release notes
+for driver version %{version}.
+
+
+%package devel
+Summary: Development files for %{name}
+Group: Development/Libraries
+Requires: %{name}-libs-%{_target_cpu} = %{version}-%{release}
+
+%description devel
+This package provides the development files of the %{name} package,
+such as OpenGL headers.
+
+%package libs
+Summary: Libraries for %{name}
+Group: User Interface/X Hardware Support
+Requires: %{name} = %{version}-%{release}
+Provides: %{name}-libs-%{_target_cpu} = %{version}-%{release}
+%ifarch %{ix86}
+Provides: %{name}-libs-32bit = %{version}-%{release}
+Obsoletes: %{name}-libs-32bit <= %{version}-%{release}
+%endif
+
+%description libs
+This package provides the shared libraries for %{name}.
+
+
+%prep
+%setup -q -c -T
+sh %{SOURCE0} --extract-only --target nvidiapkg-x86
+sh %{SOURCE1} --extract-only --target nvidiapkg-x64
+tar -cjf nvidia-kmod-data-%{version}.tar.bz2 nvidiapkg-*/LICENSE nvidiapkg-*/usr/src/
+
+# Tweak to have debuginfo - part 2/2
+%if 0%{?fedora} >= 7
+cp -p %{_prefix}/lib/rpm/find-debuginfo.sh .
+sed -i -e 's|strict=true|strict=false|' find-debuginfo.sh
+%endif
+
+%ifarch %{ix86}
+ln -s nvidiapkg-x86 nvidiapkg
+%else
+ln -s nvidiapkg-x64 nvidiapkg
+%endif
+mv nvidiapkg/LICENSE nvidiapkg/usr/share/doc/
+# More docs
+cp %{SOURCE11} nvidiapkg/usr/share/doc/README.Fedora
+find nvidiapkg/usr/share/doc/ -type f | xargs chmod 0644
+
+
+%build
+# Nothing to build
+echo "Nothing to build"
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+set +x
+for file in $(cd nvidiapkg &> /dev/null; find . -type f | grep -v -e 'makeself.sh$' -e 'mkprecompiled$' -e 'tls_test$' -e 'tls_test_dso.so$' -e 'nvidia-settings.desktop$' -e '^./Makefile' -e '^./nvidia-installer' -e '^./pkg-history.txt' -e '^./.manifest' -e '/usr/share/doc/' -e 'libGL.la$' -e 'drivers/nvidia_drv.o$' -e 'nvidia-installer.1.gz$' -e '^./usr/src/')
+do
+ if [[ ! "/${file##./usr/lib/}" = "/${file}" ]]
+ then
+ install -D -p -m 0755 nvidiapkg/${file} $RPM_BUILD_ROOT/%{nvidialibdir}/${file##./usr/lib/}
+ elif [[ ! "/${file##./usr/X11R6/lib/modules/extensions}" = "/${file}" ]]
+ then
+ install -D -p -m 0755 nvidiapkg/${file} $RPM_BUILD_ROOT/%{_libdir}/xorg/modules/extensions/nvidia/${file##./usr/X11R6/lib/modules/extensions}
+ elif [[ ! "/${file##./usr/X11R6/lib/modules}" = "/${file}" ]]
+ then
+ install -D -p -m 0755 nvidiapkg/${file} $RPM_BUILD_ROOT/%{_libdir}/xorg/modules/${file##./usr/X11R6/lib/modules}
+ elif [[ ! "/${file##./usr/X11R6/lib/}" = "/${file}" ]]
+ then
+ install -D -p -m 0755 nvidiapkg/${file} $RPM_BUILD_ROOT/%{nvidialibdir}/${file##./usr/X11R6/lib/}
+ elif [[ ! "/${file##./usr/include/}" = "/${file}" ]]
+ then
+ install -D -p -m 0644 nvidiapkg/${file} $RPM_BUILD_ROOT/%{_includedir}/nvidia/${file##./usr/include/}
+ elif [[ ! "/${file##./usr/bin/}" = "/${file}" ]]
+ then
+ if [[ ! "/${file##./usr/bin/nvidia-xconfig}" = "/${file}" ]]
+ then
+ install -D -p -m 0755 nvidiapkg/${file} $RPM_BUILD_ROOT/usr/sbin/${file##./usr/bin/}
+ elif [[ ! "/${file##./usr/bin/nvidia-bug-report.sh}" = "/${file}" ]]
+ then
+ install -D -p -m 0755 nvidiapkg/${file} $RPM_BUILD_ROOT/usr/bin/${file##./usr/bin/}
+ else
+ install -D -p -m 0755 nvidiapkg/${file} $RPM_BUILD_ROOT/${file}
+ fi
+ elif [[ ! "/${file##./usr/share/man/}" = "/${file}" ]]
+ then
+ install -D -p -m 0644 nvidiapkg/${file} $RPM_BUILD_ROOT/%{_mandir}/${file##./usr/share/man/}
+ gunzip $RPM_BUILD_ROOT/%{_mandir}/${file##./usr/share/man/}
+ elif [[ ! "/${file##./usr/share/pixmaps/}" = "/${file}" ]]
+ then
+ install -D -p -m 0644 nvidiapkg/${file} $RPM_BUILD_ROOT/%{_datadir}/pixmaps/${file##./usr/share/pixmaps/}
+ else
+ echo ${file} found -- don\'t know how to handle
+ exit 1
+ fi
+done
+set -x
+
+# Change perms on static libs. Can't fathom how to do it nicely above.
+find $RPM_BUILD_ROOT/%{nvidialibdir} -type f -name "*.a" -exec chmod 0644 '{}' \;
+
+# Fixme: should we do this directly in above for-loop? Yes, we should! No, please don't!
+ln -s libGLcore.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libGLcore.so
+ln -s libGLcore.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libGLcore.so.1
+ln -s libGL.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libGL.so
+ln -s libGL.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libGL.so.1
+ln -s libnvidia-tls.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libnvidia-tls.so.1
+ln -s libnvidia-tls.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/tls/libnvidia-tls.so.1
+ln -s libnvidia-cfg.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libnvidia-cfg.so.1
+ln -s libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libXvMCNVIDIA.so
+ln -s libXvMCNVIDIA.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libXvMCNVIDIA_dynamic.so.1
+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 initscript
+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/
+install -pm 0644 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/
+
+# ld.so.conf.d file
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
+echo "%{nvidialibdir}" > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia-96xx-%{_lib}.conf
+
+# Remove execstack needs on F-12 and laters
+%if 0
+find $RPM_BUILD_ROOT%{nvidialibdir} -name '*.so.*' -type f -exec execstack -c {} ';'
+execstack -c $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions/nvidia/libglx.so.%{version}
+execstack -c $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/nvidia_drv.so
+%ifarch x86_64
+execstack -c $RPM_BUILD_ROOT%{_bindir}/nvidia-settings
+execstack -c $RPM_BUILD_ROOT%{_sbindir}/nvidia-xconfig
+%endif
+%endif
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%post
+if [ "$1" -eq "1" ]; then
+ # Enable nvidia driver when installing
+ %{_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 ||:
+ 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
+if [ -x /usr/sbin/setsebool ] ; then
+ SELINUXEXECSTACK=`cat /selinux/booleans/allow_execstack 2>/dev/null`
+ if [ "${SELINUXEXECSTACK}" == "0 0" ] ; then
+ /usr/sbin/setsebool -P allow_execstack on &>/dev/null
+ fi
+fi ||:
+
+%post libs -p /sbin/ldconfig
+
+%preun
+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 ||:
+fi ||:
+
+%postun libs -p /sbin/ldconfig
+
+%files
+%defattr(-,root,root,-)
+%doc nvidiapkg/usr/share/doc/*
+%config(noreplace) %{_sysconfdir}/modprobe.d/blacklist-nouveau.conf
+%{_initrddir}/nvidia-96xx
+%exclude %{_bindir}/nvidia-settings
+%exclude %{_sbindir}/nvidia-xconfig
+%{_bindir}/nvidia-bug-report.sh
+%{_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
+%{_libdir}/xorg/modules/extensions/nvidia/*.so*
+#/no_multilib
+%{_datadir}/pixmaps/*.png
+%exclude %{_mandir}/man1/nvidia-settings.*
+%exclude %{_mandir}/man1/nvidia-xconfig.*
+
+%files libs
+%defattr(-,root,root,-)
+%config %{_sysconfdir}/ld.so.conf.d/nvidia-96xx-%{_lib}.conf
+%dir %{nvidialibdir}
+%dir %{nvidialibdir}/tls
+%{nvidialibdir}/*.so.*
+%{nvidialibdir}/tls/*.so.*
+
+%files devel
+%defattr(-,root,root,-)
+%dir %{_includedir}/nvidia
+%dir %{_includedir}/nvidia/GL
+%{_includedir}/nvidia/GL/*.h
+%{nvidialibdir}/libXvMCNVIDIA.a
+%{nvidialibdir}/*.so
+
+
+%changelog
+* Wed Nov 03 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 96.43.19-1
+- Update to 96.43.19
+
+* Sat Aug 14 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 96.43.18-1
+- Update to 96.43.18
+- Fallback to nouveau instead of nv
+- Add post section to change boot option with grubby
+- Add post section Enabled Selinux allow_execstack boolean.
+
+* Sat Mar 27 2010 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 96.43.16-1
+- Update to 96.43.16
+
+* Fri Nov 27 2009 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 96.43.14-3
+- Remove duplicate desktop file
+
+* Tue Nov 24 2009 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 96.43.14-2
+- Use nvidia-xconfig and nvidia-settings built from sources.
+
+* Sat Nov 14 2009 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 96.43.14-1
+- Update to 96.43.14
+- Update blacklist-nouveau.conf for F-12
+- Remove execstack on nvidia binaries and libraries.
+
+* Sat Oct 10 2009 kwizart < kwizart at gmail.com > - 96.43.13-2
+- Avoid Requires/Provides of the libGL.so.1 . rfbz#859
+
+* Mon Aug 31 2009 kwizart < kwizart at gmail.com > - 96.43.13-1
+- Update to 96.43.13 (beta)
+
+* Tue Jun 9 2009 kwizart < kwizart at gmail.com > - 96.43.11-5
+- F-11 version.
+
+* Sun Jun 7 2009 kwizart < kwizart at gmail.com > - 96.43.11-4
+- blacklist nouveau by default.
+
+* Fri Apr 3 2009 kwizart < kwizart at gmail.com > - 96.43.11-3
+- Fix x86 Arch for fedora >= 11
+
+* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 96.43.11-2
+- rebuild for new F11 features
+
+* Wed Feb 25 2009 kwizart < kwizart at gmail.com > - 96.43.11-1
+- Update to 96.43.11 (stable)
+
+* Sun Feb 22 2009 Stewart Adam <s.adam at diffingo.com> - 96.43.09-4
+- Make devel subpackage depend on lib subpackage of the same arch
+
+* Mon Nov 10 2008 kwizart < kwizart at gmail.com > - 96.43.09-3
+- Clean the spec.
+
+* Tue Nov 4 2008 Stewart Adam <s.adam at diffingo.com> - 96.43.09-2
+- Fix upgrade path for FreshRPMs users
+
+* Thu Oct 30 2008 kwizart < kwizart at gmail.com > - 96.43.09-1
+- Update to 96.43.09 (beta)
+ Preliminary support for xorg-server 1.5
+
+* Sat Jul 19 2008 Stewart Adam <s.adam at diffingo.com> - 96.43.07-1
+- Update to 96.43.07
+
+* Wed May 28 2008 Stewart Adam <s.adam at diffingo.com> - 96.43.05-5
+- Only modify modprobe.conf if it exists
+
+* Fri Feb 22 2008 Stewart Adam <s.adam AT diffingo DOT com> - 96.43.05-4
+- Fix typo in filter requires script
+
+* Wed Feb 20 2008 kwizart < kwizart at gmail.com > - 96.43.05-3
+- Fix debuginfo package creation.
+- Add libGLcore.so to the filter list.
+- Only requires versioned libGL on x86_64 (no problem on x86).
+
+* Thu Feb 7 2008 Stewart Adam <s.adam AT diffingo DOT com> - 96.43.05-2
+- Filter requires on main package so we don't pull in xorg-x11-drv-nvidia*-libs
+
+* Mon Feb 4 2008 kwizart < kwizart at gmail.com > - 96.43.05-1
+- Update to 96.43.05
+- New scheme synchronized from the main nvidia package.
+
+* Tue Nov 20 2007 Stewart Adam <s.adam AT diffingo DOT com> - 96.43.01-4
+- Add Requires: which (bz#1662)
+
+* Tue Nov 6 2007 Stewart Adam <s.adam AT diffingo DOT com> - 96.43.01-3.1
+- Fix typo in initscript (bz#1707)
+
+* Thu Nov 1 2007 Stewart Adam <s.adam AT diffingo DOT com> - 96.43.01-3
+- Initscript improvements
+- Minor bugfixes with scriptlets (don't echo "already disabled" type messages)
+
+* Wed Oct 3 2007 kwizart < kwizart at gmail.com > - 96.43.01-2
+- Strip binaries and libs even if no debug is made with F-8
+
+* Wed Oct 3 2007 kwizart < kwizart at gmail.com > - 96.43.01-1
+- Update to 96.43.01
+- Add no replace for profile.d
+
+* Sat Sep 8 2007 Stewart Adam < s.adam AT diffingo DOT com > - 1.0.9639-3
+- Fix %%post if clause (bz#1632)
+
+* Fri Jun 15 2007 kwizart < kwizart at gmail.com > - 1.0.9639-2
+- F7 SELinux fixes (continued)
+- Add a new post scriptlet to remove those legacy-layout udev files
+
+* Mon Jun 4 2007 kwizart < kwizart at gmail.com > - 1.0.9639-1
+- Update to 1.0.9639
+
+* Sat Jun 2 2007 Stewart Adam < s.adam AT diffingo DOT com > - 1.0.9631-12
+- Don't use legacy udev layout (Thanks Finalzone for the workaround)
+
+* Sat Apr 28 2007 Stewart Adam < s.adam AT diffingo DOT com > - 1.0.9631-11
+- Fixes in the config-display (vendor > majorVendor)
+
+* Fri Mar 9 2007 Stewart Adam < s.adam AT diffingo DOT com > - 1.0.9631-10
+- Fix up scriptlets a little so that 'Driver already enabled|disabled'
+ doesn't always appear on install or remove
+- Update *-config-display files for majorVendor and not plain vendor
+- Fix typo in the last changelog entry's name
+
+* Wed Mar 7 2007 Stewart Adam < s.adam AT diffingo DOT com > - 1.0.9631-9
+- Actaully move paths to 96xx, don't just rename the patches and sources
+
+* Sat Feb 24 2007 Stewart Adam < s.adam AT diffingo DOT com > - 1.0.9631-8
+- Bump for new tag
+- fi to end if!
+
+* Sat Feb 24 2007 Stewart Adam < s.adam AT diffingo DOT com > - 1.0.9631-7
+- Standardize all summaries and descriptions with other nvidia and fglrx
+ packages
+- Standardize initscript and *config-display with other nvidia and fglrx
+ packages
+- Move paths from nvidia-glx to nvidia-96xx
+- Start merge with livna-config-display
+
+* Wed Feb 7 2007 kwizart < kwizar at gmail.com > - 1.0.9631-6
+- Rebuild for Fedora Core 7 test1
+
+* Wed Jan 17 2007 kwizart < kwizart at gmail.com > - 1.0.9631-5
+- fix nvidia-glx-init directory (nvidia-96xx)
+
+* Sat Jan 13 2007 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.9631-4
+- fix obsoletes/provides
+- run ldconfig in post for libs-32bit
+- some minor cleanups
+
+* Sun Jan 7 2007 kwizart < kwizart at gmail.com > - 1.0.9631-3
+- Fix perm in SOURCES.
+- Fix ldconfig with libs-32bit
+- No debug_package
+- Drop config with ld.so.conf.d and modprobe.d cause rpmlint errors
+
+* Thu Dec 28 2006 kwizart < kwizart at gmail.com > - 1.0.9631-2
+- New legacy version named kmod-nvidia-96xx
+
+* Thu Dec 07 2006 kwizart < kwizart at gmail.com > - 1.0.9631-1
+- Update to 1.0.9631-1
+
+* Tue Nov 07 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.9629-1
+- update to release 1.0.9629
+
+* Tue Oct 31 2006 Dams <anvil[AT]livna.org> - 1.0.9626-3
+- Another nvidia-config-display update to fix dumb modules section
+
+* Tue Oct 24 2006 Dams <anvil[AT]livna.org> - 1.0.9626-2
+- Yet another updated nvidia-config-display : importing python modules
+ we use is usualy a good idea
+- Updated nvidia-config-display
+
+* Sun Oct 22 2006 Stewart Adam <s.adam AT diffingo DOT com> - 1.0.9626-1
+- update to release 1.0.9626
+
+* Fri Oct 20 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.8776-1
+- update to 1.0.8776-1 -- fixes CVE-2006-5379
+
+* Thu Aug 24 2006 Niko Mirthes (straw) <nmirthes AT gmail DOT com> - 1.0.8774-1
+- Nvidia added a png for nvidia-settings, for-loop adjusted accordingly
+- update to release 1.0.8774
+
+* Wed Aug 09 2006 Niko Mirthes (straw) <nmirthes AT gmail DOT com> - 1.0.8762-6
+- small changes to sync with legacy package
+- place nvidia-bug-report.sh in /usr/bin
+
+* Mon Aug 07 2006 Niko Mirthes (straw) <nmirthes AT gmail DOT com> - 1.0.8762-5
+- more minor changes to spacing and general layout
+
+* Fri Aug 04 2006 Niko Mirthes (straw) <nmirthes AT gmail DOT com> - 1.0.8762-4
+- minor changes to spacing, removal of random tabs, re-arrangements
+- remove GNOME category from the desktop file
+
+* Thu May 25 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.8762-3
+- Obsolete old kmods
+
+* Thu May 24 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.8762-2
+- add missing defattr to files section for sub-package libs-32bit
+
+* Wed May 24 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.8762-1
+- update to 1.0.8762
+
+* Tue May 16 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.8756-3
+- Conflict with xorg-x11-drv-fglrx and selinux-policy < 2.2.29-2.fc5
+- Ship bug-reporting tool as normal executable and not in %%doc
+
+* Sun May 14 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.0.8756-2
+- Require nvidia-kmod instead of kmod-nvidia (#970).
+
+* Sat Apr 08 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.8756-1
+- Update to 8756
+- put 32bit libs in their own package
+
+* Wed Mar 29 2006 Niko Mirthes (straw) <nmirthes AT gmail DOT com> - 1.0.8178-9
+- make every use of the 'install' command consistent
+- tweak nvidia-settings' desktop file slightly
+
+* Thu Mar 23 2006 Niko Mirthes (straw) <nmirthes AT gmail DOT com> - 1.0.8178-8
+- switch to using modprobe.d rather than editing modprobe.conf directly
+
+* Sat Mar 18 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.8178-7
+- ExclusiveArch i386 and not %%{ix86} -- we don't want to build for athlon&co
+
+* Sat Mar 18 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.8178-6
+- drop unused patches
+
+* Sat Mar 18 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.8178-5
+- drop 0.lvn
+
+* Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- add dist
+
+* Wed Feb 08 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.8178-0.lvn.5
+- use lib64 in nvidia-config-display on x86-64
+- fix path to kernel module in init-script
+- add patch from Ville for nvidia-README.Fedora
+- match permissions of xorg 7
+
+* Wed Feb 01 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.8178-0.lvn.4
+- More fixes
+
+* Tue Jan 31 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.8178-0.lvn.3
+- Fix wrong provides
+
+* Mon Jan 30 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.8178-0.lvn.2
+- fix path to kernel module in nvidia-glx-init (thx to Dominik 'Rathann'
+ Mierzejewski)
+- include device files until udev works probably with kernel module
+
+* Sun Jan 22 2006 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 1.0.8178-0.lvn.1
+- split into packages for userland and kmod
+- rename to xorg-x11-drv-nvidia; yum/rpm should use mesa-libGL{,-devel} then in
+ the future when seaching for libGL.so{,.1}
+- remove kernel-module part
+- remove old cruft
+- install stuff without Makefile because it forgets mosts a lot of files anyway
+
+* Thu Dec 22 2005 Niko Mirthes (straw) <nmirthes AT gmail DOT com> - 0:1.0.8178-0.lvn.2
+- change nvidia-glx.sh and nvidia-glx.csh to point to README.txt rather than README
+- reference xorg.conf rather than XF86Config in the init script
+- improve readability of instructions and comments, fix some typos
+- drop epoch, as it seems to be affecting dependencies according to rpmlint
+- tweak the nvidia-settings desktop file so it always shows up on the
+ menu in the right location
+- add the manual pages for nvidia-settings and nvidia-xconfig
+- remove header entries from the nvidia-glx files list. they belong in -devel
+- fix changelog entries to refer to 7676 not 7176 (though there was a 7176 x86_64
+ release prior to 7174)
+- add libXvMCNVIDIA.so
+- update to 8178
+
+* Wed Dec 07 2005 Niko Mirthes (straw) <nmirthes AT gmail DOT com> - 0:1.0.8174-0.lvn.1
+- add the manual pages for nvidia-settings and nvidia-xconfig
+- install the new nvidia-xconfig utility and associated libs
+
+* Mon Dec 05 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:1.0.8174-0.lvn.1
+- Update to 8174
+- desktop entry now Categories=Settings (#665)
+- Ship bug-reporting tool in doc (#588)
+- Things from Bug 635, Niko Mirthes (straw) <nmirthes AT gmail DOT com>:
+-- avoid changing time stamps on libs where possible
+-- only add /etc/modprobe.conf entries if they aren't already there
+-- add /etc/modprobe.conf entries one at a time
+-- only remove /etc/modprobe.conf entries at uninstall, not during upgrade
+-- avoid removing any modprobe.conf entries other than our own
+-- match Xorg's install defaults where it makes sense (0444)
+-- a few other minor tweaks to the files lists
+
+* Sun Sep 04 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:1.0.7676-0.lvn.3
+- Conflics with nvidia-glx-legacy
+- Integrate some minor correction suggested by Niko Mirthes
+ <nmirthes AT gmail DOT com> in #475
+
+* Fri Aug 26 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:1.0.7676-0.lvn.2
+- Rename src5: nvidia.init to nvidia-glx-init
+- Fix correct servicename in nvidia-glx-init
+- Run nvidia-glx-init before gdm-early-login; del and readd the script
+ during post
+
+* Sun Aug 21 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:1.0.7676-0.lvn.1
+- Update to 7676
+- Lots of cleanup from me and Niko Mirthes <nmirthes AT gmail DOT com>
+- add NVreg_ModifyDeviceFiles=0 to modprobe.conf (Niko)
+- Drop support for FC2
+- Nearly proper Udev-Support with workarounds around FC-Bug 151527
+
+* Fri Jun 17 2005 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.7174-0.lvn.5
+- Slight change of modprobe.conf rexexp
+
+* Thu Jun 16 2005 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.7174-0.lvn.4
+- Fixed a critical bug in modprobe.conf editing where all lines starting with alias and
+ ending with then a word starting with any of the letters n,v,i,d,i,a,N,V,r,e is removed.
+
+* Mon Jun 13 2005 Thorsten Leemhuis <fedora AT leemhuis DOT info> - 0:1.0.7174-0.lvn.3
+- Adjust kenrnel-module-stuff for FC4
+- Ship both x86 and x64 in the SRPM
+
+* Sun Jun 12 2005 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.7174-0.lvn.2
+- Only create 16 devices
+- Put libXvMCNVIDIA.a in -devel
+- Don't remove nvidia options in /etc/modprobe.conf
+- Make ld.so.conf file config(noreplace)
+- Use same directory permissions as the kernel
+
+* Sat Apr 2 2005 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.7174-0.lvn.1
+- New upstream release, 7174
+
+* Wed Mar 30 2005 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.7167-0.lvn.5
+- Added x86_64 support patch from Thorsten Leemhuis
+
+* Wed Mar 23 2005 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.7167-0.lvn.4
+- Fix kernel module permissions again (644)
+- Only create 16 /dev/nvidia* devices, 256 is unnecessary
+
+* Fri Mar 18 2005 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.7167-0.lvn.3
+- Fixed kernel-module permissions
+
+* Thu Mar 17 2005 Dams <anvil[AT]livna.org> 0:1.0.7167-0.lvn.2
+- Removed provides on kernel-module and kernel-modules
+
+* Sat Mar 05 2005 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.7167-0.lvn.1
+- New upstream release 1.0.7167
+- Added patch from http://www.nvnews.net/vbulletin/showthread.php?t=47405
+- Removed old patch against 2.6.9
+
+* Sat Feb 05 2005 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6629-0.lvn.7
+- Added a number of post-6629 patches from http://www.minion.de/files/1.0-6629
+- Fixed permissions of nvidia/nvidia.ko
+
+* Fri Jan 21 2005 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6629-0.lvn.6
+- Fix incorrect MAKDEV behaviour and dependency
+
+* Tue Nov 30 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6629-0.lvn.4
+- Fixed creation of /dev/nvidia* on FC2
+
+* Sat Nov 27 2004 Dams <anvil[AT]livna.org> - 0:1.0.6629-0.lvn.3
+- Dont try to print kvariant in description when it's not defined.
+
+* Sun Nov 21 2004 Thorsten Leemhuis <fedora at leemhuis dot info> - 0:1.0.6629-0.lvn.2
+- resulting kernel-module package now depends again on /root/vmlinuz-<kernelver>
+- Use rpmbuildtags driverp and kernelp
+
+* Sat Nov 06 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6629-0.lvn.1
+- New upstream version, 1.0-6629
+- Build without kernel-module-devel by default
+
+* Fri Oct 29 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6111-0.lvn.6
+- Make n-c-display handle misc problems in a better way
+- Fixed wrong icon file name in .desktop file
+- Re-added the mysteriously vanished sleep line in the init script
+ when kernel module wasn't present
+
+* Fri Oct 22 2004 Thorsten Leemhuis <fedora at leemhuis dot info> - 0:1.0.6111-0.lvn.5
+- Use fedora-kmodhelper in the way ntfs or ati-fglrx use it
+- Allow rpm to strip the kernel module. Does not safe that much space ATM but
+ might be a good idea
+- Allow to build driver and kernel-module packages independent of each other
+- Some minor spec-file changes
+
+* Thu Oct 21 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6111-0.lvn.4
+- udev fixes
+- Incorporated fix for missing include line in ld.so.conf from ati-fglrx spec (T Leemhuis)
+
+* Sun Sep 19 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6111-0.lvn.3
+- Remove FC1/kernel 2.4 compability
+- Rename srpm to nvidia-glx
+- Build with kernel-module-devel
+
+* Sun Aug 15 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6111-0.lvn.2
+- Restore ldsoconfd macro
+- Disable autoamtic removal of scripted installation for now; needs testing
+
+* Sat Aug 14 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6111-0.lvn.1
+- Upstream release 6111
+- Fixed init script (again)
+
+* Tue Aug 3 2004 Dams <anvil[AT]livna.org> 0:1.0.6106-0.lvn.4
+- ld.so.conf.d directory detected by spec file
+- Using nvidialibdir in nvidia-glx-devel files section
+- Got rid of yarrow and tettnang macros
+- libGL.so.1 symlink in tls directory always present
+
+* Mon Jul 19 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6106-0.lvn.3
+- Fixed script bug that would empty prelink.conf
+- Added symlink to non-tls libGL.so.1 on FC1
+
+* Tue Jul 13 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6106-0.lvn.2.3
+- Updated init script to reflect name change -xfree86 -> -display
+
+* Mon Jul 12 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6106-0.lvn.2.2
+- Fixed backup file naming
+
+* Sun Jul 11 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6106-0.lvn.2.1
+- Restore working macros
+- Always package the gui tool
+
+* Sun Jul 11 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6106-0.lvn.2
+- Renamed nvidia-config-xfree86 to nvidia-config-display
+- Fixed symlinks
+- Use ld.so.conf.d on FC2
+- Remove script installation in pre
+- Use system-config-display icon for nvidia-settings
+- 2 second delay in init script when kernel module not found
+- Make nvidia-config-display fail more gracefully
+- Add blacklist entry to prelink.conf on FC1
+
+* Mon Jul 05 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.6106-0.lvn.1
+- New upstream release
+- First attempt to support FC2
+- Dropped dependency on XFree86
+
+* Mon Feb 09 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.5336-0.lvn.3
+- Use pkg0
+
+* Sun Feb 08 2004 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.5336-0.lvn.2
+- New Makefile variable SYSSRC to point to kernel sources.
+- kmodhelper fixes.
+
+* Fri Jan 30 2004 Keith G. Robertson-Turner <nvidia-devel[AT]genesis-x.nildram.co.uk> 0:1.0.5336-0.lvn.1
+- New upstream release
+- Removed (now obsolete) kernel-2.6 patch
+- Install target changed upstream, from "nvidia.o" to "module"
+- Linked nv/Makefile.kbuild to (now missing) nv/Makefile
+
+* Sun Jan 25 2004 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.18
+- Updated nvidia-config-display
+- Now requiring pyxf86config
+
+* Mon Jan 19 2004 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.17
+- Added nvidiasettings macro to enable/disable gui packaging
+
+* Mon Jan 19 2004 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.16
+- Updated minion.de patches
+- Added some explicit requires
+- Test nvidia-config-xfree86 presence in kernel-module package
+ scriptlets
+
+* Mon Jan 12 2004 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.15
+- Updated Readme.fedora
+- nvidia-glx-devel package
+
+* Sat Jan 3 2004 Dams <anvil[AT]livna.org> 0:1.0.5328-0.lvn.14
+- Hopefully fixed kernel variant thingy
+
+* Fri Jan 2 2004 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.13
+- Support for other kernel variants (bigmem, etc..)
+- Changed URL in Source0
+
+* Tue Dec 30 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.13
+- Dropped nvidia pkgX information in release tag.
+
+* Tue Dec 30 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.12.pkg0
+- Renamed kernel module package in a kernel-module-nvidia-`uname -r` way
+- Using fedora.us kmodhelper for kernel macro
+- Using nvidia pkg0 archive
+
+* Sun Dec 21 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.11.pkg1
+- kernel-module-nvidia package provides kernel-module
+- We wont own devices anymore. And we wont re-create them if they are
+ already present
+
+* Sun Dec 21 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.10.pkg1
+- Yet another initscript update. Really.
+- Scriptlets updated too
+
+* Sun Dec 21 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.9.pkg1
+- Fixed alias in modprobe.conf for 2.6
+
+* Sun Dec 21 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.8.pkg1
+- Another initscript update
+
+* Sun Dec 21 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.7.pkg1
+- kernel module requires kernel same kversion
+- initscript updated again
+- Dont conflict, nor obsolete XFree86-Mesa-libGL. Using ld.so.conf to
+ make libGL from nvidia first found. Hope Mike Harris will appreciate.
+
+* Sun Dec 21 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.6.pkg1
+- kernel-module-nvidia requires kernel same version-release
+
+* Sat Dec 20 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.6.pkg1
+- Updated initscript
+
+* Fri Dec 19 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.lvn.5.pkg1
+- lvn repository tag
+
+* Fri Dec 19 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.fdr.5.pkg1
+- Added initscript to toggle nvidia driver according to running kernel
+ and installed kernel-module-nvidia packages
+- Updated scriptlets
+
+* Thu Dec 18 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.fdr.4.pkg1
+- Arch detection
+- Url in patch0
+
+* Tue Dec 16 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.fdr.3.pkg1
+- Desktop entry for nvidia-settings
+- s/kernel-module-{name}/kernel-module-nvidia
+- nvidia-glx doesnt requires kernel-module-nvidia-driver anymore
+- Using modprobe.conf for 2.6 kernel
+- Hopefully fixed symlinks
+
+* Mon Dec 15 2003 Dams <anvil[AT]livna.org> 0:1.0.4620-0.fdr.2.pkg1
+- Building kernel module for defined kernel
+- kernel module for 2.6 is nvidia.ko
+- Patch not to install kernel module on make install
+- Updated patch for 2.6
+- depmod in scriptlet for defined kernel
+- nvidia-glx conflicting XFree86-Mesa-libGL because we 0wn all its
+ symlink now
+- Dont override libGL.so symlink because it belongs to XFree86-devel
+- Added nvidia 'pkgfoo' info to packages release
+- Spec file cleanup
+
+* Fri Dec 12 2003 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.4620-0.fdr.2
+- Fixed repairing of a link in post-uninstall
+- Obsolete Mesa instead of Conflict with it, enables automatic removal.
+
+* Mon Dec 08 2003 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.4620-0.fdr.1
+- Added support for 2.6 kernels
+- Cleaned up build section, removed the need for patching Makefiles.
+- Added missing BuildReq gcc32
+- Don't package libs twice, only in /usr/lib/tls/nvidia
+- Made config cript executable and put it into /usr/sbin
+- Moved kernel module to kernel/drivers/video/nvidia/
+- Fixed libGL.so and libGLcore.so.1 links to allow linking against OpenGL libraries
+
+* Mon Dec 08 2003 Keith G. Robertson-Turner <nvidia-devel at genesis-x.nildram.co.uk> - 0:1.0.4620-0.fdr.0
+- New beta 4620 driver
+- New GUI control panel
+- Some minor fixes
+
+* Thu Nov 20 2003 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.4496-0.fdr.10.1
+- Finally fixed SMP builds.
+
+* Wed Nov 19 2003 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.4496-0.fdr.9
+- Don't make nvidia-glx depend on kernel-smp
+
+* Tue Nov 18 2003 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.4496-0.fdr.8
+- Some build fixes
+
+* Tue Nov 11 2003 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.4496-0.fdr.7
+- Added CC=gcc32
+- Fixed upgrading issue
+- Added driver switching capabilities to config script.
+
+* Fri Nov 07 2003 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.4496-0.fdr.4
+- Added conflict with XFree86-Mesa-libGL.
+- Disabled showing of the README.Fedora after installation.
+
+* Sun Oct 12 2003 Peter Backlund <peter dot backlund at home dot se> - 0:1.0.4496-0.fdr.3
+- Added NVidia configuration script written in Python.
+- Some cleanup of files section
+- For more info, see https://bugzilla.fedora.us/show_bug.cgi?id=402
+
+* Tue Jul 08 2003 Andreas Bierfert (awjb) <andreas.bierfert[AT]awbsworld.de> - 0:1.0.4363-0.fdr.2
+- renamed /sbin/makedevices.sh /sbin/nvidia-makedevices.sh ( noticed by
+ Panu Matilainen )
+- Fixed name problem
+* Sun Jun 22 2003 Andreas Bierfert (awjb) <andreas.bierfert[AT]awbsworld.de> - 0:1.0.4363-0.fdr.1
+- Initial RPM release, still some ugly stuff in there but should work...
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-96xx/F-13/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 14 Nov 2009 21:34:55 -0000 1.5
+++ .cvsignore 3 Nov 2010 16:02:19 -0000 1.6
@@ -1,2 +1,2 @@
-NVIDIA-Linux-x86-96.43.14-pkg0.run
-NVIDIA-Linux-x86_64-96.43.14-pkg0.run
+NVIDIA-Linux-x86-96.43.19-pkg0.run
+NVIDIA-Linux-x86_64-96.43.19-pkg0.run
--- dead.package DELETED ---
13 years, 10 months
rpms/xorg-x11-drv-nvidia/devel 00-nvidia.conf, NONE, 1.1 nvidia-xorg.conf, NONE, 1.1 xorg-x11-drv-nvidia.spec, 1.49, 1.50
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv11864
Modified Files:
xorg-x11-drv-nvidia.spec
Added Files:
00-nvidia.conf nvidia-xorg.conf
Log Message:
Fix f14 installation regression
--- 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: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/devel/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 2 Nov 2010 12:02:45 -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
@@ -46,18 +48,18 @@
# 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 +92,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 +176,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 +224,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 +241,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 +255,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 +273,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 +308,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 +348,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
13 years, 10 months