SPECS: xorg-driver-video-fglrx.spec - oops, now it's really 8.10.1 - thx pluto

[shadzik]

Author: shadzik                      Date: Sun Nov  2 18:23:17 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- oops, now it's really 8.10.1 - thx pluto

---- Files affected:
SPECS:
   xorg-driver-video-fglrx.spec (1.114 -> 1.115) 

---- Diffs:

================================================================
Index: SPECS/xorg-driver-video-fglrx.spec
diff -u SPECS/xorg-driver-video-fglrx.spec:1.114 SPECS/xorg-driver-video-fglrx.spec:1.115
--- SPECS/xorg-driver-video-fglrx.spec:1.114	Sun Nov  2 18:46:27 2008
+++ SPECS/xorg-driver-video-fglrx.spec	Sun Nov  2 19:23:12 2008
@@ -7,7 +7,7 @@
 %bcond_with	verbose		# verbose build (V=1)
 %bcond_with	multigl		# package libGL in a way allowing concurrent install with nvidia/fglrx drivers
 
-%define		x11ver		x710
+%define		x11ver		x740
 
 %if %{without kernel}
 %undefine	with_dist_kernel
@@ -38,8 +38,9 @@
 Epoch:		1
 License:	ATI Binary (parts are GPL)
 Group:		X11
-Source0:	http://dlmdownloads.ati.com/drivers/linux/ati-driver-installer-8-10-x86.x86_64.run
-# Source0-md5:	4eed6f50089856a4c600a200914d5a55
+#Source0:	http://dlmdownloads.ati.com/drivers/linux/ati-driver-installer-8-10-x86.x86_64.run
+Source0:	http://ftp.kaist.ac.kr/ubuntu/pool/restricted/f/fglrx-installer/fglrx-installer_8.543.orig.tar.gz
+# Source0-md5:	6abc8e86f1a00168ba8f43d58f71cb69
 Source1:	%{pname}.desktop
 Patch0:		%{pname}-kh.patch
 Patch1:		%{pname}-smp.patch
@@ -56,6 +57,7 @@
 Requires:	xorg-xserver-libglx
 Requires:	xorg-xserver-server
 Requires:	xorg-xserver-server(videodrv-abi) >= 2.0
+Requires:	xorg-xserver-server(videodrv-abi) < 3.0
 Provides:	OpenGL = 2.0
 Provides:	OpenGL-GLX = 1.4
 # hack to make OpenGL ABI compatible
@@ -138,9 +140,10 @@
 %prep
 %setup -q -c -T
 
-sh %{SOURCE0} --extract .
+tar -zxf %{SOURCE0}
 
-cp arch/%{arch_dir}/lib/modules/fglrx/build_mod/* common/lib/modules/fglrx/build_mod
+install -d common/lib/modules/fglrx/build_mod
+cp -rf lib/modules/fglrx/build_mod/* common/lib/modules/fglrx/build_mod
 
 cd common
 %if %{with dist_kernel}
@@ -150,10 +153,22 @@
 cd -
 
 install -d common%{_prefix}/{%{_lib},bin,sbin}
+install -d common%{_sysconfdir}/ati
+install -d common%{_datadir}/{ati,icons,doc/fglrx}
+install -d common%{_includedir}
 cp -r %{x11ver}%{arch_sufix}/usr/X11R6/%{_lib}/* common%{_libdir}
-cp -r arch/%{arch_dir}/usr/X11R6/%{_lib}/* common%{_libdir}
+cp -r arch/%{arch_dir}/lib/* common/lib
 cp -r arch/%{arch_dir}/usr/X11R6/bin/* common%{_bindir}
+cp -r arch/%{arch_dir}/usr/X11R6/%{_lib}/* common%{_libdir}
 cp -r arch/%{arch_dir}/usr/sbin/* common%{_sbindir}
+cp -r etc/* common%{_sysconfdir}
+cp -r usr/X11R6/bin/* common%{_bindir}
+cp -r usr/sbin/* common%{_sbindir}
+cp -r usr/share/ati/* common%{_datadir}/ati
+cp -r usr/share/doc/* common%{_datadir}/doc
+cp -r usr/share/icons/* common%{_datadir}/icons
+cp -r usr/include/* common%{_includedir}
+cp -r usr/X11R6/include/* common%{_includedir}
 
 %build
 %if %{with kernel}
@@ -205,7 +220,7 @@
 %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/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}
@@ -233,7 +248,7 @@
 %if %{with userspace}
 %files
 %defattr(644,root,root,755)
-%doc ATI_LICENSE.TXT common%{_docdir}/fglrx/*.html common%{_docdir}/fglrx/articles common%{_docdir}/fglrx/user-manual
+%doc common%{_docdir}/fglrx/ATI_LICENSE.TXT common%{_docdir}/fglrx/*.html common%{_docdir}/fglrx/articles common%{_docdir}/fglrx/user-manual
 %dir %{_sysconfdir}/ati
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ati/control
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ati/signature
@@ -286,6 +301,7 @@
 %attr(755,root,root) %{_libdir}/xorg/modules/dri/fglrx_dri.so
 %attr(755,root,root) %{_libdir}/xorg/modules/drivers/fglrx_drv.so
 #%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libdri.so
+#%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libglx.so
 %attr(755,root,root) %{_libdir}/xorg/modules/linux/libfglrxdrm.so
 %attr(755,root,root) %{_libdir}/xorg/modules/amdxmm.so
 %attr(755,root,root) %{_libdir}/xorg/modules/glesx.so
@@ -324,10 +340,8 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.114  2008/11/02 17:46:27  shadzik
-- up to 8.10.1
-- not tested, should support Xserver ABI >= 3.0, someone with ATI and Xserver 1.5.x please test it
-- rel 0.1
+Revision 1.115  2008/11/02 18:23:12  shadzik
+- oops, now it's really 8.10.1 - thx pluto
 
 Revision 1.113  2008/10/27 14:01:59  glen
 - disable debuginfo for kernel only build
================================================================

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