packages: xorg-driver-video-fglrx-legacy-9.x/xorg-driver-video-fglrx-legacy...

[baggins]

Author: baggins                      Date: Tue Feb  7 13:05:03 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use rel macro

---- Files affected:
packages/xorg-driver-video-fglrx-legacy-9.x:
   xorg-driver-video-fglrx-legacy-9.x.spec (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: packages/xorg-driver-video-fglrx-legacy-9.x/xorg-driver-video-fglrx-legacy-9.x.spec
diff -u packages/xorg-driver-video-fglrx-legacy-9.x/xorg-driver-video-fglrx-legacy-9.x.spec:1.7 packages/xorg-driver-video-fglrx-legacy-9.x/xorg-driver-video-fglrx-legacy-9.x.spec:1.8
--- packages/xorg-driver-video-fglrx-legacy-9.x/xorg-driver-video-fglrx-legacy-9.x.spec:1.7	Tue Feb  7 07:36:57 2012
+++ packages/xorg-driver-video-fglrx-legacy-9.x/xorg-driver-video-fglrx-legacy-9.x.spec	Tue Feb  7 14:04:58 2012
@@ -32,12 +32,13 @@
 %define		arch_dir	x86_64
 %endif
 
+%define		rel		0.1
 %define		pname		xorg-driver-video-fglrx
 Summary:	Linux Drivers for ATI graphics accelerators
 Summary(pl.UTF-8):	Sterowniki do akceleratorów graficznych ATI
 Name:		%{pname}-legacy-%{legacy}%{_alt_kernel}
 Version:	9.12
-Release:	0.1
+Release:	%{rel}
 Epoch:		1
 License:	ATI Binary (parts are GPL)
 Group:		X11
@@ -61,8 +62,8 @@
 BuildRequires:	xorg-proto-recordproto-devel
 BuildRequires:	xorg-proto-xf86miscproto-devel
 BuildRequires:	xorg-proto-xf86vidmodeproto-devel
-Requires:	%{pname}-libdri = %{epoch}:%{version}-%{release}
-Requires:	%{pname}-libglx = %{epoch}:%{version}-%{release}
+Requires:	%{pname}-libdri = %{epoch}:%{version}-%{rel}
+Requires:	%{pname}-libglx = %{epoch}:%{version}-%{rel}
 Requires:	xorg-xserver-server
 Requires:	xorg-xserver-server(videodrv-abi) <= 6.0
 Requires:	xorg-xserver-server(videodrv-abi) >= 2.0
@@ -82,9 +83,6 @@
 ExclusiveArch:	i586 i686 athlon pentium3 pentium4 %{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		_ccver	%(rpm -q --qf "%{VERSION}" gcc | sed 's/\\..*//')
 
 %define		_noautoreqdep	libGL.so.1
@@ -133,7 +131,7 @@
 Summary:	Header files for development for the ATI Radeon cards proprietary driver
 Summary(pl.UTF-8):	Pliki nagłówkowe do programowania z użyciem własnościowego sterownika dla kart ATI Radeon
 Group:		X11/Development/Libraries
-Requires:	%{pname} = %{epoch}:%{version}-%{release}
+Requires:	%{pname} = %{epoch}:%{version}-%{rel}
 # or more?
 Requires:	xorg-proto-glproto-devel
 
@@ -149,7 +147,7 @@
 Summary:	Static libraries for development for the ATI Radeon cards proprietary driver
 Summary(pl.UTF-8):	Biblioteki statyczne do programowania z użyciem własnościowego sterownika dla kart ATI Radeon
 Group:		X11/Development/Libraries
-Requires:	%{pname}-devel = %{epoch}:%{version}-%{release}
+Requires:	%{pname}-devel = %{epoch}:%{version}-%{rel}
 
 %description static
 Static libraries for development for the ATI proprietary driver for
@@ -162,7 +160,7 @@
 %package -n kernel%{_alt_kernel}-video-firegl-legacy-%{legacy}
 Summary:	ATI kernel module for FireGL support
 Summary(pl.UTF-8):	Moduł jądra oferujący wsparcie dla ATI FireGL
-Release:	%{release}@%{_kernel_ver_str}
+Release:	%{rel}@%{_kernel_ver_str}
 License:	ATI
 Group:		Base/Kernel
 %{?with_dist_kernel:%requires_releq_kernel}
@@ -349,6 +347,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2012/02/07 13:04:58  baggins
+- use rel macro
+
 Revision 1.7  2012/02/07 06:36:57  baggins
 - typo
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xorg-driver-video-fglrx-legacy-9.x/xorg-driver-video-fglrx-legacy-9.x.spec?r1=1.7&r2=1.8&f=u