Author: firewing Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia-96xx/F-8 In directory se02.es.rpmfusion.net:/tmp/cvs-serv26237/xorg-x11-drv-nvidia-96xx/F-8 Modified Files: xorg-x11-drv-nvidia-96xx.spec Log Message: multilib fixes Index: xorg-x11-drv-nvidia-96xx.spec =================================================================== RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia-96xx/F-8/xorg-x11-drv-nvidia-96xx.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xorg-x11-drv-nvidia-96xx.spec 18 Oct 2008 17:18:44 -0000 1.2 +++ xorg-x11-drv-nvidia-96xx.spec 25 Oct 2008 17:09:03 -0000 1.3 @@ -6,58 +6,58 @@ %{nil} %endif -Name: xorg-x11-drv-nvidia-96xx -Version: 96.43.07 -Release: 3%{?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: http://us.download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x... -Source1: http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linu... -Source2: nvidia-96xx.sh -Source3: nvidia-96xx.csh -Source4: nvidia-settings.desktop -Source5: nvidia-96xx-init -Source6: 60-nvidia.nodes -Source10: nvidia-96xx-config-display -Source11: nvidia-96xx-README.Fedora -Source12: nvidia-96xx.opts +Name: xorg-x11-drv-nvidia-96xx +Version: 96.43.07 +Release: 4%{?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: http://us.download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x... +Source1: http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linu... +Source2: nvidia-96xx.sh +Source3: nvidia-96xx.csh +Source4: nvidia-settings.desktop +Source5: nvidia-96xx-init +Source6: 60-nvidia.nodes +Source10: nvidia-96xx-config-display +Source11: nvidia-96xx-README.Fedora +Source12: nvidia-96xx.opts # So we don't pull other nvidia variants -Source91: filter-requires.sh -%define _use_internal_dependency_generator 0 -%define __find_requires %{SOURCE91} +Source91: filter-requires.sh +%define _use_internal_dependency_generator 0 +%define __find_requires %{SOURCE91} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -ExclusiveArch: i386 x86_64 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +ExclusiveArch: i386 x86_64 -Requires: nvidia-96xx-kmod >= %{version} +Requires: nvidia-96xx-kmod >= %{version} Requires(post): nvidia-96xx-kmod >= %{version} # Needed in all nvidia or fglrx driver packages -BuildRequires: desktop-file-utils -Requires: which -Requires: livna-config-display -Requires: %{name}-libs = %{version}-%{release} +BuildRequires: desktop-file-utils +Requires: which +Requires: livna-config-display +Requires: %{name}-libs = %{version}-%{release} # to prevent i386 package being pulled first and x86_64 package being excluded # on x86_64 systems %ifarch x86_64 -Requires: %{nvidialibdir}/libGL.so.%{version} +Requires: %{nvidialibdir}/libGL.so.%{version} %endif -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 -Conflicts: xorg-x11-drv-fglrx +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 +Conflicts: xorg-x11-drv-fglrx -Obsoletes: nvidia-96xx-kmod < %{version} +Obsoletes: nvidia-96xx-kmod < %{version} %description This package provides the most recent NVIDIA display driver of the 1.0-96xx @@ -70,21 +70,20 @@ %package devel -Summary: Development files for %{name} -Group: Development/Libraries -Requires: %{name}-libs = %{version}-%{release} +Summary: Development files for %{name} +Group: Development/Libraries +Requires: %{name}-libs = %{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} +Summary: Libraries for %{name} +Group: User Interface/X Hardware Support %ifarch %{ix86} -Provides: %{name}-libs-32bit = %{version}-%{release} -Obsoletes: %{name}-libs-32bit <= %{version}-%{release} +Provides: %{name}-libs-32bit = %{version}-%{release} +Obsoletes: %{name}-libs-32bit <= %{version}-%{release} %endif %description libs @@ -289,6 +288,9 @@ %changelog +* Sat Oct 25 2008 Stewart Adam <s.adam at diffingo.com> - 96.43.07-4 +- Remove the libs subpackage's dependency on main package + * Sat Oct 18 2008 Stewart Adam <s.adam at diffingo.com> - 96.43.07-3 - Change dependency of main package to libs subpackage in devel subpackage to fix multiarch repo push