rpms
/
xorg-x11-drv-nvidia
20
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix freshRPMs upgrade path, revert libs change (fglrx)

Browse Source
el9
Stewart Adam 16 years ago
parent 3b91369bf8
commit a7506018c0
1 changed files with 58 additions and 46 deletions
Show Stats Download Patch File Download Diff File

104
xorg-x11-drv-nvidia.spec
Unescape View File

@ -6,56 +6,59 @@
%{nil} %{nil}
%endif %endif
Name: xorg-x11-drv-nvidia Name: xorg-x11-drv-nvidia
Version: 177.80 Version: 177.80
Release: 3%{?dist} Release: 5%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support Group: User Interface/X Hardware Support
License: Redistributable, no modification permitted License: Redistributable, no modification permitted
URL: http://www.nvidia.com/ URL: http://www.nvidia.com/
Source0: http://us.download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}-pkg0.run Source0: http://us.download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%{version}-pkg0.run
Source1: http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-pkg0.run Source1: http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x86_64-%{version}-pkg0.run
Source2: nvidia.sh Source2: nvidia.sh
Source3: nvidia.csh Source3: nvidia.csh
Source4: nvidia-settings.desktop Source4: nvidia-settings.desktop
Source5: nvidia-init Source5: nvidia-init
Source6: 60-nvidia.nodes Source6: 60-nvidia.nodes
Source10: nvidia-config-display Source10: nvidia-config-display
Source11: nvidia-README.Fedora Source11: nvidia-README.Fedora
Source12: nvidia.opts Source12: nvidia.opts
# So we don't pull other nvidia variants # So we don't pull other nvidia variants
Source91: filter-requires.sh Source91: filter-requires.sh
%define _use_internal_dependency_generator 0 %define _use_internal_dependency_generator 0
%define __find_requires %{SOURCE91} %define __find_requires %{SOURCE91}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
ExclusiveArch: i386 x86_64 ExclusiveArch: i386 x86_64
Requires: nvidia-kmod >= %{version} Requires: nvidia-kmod >= %{version}
Requires(post): nvidia-kmod >= %{version} Requires(post): nvidia-kmod >= %{version}
# Needed in all nvidia or fglrx driver packages # Needed in all nvidia or fglrx driver packages
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
Requires: which Requires: which
Requires: livna-config-display >= 0.0.21 Requires: livna-config-display >= 0.0.21
Requires: %{name}-libs = %{version}-%{release} Requires: %{name}-libs = %{version}-%{release}
# to prevent i386 package being pulled first and x86_64 package being excluded # to prevent i386 package being pulled first and x86_64 package being excluded
# on x86_64 systems # on x86_64 systems
%ifarch x86_64 %ifarch x86_64
Requires: %{nvidialibdir}/libGL.so.%{version} Requires: %{nvidialibdir}/libGL.so.%{version}
%endif %endif
Requires(post): livna-config-display Requires(post): livna-config-display
Requires(preun): livna-config-display Requires(preun): livna-config-display
Requires(post): chkconfig Requires(post): chkconfig
Requires(post): ldconfig Requires(post): ldconfig
Requires(preun): chkconfig Requires(preun): chkconfig
Provides: nvidia-kmod-common = %{version} Provides: nvidia-kmod-common = %{version}
Conflicts: xorg-x11-drv-nvidia-legacy Conflicts: xorg-x11-drv-nvidia-legacy
Conflicts: xorg-x11-drv-nvidia-96xx Conflicts: xorg-x11-drv-nvidia-96xx
Conflicts: xorg-x11-drv-fglrx Conflicts: xorg-x11-drv-fglrx
Obsoletes: nvidia-kmod < %{version} Obsoletes: nvidia-kmod < %{version}
Obsoletes: nvidia-x11-drv < %{version}-%{release}
Provides: nvidia-x11-drv = %{version}-%{release}
%description %description
This package provides the most recent NVIDIA display driver which allows for This package provides the most recent NVIDIA display driver which allows for
@ -67,20 +70,23 @@ for driver version %{version}.
%package devel %package devel
Summary: Development files for %{name} Summary: Development files for %{name}
Group: Development/Libraries Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release} Requires: %{name}-libs = %{version}-%{release}
%description devel %description devel
This package provides the development files of the %{name} package, This package provides the development files of the %{name} package,
such as OpenGL headers. such as OpenGL headers.
%package libs %package libs
Summary: Libraries for %{name} Summary: Libraries for %{name}
Group: User Interface/X Hardware Support Group: User Interface/X Hardware Support
Requires: %{name} = %{version}-%{release}
%ifarch %{ix86} %ifarch %{ix86}
Provides: %{name}-libs-32bit = %{version}-%{release} Provides: %{name}-libs-32bit = %{version}-%{release}
Obsoletes: %{name}-libs-32bit <= %{version}-%{release} Obsoletes: %{name}-libs-32bit <= %{version}-%{release}
Obsoletes: nvidia-x11-drv-32bit < %{version}-%{release}
Provides: nvidia-x11-drv-32bit = %{version}-%{release}
%endif %endif
%description libs %description libs
@ -309,6 +315,12 @@ fi
%changelog %changelog
* Tue Nov 4 2008 Stewart Adam <s.adam at diffingo.com> - 177.80-5
- Fix upgrade path for FreshRPMs users
* Mon Oct 27 2008 Stewart Adam <s.adam at diffingo.com> - 177.80-4
- Revert the libs dep change
* Sat Oct 25 2008 Stewart Adam <s.adam at diffingo.com> - 177.80-3 * Sat Oct 25 2008 Stewart Adam <s.adam at diffingo.com> - 177.80-3
- Remove the libs subpackage's dependency on main package - Remove the libs subpackage's dependency on main package
- Update dependency on livna-config-display - Update dependency on livna-config-display

Write Preview
Loading…
Cancel
Save