Name : nvidia Relocations: (not relocatable)
Version : 8178 Vendor: Penguin Liberation Front
Release : 1plf Build Date: Sun 25 Dec 2005
02:07:48 AM CET
Install Date: (not installed) Build Host: ryu.zarb.org
Group : System/Kernel and hardware Source RPM: (none)
Size : 13123114 License: Freeware
Signature : (none)
Packager : Anssi Hannula <[EMAIL PROTECTED]>
URL : http://www.nvidia.com/object/unix.html
Summary : NVIDIA dkms module, X.org driver and OpenGL libraries
Description :
Source package to build drivers for most GeForce/Quadro based video
cards.
This is in PLF for it's non-free license.
---------------
Anssi Hannula <[EMAIL PROTECTED]> 8178-1plf
- 8178
- use pkg0 sources, has only the stuff we need
- rename lib from nvidia-opengl to nvidia-xorg for consistency
- mklibnamify devel package
- use same symlinks as NVIDIA
- move libraries around, fix descriptions accordingly
- drop autoconfiguration (bug #87)
- include configuration instructions in README.install.urpmi and description
- remove multiple license and url tags
- fix menu
- drop modprobe.preloading nvidia, unnecessary
- add missing LICENSE
- drop empty %build section
---------------
---------------
Index: nvidia.spec
===================================================================
RCS file: /home/projects/plf/cvs/SPECS/non-free/nvidia/nvidia.spec,v
retrieving revision 1.9
diff -u -r1.9 nvidia.spec
--- nvidia.spec 5 Dec 2005 20:55:08 -0000 1.9
+++ nvidia.spec 25 Dec 2005 01:11:16 -0000
@@ -1,20 +1,22 @@
%define name nvidia
%define nvversion 1.0
-%define nrelease 8174
+%define nrelease 8178
%define version %nrelease
-%define x86pkg_rel pkg1
-%define x86_64pkg_rel pkg2
+%define x86pkg_rel pkg0
+%define x86_64pkg_rel pkg0
%define distsuffix plf
%define num_release 1
%define release %mkrel %num_release
-%define libraryname %{name}-opengl
+%define libraryname %{name}-xorg
%define lib_name_32bit lib%{libraryname}%{major}
+%define lib_name_orig lib%{libraryname}
%define major %(echo %nvversion | perl -pi -e "s/\\..*//")
%define lib_name %mklibname %libraryname %major
+%define lib_name_devel %mklibname %libraryname %major -d
%define module_name nvidia
@@ -25,21 +27,6 @@
%define packagedir
NVIDIA-Linux-x86_64-%{nvversion}-%{nrelease}-%{x86_64pkg_rel}
%endif
-%define driverswitchscript \
- use lib qw(/usr/lib/libDrakX); \
- use standalone; \
- use do_pkgs; \
- use Xconfig::card; \
- use Xconfig::xfree; \
- \
- my (\\$raw_X, \\$before) = Xconfig::xfree->read_and_prepare_write; \
- exit unless (\\$before); \
- \
- my \\$do_pkgs = do_pkgs->do_pkgs; \
- Xconfig::card::configure_auto_install(\\$raw_X, \\$do_pkgs, \\$before,
{}); \
- \
- \\$raw_X->write;
-
Name: %{name}
Version: %{version}
Release: %{release}
@@ -62,76 +49,85 @@
%package -n dkms-%{name}
Summary: NVIDIA kernel module for most NVIDIA video cards
-License: Freeware
Group: System/Kernel and hardware
-URL: http://www.nvidia.com/object/unix.html
Requires: dkms
%description -n dkms-%{name}
NVIDIA kernel module for most GeForce/Quadro based video cards.
+This is meant to be used with the %name-xorg package.
This is in PLF for it's non-free license.
%package -n %{lib_name}
-Summary: NVIDIA OpenGL libraries
-License: Freeware
+Summary: NVIDIA OpenGL and X.org driver support libraries
Group: System/Kernel and hardware
-URL: http://www.nvidia.com/object/unix.html
Requires: dkms-%{name} = %{version}
Requires: %{name}-xorg = %{version}
Provides: %{libraryname} = %{version}-%{release}
Provides: devel(libnvidia-tls)
+Provides: %mklibname nvidia-opengl 1
+Obsoletes: %mklibname nvidia-opengl 1
%description -n %{lib_name}
-NVIDIA OpenGL 1.2 libraries for most GeForce/Quadro based video cards.
-Supported cards include some of the GeForce2 based cards, most of the
-Quadro based cards and all GeForce3 based or never cards.
-See %{_defaultdocdir}/%{name}-xorg-%{version}/README.txt after installation
+NVIDIA OpenGL 1.2 and X.org driver support libraries for most GeForce/Quadro
+based video cards. Supported cards include some of the GeForce2 based cards,
+most of the Quadro based cards and all GeForce3 based or never cards.
+See %{_docdir}/%{name}-xorg-%{version}/README.txt after installation
for the full list of supported cards. You should install this package if
you want to enable the NVIDIA hardware OpenGL acceleration for those cards.
-This is in PLF for it's non-free license.
+See %{_docdir}/%{name}-xorg-%{version}/README.install.urpmi
+for installation details.
+This is in PLF for it's non-free license.
%ifarch x86_64
To enable the NVIDIA hardware OpenGL acceleration also for 32bit applications
-you should install the package %{lib_name_32bit}.
+you should install the package %{lib_name_32bit} too.
%endif
%package xorg
-Summary: NVIDIA module for X.org X server and XvMC library
-License: Freeware
+Summary: NVIDIA graphics driver for X.org X server
Group: System/Kernel and hardware
-URL: http://www.nvidia.com/object/unix.html
Requires: dkms-%{name} = %{version}
-Requires: drakxtools-backend
Provides: nvidia = %{version}-%{release}
Provides: NVIDIA_GLX
Provides: nvidia_GLX
Obsoletes: nvidia_GLX
%description xorg
-NVIDIA Xorg X server module and XvMC library for most GeForce/Quadro based
-video cards. Supported cards include some of the GeForce2 based cards, most
-of the Quadro based cards and all GeForce3 based or never cards.
-See %{_defaultdocdir}/%{name}-xorg-%{version}/README.txt after installation
+NVIDIA X.org graphics driver for most GeForce/Quadro based video cards.
+Supported cards include some of the GeForce2 based cards, most of the Quadro
+based cards and all GeForce3 based or never cards.
+See %{_docdir}/%{name}-xorg-%{version}/README.txt after installation
for the full list of supported cards. You should install this package if
you want to enable the NVIDIA hardware OpenGL acceleration for those cards.
-This is in PLF for it's non-free license.
+NOTE: This PLF provided NVIDIA driver must be configured differently than the
+one available from NVIDIA, see
+%{_docdir}/%{name}-xorg-%{version}/README.install.urpmi for details.
+
+You can reconfigure X to use the new NVIDIA driver automatically:
+1. Run XFdrake as root.
+2. Press the Graphic Card selection.
+3. Select your card (it is usually already autoselected).
+4. Press OK and Quit.
+This is in PLF for it's non-free license.
%ifarch x86_64
To enable the NVIDIA hardware OpenGL acceleration also for 32bit applications
-you should install the package %{lib_name_32bit}.
+you should install the package %{lib_name_32bit} too.
%endif
-%package devel
+%package -n %{lib_name_devel}
Summary: NVIDIA XvMC development library and OpenGL headers
-License: Freeware
Group: System/Kernel and hardware
-URL: http://www.nvidia.com/object/unix.html
-Requires: %{name}-xorg = %{version}
+Requires: %{lib_name} = %{version}
+Provides: %{lib_name_orig}-devel = %{version}-%{release}
+Provides: %{name}-xorg-devel = %{version}-%{release}
+Provides: nvidia-devel
+Obsoletes: nvidia-devel
-%description devel
+%description -n %{lib_name_devel}
NVIDIA XvMC static development library and OpenGL 1.2 headers for most
GeForce/Quadro based video cards.
@@ -148,7 +144,31 @@
rm -rf %{packagedir}/usr/src/nv/precompiled
make -C %{packagedir}/usr/src/nv clean
-%build
+cat > README.install.urpmi <<EOF
+IMPORTANT NOTE: This PLF provided NVIDIA driver must be configured differently
+than the one available from NVIDIA, so please follow the instructions below:
+
+If you are upgrading from a Mandriva Club provided NVIDIA driver,
+reconfiguring is unnecessary.
+
+You can reconfigure X to use the new NVIDIA driver either automatically:
+1. Run XFdrake as root.
+2. Press the Graphic Card selection.
+3. Select your card (it is usually already autoselected).
+4. Press OK and Quit.
+
+OR you can do it manually by editing %{_sysconfdir}/X11/xorg.conf:
+1. Change the Driver to "nvidia" in Device section
+2. Remove any Load "glx" lines from Module section
+3. Add to Module section:
+Load "%{_prefix}/X11R6/%{_lib}/modules/extensions/nvidia/libglx.so"
+
+%ifarch x86_64
+Also, if you want to enable the NVIDIA OpenGL acceleration for 32bit
+applications too you should install the package %{lib_name_32bit}.
+
+%endif
+EOF
%install
rm -rf %{buildroot}
@@ -187,13 +207,23 @@
ln -s libglx.so.%{nvversion}.%{nrelease}
%{buildroot}%{_prefix}/X11R6/%{_lib}/modules/extensions/nvidia/libglx.so
# GL libraries
-install -d -m755 %{buildroot}%{_libdir}/nvidia/tls
+install -d -m755 %{buildroot}%{_libdir}/nvidia
install -m755 %{packagedir}/usr/lib/libGL.so.%{nvversion}.%{nrelease}
%{buildroot}%{_libdir}/nvidia
-install -m755 %{packagedir}/usr/lib/libnvidia-tls.so.%{nvversion}.%{nrelease}
%{buildroot}%{_libdir}/nvidia
-install -m755 %{packagedir}/usr/lib/libnvidia-cfg.so.%{nvversion}.%{nrelease}
%{buildroot}%{_libdir}/nvidia
install -m755 %{packagedir}/usr/lib/libGLcore.so.%{nvversion}.%{nrelease}
%{buildroot}%{_libdir}/nvidia
-ln -s libGL.so.%{nvversion}.%{nrelease} %{buildroot}%{_libdir}/nvidia/libGL.so
-install -m755
%{packagedir}/usr/lib/tls/libnvidia-tls.so.%{nvversion}.%{nrelease}
%{buildroot}%{_libdir}/nvidia/tls
+install -m644 %{packagedir}/usr/lib/libGL.la %{buildroot}%{_libdir}/nvidia
+ln -s libGL.so.%{nvversion}.%{nrelease}
%{buildroot}%{_libdir}/nvidia/libGL.so.%{major}
+ln -s libGL.so.%{major} %{buildroot}%{_libdir}/nvidia/libGL.so
+ln -s libGLcore.so.%{nvversion}.%{nrelease}
%{buildroot}%{_libdir}/nvidia/libGLcore.so.%{major}
+
+# other libraries
+install -d -m755 %{buildroot}%{_libdir}/tls
+install -m755 %{packagedir}/usr/lib/libnvidia-tls.so.%{nvversion}.%{nrelease}
%{buildroot}%{_libdir}
+install -m755
%{packagedir}/usr/lib/tls/libnvidia-tls.so.%{nvversion}.%{nrelease}
%{buildroot}%{_libdir}/tls
+install -m755 %{packagedir}/usr/lib/libnvidia-cfg.so.%{nvversion}.%{nrelease}
%{buildroot}%{_libdir}
+ln -s libnvidia-tls.so.%{nvversion}.%{nrelease}
%{buildroot}%{_libdir}/libnvidia-tls.so.%{major}
+ln -s libnvidia-tls.so.%{nvversion}.%{nrelease}
%{buildroot}%{_libdir}/tls/libnvidia-tls.so.%{major}
+ln -s libnvidia-cfg.so.%{nvversion}.%{nrelease}
%{buildroot}%{_libdir}/libnvidia-cfg.so.%{major}
+ln -s libnvidia-cfg.so.%{major} %{buildroot}%{_libdir}/libnvidia-cfg.so
# ld.so.conf.d
install -d -m755 %{buildroot}%{_sysconfdir}/ld.so.conf.d
@@ -212,8 +242,8 @@
# menus
install -d -m755 %buildroot/%{_menudir}
-cat <<EOF >%buildroot/%{_menudir}/%name
-?package(%{name}):command="%{_bindir}/nvidia-settings" \
+cat <<EOF >%buildroot/%{_menudir}/%name-xorg
+?package(%{name}-xorg):command="%{_bindir}/nvidia-settings" \
icon=nvidia-settings.png \
needs="x11" \
section="System/Configuration/Hardware" \
@@ -240,14 +270,6 @@
AUTOINSTALL="YES"
EOF
-# x86_64 notice
-%ifarch x86_64
-cat > README.urpmi <<EOF
-To enable NVIDIA OpenGL acceleration also for 32bit applications you should
-install the package %{lib_name_32bit}.
-EOF
-%endif
-
%clean
rm -rf %{buildroot}
@@ -262,31 +284,9 @@
%postun -n %{lib_name} -p /sbin/ldconfig
%post xorg
-if [ $1 = 1 ]; then
- # Replace nv driver with nvidia when doing install.
- perl <<-EOF
- %{driverswitchscript}
- EOF
-
- # add nvidia to modprobe.preload
- if [[ -f /etc/modprobe.preload ]];then
- grep -q "^%{module_name}$" /etc/modprobe.preload || echo
%{module_name} >> /etc/modprobe.preload
- fi
-fi
%{update_menus}
%postun xorg
-if [ $1 = 0 ]; then
- # Replace nvidia driver with nv when doing uninstall.
- perl <<-EOF
- %{driverswitchscript}
- EOF
-
- # remove nvidia from modprobe.preload
- if [[ -f /etc/modprobe.preload ]];then
- perl -pi -e 's/^%{module_name}\n//' /etc/modprobe.preload
- fi
-fi
%{clean_menus}
%post -n dkms-%{name}
@@ -304,8 +304,13 @@
%files -n %{lib_name}
%defattr(-,root,root)
-%{_sysconfdir}/ld.so.conf.d/%{lib_name}.conf
-%{_libdir}/nvidia
+%config(noreplace) %{_sysconfdir}/ld.so.conf.d/%{lib_name}.conf
+%dir %{_libdir}/nvidia
+%{_libdir}/nvidia/*.so.*
+%{_libdir}/*.so.*
+%dir %{_libdir}/tls
+%{_libdir}/tls/*.so.*
+%{_prefix}/X11R6/%{_lib}/*.so.*
%files xorg
%defattr(-,root,root)
@@ -315,35 +320,50 @@
%doc %{packagedir}/usr/share/doc/XF86Config.sample
%doc %{packagedir}/usr/share/doc/html
%doc %{packagedir}/usr/share/doc/Copyrights
-%ifarch x86_64
-%doc README.urpmi
-%endif
+%doc %{packagedir}/LICENSE
+%doc README.install.urpmi
%{_bindir}/nvidia-settings
%{_bindir}/nvidia-xconfig
%{_bindir}/nvidia-bug-report.sh
-%{_prefix}/X11R6/%{_lib}/libXvMCNVIDIA.so*
-%{_prefix}/X11R6/%{_lib}/libXvMCNVIDIA_dynamic.so*
%{_prefix}/X11R6/%{_lib}/modules/drivers/nvidia_drv.*
%dir %{_prefix}/X11R6/%{_lib}/modules/extensions/nvidia
%{_prefix}/X11R6/%{_lib}/modules/extensions/nvidia/libglx.so*
%{_miconsdir}/nvidia-settings.png
%{_iconsdir}/nvidia-settings.png
%{_liconsdir}/nvidia-settings.png
-%{_menudir}/%{name}
+%{_menudir}/%{name}-xorg
%{_mandir}/man1/nvidia-settings.1*
%{_mandir}/man1/nvidia-xconfig.1*
%{_datadir}/applications/nvidia-settings.desktop
-%files -n %{name}-devel
+%files -n %{lib_name_devel}
%defattr(-,root,root)
%{_includedir}/nvidia
%{_prefix}/X11R6/%{_lib}/libXvMCNVIDIA.a
+%{_libdir}/nvidia/*.so
+%{_libdir}/nvidia/*.la
+%{_libdir}/*.so
%files -n dkms-%{name}
%defattr(-,root,root)
/usr/src/%{name}-%{version}-%{release}
%changelog
+* Sun Dec 25 2005 Anssi Hannula <[EMAIL PROTECTED]> 8178-1plf
+- 8178
+- use pkg0 sources, has only the stuff we need
+- rename lib from nvidia-opengl to nvidia-xorg for consistency
+- mklibnamify devel package
+- use same symlinks as NVIDIA
+- move libraries around, fix descriptions accordingly
+- drop autoconfiguration (bug #87)
+- include configuration instructions in README.install.urpmi and description
+- remove multiple license and url tags
+- fix menu
+- drop modprobe.preloading nvidia, unnecessary
+- add missing LICENSE
+- drop empty %%build section
+
* Mon Dec 5 2005 Anssi Hannula <[EMAIL PROTECTED]> 8174-1plf
- version 8174
- add nvidia-xconfig, nvidia-settings.desktop and new docs
_______________________________________________
PLF-announce mailing list
[email protected]
https://www.zarb.org/mailman/listinfo/plf-announce
