SPECS: xorg-driver-video-fglrx.spec - use new kernel macros - remo...

shadzik shadzik at pld-linux.org
Sun Mar 25 23:54:22 CEST 2007


Author: shadzik                      Date: Sun Mar 25 21:54:22 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use new kernel macros
- remove smp stuff

---- Files affected:
SPECS:
   xorg-driver-video-fglrx.spec (1.31 -> 1.32) 

---- Diffs:

================================================================
Index: SPECS/xorg-driver-video-fglrx.spec
diff -u SPECS/xorg-driver-video-fglrx.spec:1.31 SPECS/xorg-driver-video-fglrx.spec:1.32
--- SPECS/xorg-driver-video-fglrx.spec:1.31	Fri Feb 23 13:12:49 2007
+++ SPECS/xorg-driver-video-fglrx.spec	Sun Mar 25 23:54:17 2007
@@ -3,8 +3,6 @@
 # Conditional build:
 %bcond_without	dist_kernel	# without distribution kernel
 %bcond_without	kernel		# don't build kernel modules
-%bcond_without	smp		# don't build SMP module
-%bcond_without	up		# don't build UP module
 %bcond_without	userspace	# don't build userspace tools
 %bcond_with	verbose		# verbose build (V=1)
 
@@ -42,7 +40,7 @@
 %{?with_userspace:BuildRequires:	OpenGL-GLU-devel}
 %{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.14}
 %{?with_userspace:BuildRequires:	qt-devel}
-BuildRequires:	rpmbuild(macros) >= 1.330
+BuildRequires:	rpmbuild(macros) >= 1.379
 BuildRequires:	xorg-lib-libXmu-devel
 BuildRequires:	xorg-lib-libXxf86vm-devel
 BuildRequires:	xorg-proto-recordproto-devel
@@ -112,7 +110,7 @@
 Release:	%{_rel}@%{_kernel_ver_str}
 License:	ATI
 Group:		Base/Kernel
-%{?with_dist_kernel:%requires_releq_kernel_up}
+%{?with_dist_kernel:%requires_releq_kernel}
 Requires(post,postun):	/sbin/depmod
 Provides:	xorg-driver-video-fglrx(kernel)
 
@@ -122,22 +120,6 @@
 %description -n kernel%{_alt_kernel}-video-firegl -l pl.UTF-8
 Moduł jądra oferujący wsparcie dla ATI FireGL.
 
-%package -n kernel%{_alt_kernel}-smp-video-firegl
-Summary:	ATI kernel module for FireGL support
-Summary(pl.UTF-8):	Moduł jądra oferujący wsparcie dla ATI FireGL
-Release:	%{_rel}@%{_kernel_ver_str}
-License:	ATI
-Group:		Base/Kernel
-%{?with_dist_kernel:%requires_releq_kernel_smp}
-Requires(post,postun):	/sbin/depmod
-Provides:	xorg-driver-video-fglrx(kernel)
-
-%description -n kernel%{_alt_kernel}-smp-video-firegl
-ATI kernel module for FireGL support.
-
-%description -n kernel%{_alt_kernel}-smp-video-firegl -l pl.UTF-8
-Moduł jądra oferujący wsparcie dla ATI FireGL.
-
 %prep
 %setup -q -c -T
 
@@ -220,12 +202,6 @@
 %postun -n kernel%{_alt_kernel}-video-firegl
 %depmod %{_kernel_ver}
 
-%post	-n kernel%{_alt_kernel}-smp-video-firegl
-%depmod %{_kernel_ver}smp
-
-%postun -n kernel%{_alt_kernel}-smp-video-firegl
-%depmod %{_kernel_ver}smp
-
 %if %{with userspace}
 %files
 %defattr(644,root,root,755)
@@ -257,25 +233,21 @@
 %endif
 
 %if %{with kernel}
-%if %{with up}
 %files -n kernel%{_alt_kernel}-video-firegl
 %defattr(644,root,root,755)
 /lib/modules/%{_kernel_ver}/misc/*.ko*
 %endif
 
-%if %{with smp} && %{with dist_kernel}
-%files -n kernel%{_alt_kernel}-smp-video-firegl
-%defattr(644,root,root,755)
-/lib/modules/%{_kernel_ver}smp/misc/*.ko*
-%endif
-%endif
-
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.32  2007/03/25 21:54:17  shadzik
+- use new kernel macros
+- remove smp stuff
+
 Revision 1.31  2007/02/23 12:12:49  vip
 - up to 8.34.8
 - fix build with 2.6.20 kernels
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/xorg-driver-video-fglrx.spec?r1=1.31&r2=1.32&f=u



More information about the pld-cvs-commit mailing list