SPECS (Titanium): xorg-driver-video-fglrx.spec - merged version 8....

[hawk]

Author: hawk                         Date: Mon Jan 21 11:03:34 2008 GMT
Module: SPECS                         Tag: Titanium
---- Log message:
- merged version 8.1 from HEAD

---- Files affected:
SPECS:
   xorg-driver-video-fglrx.spec (1.59.2.1 -> 1.59.2.2) 

---- Diffs:

================================================================
Index: SPECS/xorg-driver-video-fglrx.spec
diff -u SPECS/xorg-driver-video-fglrx.spec:1.59.2.1 SPECS/xorg-driver-video-fglrx.spec:1.59.2.2
--- SPECS/xorg-driver-video-fglrx.spec:1.59.2.1	Mon Nov 12 11:12:02 2007
+++ SPECS/xorg-driver-video-fglrx.spec	Mon Jan 21 12:03:28 2008
@@ -29,15 +29,16 @@
 Summary:	Linux Drivers for ATI graphics accelerators
 Summary(pl.UTF-8):	Sterowniki do akceleratorĂłw graficznych ATI
 Name:		%{pname}%{_alt_kernel}
-Version:	8.42.3
-%define		_rel	3
+Version:	8.1
+%define		_rel	1
 Release:	%{_rel}%{?with_multigl:.mgl}
+Epoch:		1
 License:	ATI Binary (parts are GPL)
 Group:		X11
-Source0:	http://dlmdownloads.ati.com/drivers/linux/ati-driver-installer-%{version}-x86.x86_64.run
-# Source0-md5:	56ff087389b5594f0db9949354bb0698
+Source0:        http://dlmdownloads.ati.com/drivers/linux/ati-driver-installer-8-01-x86.x86_64.run
+# Source0-md5:	cf8f493901f5abb28347e7aa7c9d6cca
+Source1:	%{pname}.desktop
 Patch0:		%{pname}-kh.patch
-Patch1:		%{pname}-pm.patch
 URL:		http://www.ati.com/support/drivers/linux/radeon-linux.html
 %{?with_userspace:BuildRequires:	OpenGL-GLU-devel}
 %{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.20.2}
@@ -89,7 +90,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} = %{version}-%{release}
+Requires:	%{pname} = %{epoch}:%{version}-%{release}
 # or more?
 Requires:	xorg-proto-glproto-devel
 
@@ -105,7 +106,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 = %{version}-%{release}
+Requires:	%{pname}-devel = %{epoch}:%{version}-%{release}
 
 %description static
 Static libraries for development for the ATI proprietary driver for
@@ -141,7 +142,6 @@
 %if %{with dist_kernel}
 %patch0 -p1
 %endif
-%patch1 -p2
 cd -
 
 install -d common%{_prefix}/{%{_lib},bin}
@@ -165,13 +165,19 @@
 %endif
 
 %if %{with userspace}
-install -d $RPM_BUILD_ROOT{%{_sysconfdir}/{ati,env.d},%{_bindir},%{_libdir}/xorg/modules,%{_includedir}/{X11/extensions,GL}}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir}/{ati,env.d},%{_bindir},%{_pixmapsdir},%{_desktopdir},%{_datadir}/ati,%{_libdir}/xorg/modules,%{_includedir}/{X11/extensions,GL}}
 
-install common%{_bindir}/{fgl_glxgears,fglrxinfo,aticonfig,fglrx_xgamma} \
+install common%{_bindir}/{fgl_glxgears,fglrxinfo,aticonfig,fglrx_xgamma,amdcccle} \
 	$RPM_BUILD_ROOT%{_bindir}
 cp -r common%{_libdir}/modules/* $RPM_BUILD_ROOT%{_libdir}/xorg/modules
 cp -r common%{_sysconfdir}/ati/control $RPM_BUILD_ROOT%{_sysconfdir}/ati/control
 cp -r common%{_sysconfdir}/ati/signature $RPM_BUILD_ROOT%{_sysconfdir}/ati/signature
+cp -r common%{_sysconfdir}/ati/amdpcsdb.default $RPM_BUILD_ROOT%{_sysconfdir}/ati/amdpcsdb.default
+cp -r common%{_sysconfdir}/ati/atiogl.xml $RPM_BUILD_ROOT%{_sysconfdir}/ati/atiogl.xml
+
+cp -r common%{_datadir}/ati/* $RPM_BUILD_ROOT%{_datadir}/ati
+cp -r %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
+cp -r common%{_datadir}/icons/*.xpm $RPM_BUILD_ROOT%{_pixmapsdir}
 
 %if %{with multigl}
 install -d $RPM_BUILD_ROOT{%{_sysconfdir}/ld.so.conf.d,%{_libdir}/fglrx}
@@ -219,12 +225,17 @@
 %if %{with userspace}
 %files
 %defattr(644,root,root,755)
-%doc ATI_LICENSE.TXT common%{_docdir}/fglrx/*.html common%{_docdir}/fglrx/articles common%{_docdir}/fglrx/release-notes common%{_docdir}/fglrx/user-manual
+%doc 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
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ati/amdpcsdb.default
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ati/atiogl.xml
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/env.d/LIBGL_DRIVERS_PATH
 %attr(755,root,root) %{_bindir}/*
+%{_desktopdir}
+%{_pixmapsdir}/*.xpm
+%{_datadir}/ati
 %if %{with multigl}
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ld.so.conf.d/fglrx.conf
 %dir %{_libdir}/fglrx
@@ -282,6 +293,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.59.2.2  2008-01-21 11:03:28  hawk
+- merged version 8.1 from HEAD
+
 Revision 1.59.2.1  2007-11-12 10:12:02  hawk
 - dropped unused verbose bcond
 - disable userspace for alt_kernels
================================================================

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