Author: baggins Date: Tue Feb 7 13:02:14 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- rel 9
- use rel macro everywhere
---- Files affected:
packages/xorg-driver-video-nvidia:
xorg-driver-video-nvidia.spec (1.365 -> 1.366)
---- Diffs:
================================================================
Index: packages/xorg-driver-video-nvidia/xorg-driver-video-nvidia.spec
diff -u packages/xorg-driver-video-nvidia/xorg-driver-video-nvidia.spec:1.365
packages/xorg-driver-video-nvidia/xorg-driver-video-nvidia.spec:1.366
--- packages/xorg-driver-video-nvidia/xorg-driver-video-nvidia.spec:1.365
Tue Feb 7 07:35:34 2012
+++ packages/xorg-driver-video-nvidia/xorg-driver-video-nvidia.spec Tue Feb
7 14:02:09 2012
@@ -21,13 +21,14 @@
%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
-Release: 8
+Release: %{rel}
Epoch: 1
License: nVidia Binary
Group: X11
@@ -49,7 +50,7 @@
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
@@ -61,9 +62,6 @@
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
@@ -125,7 +123,7 @@
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
@@ -149,7 +147,7 @@
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.
@@ -173,7 +171,7 @@
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
@@ -191,12 +189,12 @@
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}
-Requires: %{pname} = %{epoch}:%{version}-%{release}
+Requires: %{pname} = %{epoch}:%{version}-%{rel}
Provides: X11-driver-nvidia(kernel)
Obsoletes: XFree86-nvidia-kernel
@@ -425,6 +423,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.366 2012/02/07 13:02:09 baggins
+- rel 9
+- use rel macro everywhere
+
Revision 1.365 2012/02/07 06:35:34 baggins
- even simpler, constify release
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xorg-driver-video-nvidia/xorg-driver-video-nvidia.spec?r1=1.365&r2=1.366&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
