Author: arekm Date: Fri Jul 30 06:30:32 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- relcrap macro for crap; rel left alone for relup.sh to work
---- Files affected:
packages/xorg-driver-video-nvidia:
xorg-driver-video-nvidia.spec (1.270 -> 1.271)
---- 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.270
packages/xorg-driver-video-nvidia/xorg-driver-video-nvidia.spec:1.271
--- packages/xorg-driver-video-nvidia/xorg-driver-video-nvidia.spec:1.270
Thu Jul 29 21:07:35 2010
+++ packages/xorg-driver-video-nvidia/xorg-driver-video-nvidia.spec Fri Jul
30 08:30:27 2010
@@ -25,14 +25,15 @@
%endif
%define pname xorg-driver-video-nvidia
-%define rel 4%{?with_multigl:.mgl}
+%define rel 4
+%define relcrap %{rel}%{?with_multigl:.mgl}
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: 256.35
-Release: %{rel}
+Release: %{relcrap}
Epoch: 1
License: nVidia Binary
Group: X11
@@ -52,7 +53,7 @@
BuildRequires: rpmbuild(macros) >= 1.379
BuildRequires: sed >= 4.0
BuildConflicts: XFree86-nvidia
-Requires: %{pname}-libs = %{epoch}:%{version}-%{rel}
+Requires: %{pname}-libs = %{epoch}:%{version}-%{relcrap}
Requires: xorg-xserver-server
Requires: xorg-xserver-server(videodrv-abi) <= 7.0
Requires: xorg-xserver-server(videodrv-abi) >= 2.0
@@ -130,7 +131,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}-%{rel}
+Requires: %{pname}-libs = %{epoch}:%{version}-%{relcrap}
Provides: OpenGL-GLX-devel = 1.4
Provides: OpenGL-devel = 2.1
Obsoletes: X11-OpenGL-devel-base
@@ -154,7 +155,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}-%{rel}
+Requires: %{pname}-devel = %{epoch}:%{version}-%{relcrap}
%description static
Static XvMCNVIDIA library.
@@ -178,7 +179,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}-%{rel}
+Requires: %{pname} = %{epoch}:%{version}-%{relcrap}
Suggests: pkgconfig
Obsoletes: XFree86-driver-nvidia-progs
@@ -196,12 +197,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: %{r...@%{_kernel_ver_str}
+Release: %{relcr...@%{_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}-%{rel}
+Requires: %{pname} = %{epoch}:%{version}-%{relcrap}
Provides: X11-driver-nvidia(kernel)
Obsoletes: XFree86-nvidia-kernel
@@ -452,6 +453,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.271 2010/07/30 06:30:27 arekm
+- relcrap macro for crap; rel left alone for relup.sh to work
+
Revision 1.270 2010/07/29 19:07:35 baggins
- don't fuck with rel macro, cause it screws internal reqs/provs
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xorg-driver-video-nvidia/xorg-driver-video-nvidia.spec?r1=1.270&r2=1.271&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
