Name        : nvidia                       Relocations: (not relocatable)
Version     : 7676                              Vendor: Penguin Liberation Front
Release     : 5plf                          Build Date: Mon 31 Oct 2005 
05:13:50 PM CET
Install Date: (not installed)               Build Host: ryu.zarb.org
Group       : System/Kernel and hardware    Source RPM: (none)
Size        : 20183106      License: Freeware
Signature   : (none)
Packager    : Anssi Hannula <[EMAIL PROTECTED]>
URL         : http://www.nvidia.com/object/unix.html
Summary     : NVIDIA dkms module for Kernel, Xorg Server 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]> 7676-5plf
- %clean_menus
- fix descriptions
- add notice about x86_64 to descriptions and README.urpmi
---------------

---------------
Index: nvidia.spec
===================================================================
RCS file: /home/projects/plf/cvs/SPECS/non-free/nvidia/nvidia.spec,v
retrieving revision 1.4
diff -u -r1.4 nvidia.spec
--- nvidia.spec 30 Oct 2005 19:43:13 -0000      1.4
+++ nvidia.spec 31 Oct 2005 16:16:04 -0000
@@ -8,11 +8,11 @@
 
 %define distsuffix plf
 
-%define num_release 4
+%define num_release 5
 %define release %mkrel %num_release
 
 %define libraryname %{name}-opengl
-%define lib_name_orig lib%{libraryname}
+%define lib_name_32bit lib%{libraryname}%{major}
 %define major %(echo %nvversion | perl -pi -e "s/\\..*//")
 %define lib_name %mklibname %libraryname %major
 
@@ -42,7 +42,8 @@
 
 
 %description
-Source package to build GLX and Kernel drivers for NVIDIA cards
+Source package to build drivers for most GeForce/Quadro based video
+cards.
 
 This is in PLF for it's non-free license.
 
@@ -56,9 +57,7 @@
 Provides:      nvidia-kernel = %{version}-%{release}
 
 %description -n dkms-%{module_name}
-This RPM install the NVIDIA driver for all NVIDIA video cards. It uses 
-DKMS with autobuild for version control and to automatically build the 
-nvidia module for new kernels.
+NVIDIA kernel module for most GeForce/Quadro based video cards.
 
 This is in PLF for it's non-free license.
 
@@ -68,20 +67,25 @@
 Group:         System/Kernel and hardware
 URL:           http://www.nvidia.com/object/unix.html
 Requires:      NVIDIA_kernel = %{version}
+Requires:      %{name}-xorg = %{version}
 Provides:      %{libraryname} = %{version}-%{release}
 Provides:      devel(libnvidia-tls)
 
 %description -n %{lib_name}
-NVIDIA OpenGL 1.2 libraries for RIVA TNT/TNT2 and GeForce/Quadro based
-video cards.  Older RIVA 128 based video cards are supported by the server
-module shipping with XFree86 4.0, nv_drv.o. You should install this package
-if you have one of the newer cards.
-
-You must also install the NVIDIA_kernel module if you want to utilize these
-drivers.
+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
+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.
 
+%ifarch x86_64
+To enable NVIDIA hardware OpenGL acceleration also for 32bit applications
+you should install the package %{lib_name_32bit}.
+%endif
+
 %package       xorg
 Summary:       NVIDIA module for Xorg X server and XvMC library
 License:       Freeware
@@ -94,16 +98,20 @@
 Obsoletes:     nvidia_GLX
 
 %description   xorg
-NVIDIA Xorg X server module and XvMC library for RIVA TNT/TNT2
-and GeForce/Quadro based video cards.  Older RIVA 128 based video cards are
-supported by the server module shipping with XFree86 4.0, nv_drv.o. You
-should install this package if you have one of the newer cards.
-
-You must also install the NVIDIA_kernel module if you want to utilize these
-drivers.
+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
+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.
 
+%ifarch x86_64
+To enable NVIDIA OpenGL acceleration also for 32bit applications you should
+install the package %{lib_name_32bit}.
+%endif
+
 %package       devel
 Summary:       NVIDIA XvMC development library and OpenGL headers
 License:       Freeware
@@ -112,8 +120,8 @@
 Requires:      %{name}-xorg = %{version}
 
 %description   devel
-NVIDIA XvMC static development library and OpenGL 1.2 headers for RIVA
-TNT/TNT2 and GeForce/Quadro based video cards.
+NVIDIA XvMC static development library and OpenGL 1.2 headers for most
+GeForce/Quadro based video cards.
 
 This is in PLF for it's non-free license.
 
@@ -192,7 +200,7 @@
 install -m644 %{SOURCE11} -D %buildroot/%{_iconsdir}/%{name}.png
 install -m644 %{SOURCE12} -D %buildroot/%{_liconsdir}/%{name}.png
 
-#dkms
+# dkms
 cat > %{buildroot}/usr/src/%{module_name}-%{version}.%{release}/dkms.conf <<EOF
 
 PACKAGE_VERSION="%{version}.%{release}"
@@ -205,9 +213,18 @@
 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}
 
+# We look for non-rpm installation and uninstall it
 %pre xorg
 if [[ -x /usr/bin/nvidia-installer ]]; then
        /usr/bin/nvidia-installer --uninstall -s
@@ -220,6 +237,9 @@
 %post xorg
 %{update_menus}
 
+%postun xorg
+%{clean_menus}
+
 %post -n dkms-%{module_name}
 dkms add     -m %{module_name} -v %{version}.%{release} --rpm_safe_upgrade
 dkms build   -m %{module_name} -v %{version}.%{release} --rpm_safe_upgrade
@@ -273,6 +293,9 @@
 %doc %{packagedir}/usr/share/doc/nvidia-settings-user-guide.txt
 %doc %{packagedir}/usr/share/doc/README.txt
 %doc %{packagedir}/usr/share/doc/XF86Config.sample
+%ifarch x86_64
+%doc README.urpmi
+%endif
 %{_bindir}/nvidia-settings
 %{_bindir}/nvidia-bug-report.sh
 %{_prefix}/X11R6/%{_lib}/libXvMCNVIDIA.so*
@@ -295,6 +318,11 @@
 /usr/src/%{module_name}-%{version}.%{release}
 
 %changelog
+* Mon Oct 31 2005 Anssi Hannula <[EMAIL PROTECTED]> 7676-5plf
+- %%clean_menus
+- fix descriptions
+- add notice about x86_64 to descriptions and README.urpmi
+
 * Sun Oct 30 2005 Anssi Hannula <[EMAIL PROTECTED]> 7676-4plf
 - spec cleanups
 - ExclusiveArch %%ix86 x86_64


_______________________________________________
PLF-announce mailing list
[email protected]
https://www.zarb.org/mailman/listinfo/plf-announce

Reply via email to