- rel 9

- use rel macro everywhere

Changed files:
    xorg-driver-video-nvidia.spec -> 1.366

diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec
index 196f1f66c8ab7e0bafa29742730e93623b39fb20..50550f09d65efefa3ba49186ab6075519ddf10ad 100644 (file)
--- a/xorg-driver-video-nvidia.spec
+++ b/xorg-driver-video-nvidia.spec
@@ -20,13 +20,14 @@
 %endif
 %define                no_install_post_check_so 1
 
 %endif
 %define                no_install_post_check_so 1
 

+%define                rel 9

 %define                pname   xorg-driver-video-nvidia
 Summary:       Linux Drivers for nVidia GeForce/Quadro Chips
 Summary(hu.UTF-8):     Linux meghajtók nVidia GeForce/Quadro chipekhez
 Summary(pl.UTF-8):     Sterowniki do kart graficznych nVidia GeForce/Quadro
 Name:          %{pname}
 Version:       290.10
 %define                pname   xorg-driver-video-nvidia
 Summary:       Linux Drivers for nVidia GeForce/Quadro Chips
 Summary(hu.UTF-8):     Linux meghajtók nVidia GeForce/Quadro chipekhez
 Summary(pl.UTF-8):     Sterowniki do kart graficznych nVidia GeForce/Quadro
 Name:          %{pname}
 Version:       290.10

-Release:       8
+Release:       %{rel}

 Epoch:         1
 License:       nVidia Binary
 Group:         X11
 Epoch:         1
 License:       nVidia Binary
 Group:         X11


@@ -48,7 +49,7 @@ BuildRequires:        %{kgcc_package}
 BuildRequires: rpmbuild(macros) >= 1.379
 BuildRequires: sed >= 4.0
 BuildConflicts:        XFree86-nvidia
 BuildRequires: rpmbuild(macros) >= 1.379
 BuildRequires: sed >= 4.0
 BuildConflicts:        XFree86-nvidia

-Requires:      %{pname}-libs = %{epoch}:%{version}-%{release}
+Requires:      %{pname}-libs = %{epoch}:%{version}-%{rel}

 Requires:      xorg-xserver-server
 Requires:      xorg-xserver-server(videodrv-abi) <= 11.0
 Requires:      xorg-xserver-server(videodrv-abi) >= 2.0
 Requires:      xorg-xserver-server
 Requires:      xorg-xserver-server(videodrv-abi) <= 11.0
 Requires:      xorg-xserver-server(videodrv-abi) >= 2.0


@@ -60,9 +61,6 @@ Conflicts:    XFree86-OpenGL-devel <= 4.2.0-3
 ExclusiveArch: %{ix86} %{x8664}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 ExclusiveArch: %{ix86} %{x8664}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 

-# constify %rel macro, so it wouldn't expand in kernel subpkgs
-%{expand:%%global release %{release}}
-

 %define                _noautoreqdep   libGL.so.1
 
 %description
 %define                _noautoreqdep   libGL.so.1
 
 %description


@@ -124,7 +122,7 @@ Summary:    OpenGL (GL and GLX) header files
 Summary(hu.UTF-8):     OpenGL (GL és GLX) fejléc fájlok
 Summary(pl.UTF-8):     Pliki nagłówkowe OpenGL (GL i GLX)
 Group:         X11/Development/Libraries
 Summary(hu.UTF-8):     OpenGL (GL és GLX) fejléc fájlok
 Summary(pl.UTF-8):     Pliki nagłówkowe OpenGL (GL i GLX)
 Group:         X11/Development/Libraries

-Requires:      %{pname}-libs = %{epoch}:%{version}-%{release}
+Requires:      %{pname}-libs = %{epoch}:%{version}-%{rel}

 Provides:      OpenGL-GLX-devel = 1.4
 Provides:      OpenGL-devel = 2.1
 Obsoletes:     X11-OpenGL-devel-base
 Provides:      OpenGL-GLX-devel = 1.4
 Provides:      OpenGL-devel = 2.1
 Obsoletes:     X11-OpenGL-devel-base


@@ -148,7 +146,7 @@ Summary:    Static XvMCNVIDIA library
 Summary(hu.UTF-8):     Statikus XwMCNVIDIA könyvtár
 Summary(pl.UTF-8):     Statyczna biblioteka XvMCNVIDIA
 Group:         X11/Development/Libraries
 Summary(hu.UTF-8):     Statikus XwMCNVIDIA könyvtár
 Summary(pl.UTF-8):     Statyczna biblioteka XvMCNVIDIA
 Group:         X11/Development/Libraries

-Requires:      %{pname}-devel = %{epoch}:%{version}-%{release}
+Requires:      %{pname}-devel = %{epoch}:%{version}-%{rel}

 
 %description static
 Static XvMCNVIDIA library.
 
 %description static
 Static XvMCNVIDIA library.


@@ -172,7 +170,7 @@ Summary:    Tools for advanced control of nVidia graphic cards
 Summary(hu.UTF-8):     Eszközök az nVidia grafikus kártyák beállításához
 Summary(pl.UTF-8):     Narzędzia do zarządzania kartami graficznymi nVidia
 Group:         Applications/System
 Summary(hu.UTF-8):     Eszközök az nVidia grafikus kártyák beállításához
 Summary(pl.UTF-8):     Narzędzia do zarządzania kartami graficznymi nVidia
 Group:         Applications/System

-Requires:      %{pname} = %{epoch}:%{version}-%{release}
+Requires:      %{pname} = %{epoch}:%{version}-%{rel}

 Suggests:      pkgconfig
 Obsoletes:     XFree86-driver-nvidia-progs
 
 Suggests:      pkgconfig
 Obsoletes:     XFree86-driver-nvidia-progs
 


@@ -190,12 +188,12 @@ Summary:  nVidia kernel module for nVidia Architecture support
 Summary(de.UTF-8):     Das nVidia-Kern-Modul für die nVidia-Architektur-Unterstützung
 Summary(hu.UTF-8):     nVidia Architektúra támogatás Linux kernelhez.
 Summary(pl.UTF-8):     Moduł jądra dla obsługi kart graficznych nVidia
 Summary(de.UTF-8):     Das nVidia-Kern-Modul für die nVidia-Architektur-Unterstützung
 Summary(hu.UTF-8):     nVidia Architektúra támogatás Linux kernelhez.
 Summary(pl.UTF-8):     Moduł jądra dla obsługi kart graficznych nVidia

-Release:       %{release}@%{_kernel_ver_str}
+Release:       %{rel}@%{_kernel_ver_str}

 Group:         Base/Kernel
 Requires(post,postun): /sbin/depmod
 Requires:      dev >= 2.7.7-10
 %{?with_dist_kernel:%requires_releq_kernel}
 Group:         Base/Kernel
 Requires(post,postun): /sbin/depmod
 Requires:      dev >= 2.7.7-10
 %{?with_dist_kernel:%requires_releq_kernel}

-Requires:      %{pname} = %{epoch}:%{version}-%{release}
+Requires:      %{pname} = %{epoch}:%{version}-%{rel}

 Provides:      X11-driver-nvidia(kernel)
 Obsoletes:     XFree86-nvidia-kernel
 
 Provides:      X11-driver-nvidia(kernel)
 Obsoletes:     XFree86-nvidia-kernel