SPECS (AC-branch): X11-driver-firegl.spec - packed amdxmm.so module and lib...

[maciek2w]

Author: maciek2w                     Date: Fri Sep 26 17:58:29 2008 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- packed amdxmm.so module and libatiadlxx.so library
- Xv starts working for me
- STBR

---- Files affected:
SPECS:
   X11-driver-firegl.spec (1.141.2.31 -> 1.141.2.32) 

---- Diffs:

================================================================
Index: SPECS/X11-driver-firegl.spec
diff -u SPECS/X11-driver-firegl.spec:1.141.2.31 SPECS/X11-driver-firegl.spec:1.141.2.32
--- SPECS/X11-driver-firegl.spec:1.141.2.31	Wed Jul 23 13:03:59 2008
+++ SPECS/X11-driver-firegl.spec	Fri Sep 26 19:58:23 2008
@@ -1,15 +1,4 @@
 # $Revision$, $Date$
-# TODO
-# - unpackaged files:
-#   /usr/X11R6/lib/libatiadlxx.so
-#   /usr/X11R6/lib/libfglrx_dm.a
-#   /usr/X11R6/lib/libfglrx_gamma.a
-#   /usr/X11R6/lib/libfglrx_pp.a
-#   /usr/X11R6/lib/libfglrx_tvout.a
-#   /usr/X11R6/lib/modules/amdxmm.so
-#   /usr/X11R6/lib/modules/esut.a
-#   /usr/include/GL/glATI.h
-#   /usr/include/GL/glxATI.h
 # Conditional build:
 %bcond_without	dist_kernel	# without distribution kernel
 %bcond_without	kernel		# don't build kernel modules
@@ -35,7 +24,7 @@
 %define		arch_dir	x86_64
 %endif
 
-%define		rel	1
+%define		rel	2
 %define		ver	%(echo %{version}  | tr . -)
 Summary:	Linux Drivers for ATI graphics accelerators
 Summary(pl.UTF-8):	Sterowniki do akceleratorów graficznych ATI
@@ -167,6 +156,13 @@
 install common/usr/bin/{fgl_glxgears,fglrxinfo,aticonfig,fglrx_xgamma} \
 	$RPM_BUILD_ROOT%{_bindir}
 
+#remove not needed files
+rm -f common%{_x_libraries}/libfglrx_dm.a
+rm -f common%{_x_libraries}/libfglrx_gamma.a
+rm -f common%{_x_libraries}/libfglrx_pp.a
+rm -f common%{_x_libraries}/libfglrx_tvout.a
+rm -f common%{_x_libraries}/modules/esut.a
+
 cp -r common%{_x_libraries}/lib* $RPM_BUILD_ROOT%{_x_libraries}
 cp -r common%{_x_libraries}/modules/* $RPM_BUILD_ROOT%{_x_libraries}/modules
 cp -r common/etc/ati/* $RPM_BUILD_ROOT%{_sysconfdir}/ati/
@@ -177,9 +173,6 @@
 
 cp -r common/etc/ati/control $RPM_BUILD_ROOT%{_sysconfdir}/ati/control
 echo "LIBGL_DRIVERS_PATH=%{_x_libraries}/modules/dri" > $RPM_BUILD_ROOT%{_sysconfdir}/env.d/LIBGL_DRIVERS_PATH
-
-install common/usr/include/GL/*.h $RPM_BUILD_ROOT%{_includedir}/GL
-# install common/usr/include/X11/extensions/*.h $RPM_BUILD_ROOT%{_includedir}/X11/extensions
 %endif
 
 %clean
@@ -208,6 +201,7 @@
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ati/logo_mask.xbm.example
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/env.d/LIBGL_DRIVERS_PATH
 %attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_x_libraries}/libatiadlxx.so
 %attr(755,root,root) %{_x_libraries}/libGL.so.*.*
 %attr(755,root,root) %{_x_libraries}/libGL.so.1
 %attr(755,root,root) %{_x_libraries}/libGL.so
@@ -215,6 +209,7 @@
 %attr(755,root,root) %{_x_libraries}/libfglrx_gamma.so.*.*
 %attr(755,root,root) %{_x_libraries}/libfglrx_pp.so.*.*
 %attr(755,root,root) %{_x_libraries}/libfglrx_tvout.so.*.*
+%attr(755,root,root) %{_x_libraries}/modules/amdxmm.so
 %attr(755,root,root) %{_x_libraries}/modules/glesx.so
 %attr(755,root,root) %{_x_libraries}/modules/dri/fglrx_dri.so
 %attr(755,root,root) %{_x_libraries}/modules/drivers/fglrx_drv.so
@@ -245,6 +240,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.141.2.32  2008/09/26 17:58:23  maciek2w
+- packed amdxmm.so module and libatiadlxx.so library
+- Xv starts working for me
+- STBR
+
 Revision 1.141.2.31  2008/07/23 11:03:59  matkor
 - Version 8.7.
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/X11-driver-firegl.spec?r1=1.141.2.31&r2=1.141.2.32&f=u