packages: xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec - build fixe...

[august84]

Author: august84                     Date: Wed Apr 20 21:02:29 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- build fixed; real rel 1 for old xserver

---- Files affected:
packages/xorg-driver-video-fglrx:
   xorg-driver-video-fglrx.spec (1.232 -> 1.233) 

---- Diffs:

================================================================
Index: packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec
diff -u packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec:1.232 packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec:1.233
--- packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec:1.232	Wed Apr 20 18:28:43 2011
+++ packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec	Wed Apr 20 23:02:21 2011
@@ -50,7 +50,7 @@
 Patch3:		%{pname}-desktop.patch
 Patch4:		%{pname}-nofinger.patch
 Patch5:		%{pname}-GPL-only.patch
-Patch6:     2.6.38_console.patch
+Patch6:		2.6.38_console.patch
 URL:		http://ati.amd.com/support/drivers/linux/linux-radeon.html
 %{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.20.2}
 BuildRequires:	rpmbuild(macros) >= 1.379
@@ -224,13 +224,12 @@
 cp -r arch/%{arch_dir}/usr/X11R6/bin/* common%{_bindir}
 cp -r arch/%{arch_dir}/usr/sbin/* common%{_sbindir}
 cp -r arch/%{arch_dir}/usr/%{_lib}/*.so* common%{_libdir}
-cp -r arch/%{arch_dir}/lib/modules/fglrx/build_mod/libfglrx_ip.a common/lib/modules/fglrx/build_mod
 
 %build
 %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 -c -m fglrx GCC_VER_MAJ=%{_ccver}
 cd -
 %endif
 
@@ -294,11 +293,11 @@
 %endif
 
 install common%{_includedir}/GL/*.h $RPM_BUILD_ROOT%{_includedir}/GL
-install common/usr/X11R6/include/X11/extensions/*.h $RPM_BUILD_ROOT%{_includedir}/X11/extensions
+#install common/usr/X11R6/include/X11/extensions/*.h $RPM_BUILD_ROOT%{_includedir}/X11/extensions
 echo "LIBGL_DRIVERS_PATH=%{_libdir}/xorg/modules/dri" > $RPM_BUILD_ROOT%{_sysconfdir}/env.d/LIBGL_DRIVERS_PATH
 
 cd $RPM_BUILD_ROOT%{_libdir}
-for f in libfglrx_dm libfglrx_gamma; do
+for f in libfglrx_dm; do
 %if %{with multigl}
 	ln -s fglrx/$f.so.*.* $f.so
 %else
@@ -387,8 +386,6 @@
 %attr(755,root,root) %{_libdir}/fglrx/libGL.so.*.*
 %attr(755,root,root) %{_libdir}/fglrx/libGL.so.1
 %attr(755,root,root) %{_libdir}/fglrx/libfglrx_dm.so.*.*
-%attr(755,root,root) %{_libdir}/fglrx/libfglrx_gamma.so.*.*
-%attr(755,root,root) %{_libdir}/fglrx/libfglrx_gamma.so.1
 %else
 %attr(755,root,root) %{_libdir}/libAMDXvBA.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/libAMDXvBA.so.1
@@ -405,16 +402,12 @@
 %attr(755,root,root) %ghost %{_libdir}/libGL.so.1
 %attr(755,root,root) %{_libdir}/libGL.so
 %attr(755,root,root) %{_libdir}/libfglrx_dm.so.*.*
-%attr(755,root,root) %{_libdir}/libfglrx_gamma.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libfglrx_gamma.so.1
 %endif
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libfglrx_dm.so
-%attr(755,root,root) %{_libdir}/libfglrx_gamma.so
 %{_includedir}/GL
-%{_includedir}/X11/extensions/fglrx_gamma.h
 %if %{with multigl}
 %attr(755,root,root) %{_libdir}/libGL.so
 %endif
@@ -423,7 +416,6 @@
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libfglrx_dm.a
-%{_libdir}/libfglrx_gamma.a
 
 %files atieventsd
 %defattr(644,root,root,755)
@@ -451,6 +443,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.233  2011/04/20 21:02:21  august84
+- build fixed; real rel 1 for old xserver
+
 Revision 1.232  2011/04/20 16:28:43  lisu
 - reversed
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xorg-driver-video-fglrx/xorg-driver-video-fglrx.spec?r1=1.232&r2=1.233&f=u