Author: glen Date: Thu Jul 3 07:01:25 2008 GMT
Module: SPECS Tag: AC-branch
---- Log message:
- use vermagic deps, use %{cc_version} macro
---- Files affected:
SPECS:
X11-driver-firegl.spec (1.141.2.27 -> 1.141.2.28)
---- Diffs:
================================================================
Index: SPECS/X11-driver-firegl.spec
diff -u SPECS/X11-driver-firegl.spec:1.141.2.27
SPECS/X11-driver-firegl.spec:1.141.2.28
--- SPECS/X11-driver-firegl.spec:1.141.2.27 Thu Jul 3 08:57:03 2008
+++ SPECS/X11-driver-firegl.spec Thu Jul 3 09:01:18 2008
@@ -41,10 +41,9 @@
BuildRequires: X11-devel >= 1:6.9.0
%{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build >=
3:2.6.20.2}
%{?with_userspace:BuildRequires: qt-devel}
-BuildRequires: rpmbuild(macros) >= 1.379
+BuildRequires: rpmbuild(macros) >= 1.453
Requires: X11-OpenGL-core >= 1:6.9.0
Requires: X11-Xserver
-%{?with_kernel:Requires: X11-driver-firegl(kernel)}
Requires: X11-libs < 1:7.0.0
Requires: X11-libs >= 1:6.9.0
Requires: X11-modules < 1:7.0.0
@@ -58,10 +57,10 @@
ExclusiveArch: i586 i686 athlon pentium3 pentium4 %{x8664}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%define _ccver %(rpm -q --qf "%{VERSION}" gcc | sed
's/\\..*//')
-
%define _noautoreqdep libGL.so.1
+%define GCC_VER_MAJ %(V=%{cc_version}; echo
${V%%.*})
+
%description
Display driver files for the ATI Radeon 8500, 9700, Mobility M9 and
the FireGL 8700/8800, E1, Z1/X1 graphics accelerators. This package
@@ -104,12 +103,11 @@
%package -n kernel%{_alt_kernel}-video-firegl
Summary: ATI kernel module for FireGL support
Summary(pl.UTF-8): Moduł jądra oferujący wsparcie dla ATI FireGL
-Release: [EMAIL PROTECTED]
+Release: [EMAIL PROTECTED]
License: ATI
Group: Base/Kernel
-%{?with_dist_kernel:%requires_releq_kernel}
Requires(post,postun): /sbin/depmod
-Provides: X11-driver-firegl(kernel)
+%{?with_dist_kernel:Requires: kernel%{_alt_kernel}(vermagic) = %{_kernel_ver}}
%description -n kernel%{_alt_kernel}-video-firegl
ATI kernel module for FireGL support.
@@ -138,7 +136,7 @@
%if %{with kernel}
cd common/lib/modules/fglrx/build_mod
cp -f 2.6.x/Makefile .
-%build_kernel_modules -m fglrx GCC_VER_MAJ=%{_ccver}
+%build_kernel_modules -m fglrx GCC_VER_MAJ=%{GCC_VER_MAJ}
cd -
%endif
@@ -229,6 +227,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.141.2.28 2008/07/03 07:01:18 glen
+- use vermagic deps, use %{cc_version} macro
+
Revision 1.141.2.27 2008/07/03 06:57:03 glen
- use _x_libraries macro
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/X11-driver-firegl.spec?r1=1.141.2.27&r2=1.141.2.28&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
