rpms/xorg-x11-drv-intel/F-11 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 xorg-x11-drv-intel.spec, 1.14, 1.15

[Adam Jackson]

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-drv-intel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32150

Modified Files:
	.cvsignore sources xorg-x11-drv-intel.spec 
Log Message:
* Thu Apr 23 2009 Adam Jackson <ajax at redhat.com> 2.7.0-2
- Add intel-gpu-tools subpackage



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	17 Apr 2009 17:52:07 -0000	1.4
+++ .cvsignore	23 Apr 2009 14:55:06 -0000	1.5
@@ -1 +1,2 @@
 xf86-video-intel-2.7.0.tar.bz2
+intel-gpu-tools-20090423.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	17 Apr 2009 17:52:07 -0000	1.4
+++ sources	23 Apr 2009 14:55:06 -0000	1.5
@@ -1 +1,2 @@
 5832172ac69b9a066a202e1578a5d3c8  xf86-video-intel-2.7.0.tar.bz2
+91ab3b7e5747480f5a85ab57b8541f68  intel-gpu-tools-20090423.tar.bz2


Index: xorg-x11-drv-intel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/F-11/xorg-x11-drv-intel.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- xorg-x11-drv-intel.spec	21 Apr 2009 17:34:40 -0000	1.14
+++ xorg-x11-drv-intel.spec	23 Apr 2009 14:55:06 -0000	1.15
@@ -2,19 +2,21 @@
 %define legacyver   2.6.0-8
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/drivers
+%define gputoolsdate 20090423
 
-Summary:   Xorg X11 Intel video driver(s)
+Summary:   Xorg X11 Intel video driver
 Name:      xorg-x11-drv-intel
 Version:   2.7.0
-Release:   1%{?dist}
+Release:   2%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:   http://xorg.freedesktop.org/archive/individual/driver/xf86-video-intel-%{version}.tar.bz2 
-
-Source2:   intel.xinf
+Source0:    http://xorg.freedesktop.org/archive/individual/driver/xf86-video-intel-%{version}.tar.bz2 
+Source1:    make-intel-gpu-tools-snapshot.sh
+Source2:    intel.xinf
+Source3:    intel-gpu-tools-%{gputoolsdate}.tar.bz2
 
 Patch1: kill-svideo.patch
 Patch2: copy-fb.patch
@@ -56,14 +58,21 @@
 %description devel
 X.Org X11 Intel video driver XvMC development package.
 
+%package -n intel-gpu-tools
+Summary:    Debugging tools for Intel graphics chips
+Group:	    Development/Tools
+
+%description -n intel-gpu-tools
+Debugging tools for Intel graphics chips
+
 %prep
-%setup -q -n xf86-video-intel-%{version}
+%setup -q -n xf86-video-intel-%{version} -b3
 %patch1 -p1 -b .svideo
 %patch2 -p1 -b .copy-fb
 %patch10 -p1 -b .kms-props
 %patch20 -p1 -b .get-crtc
 # notyet.  we don't handle switching in and out of tiled front buffer
-# correctly yet, so let's not have peopel stumble into it more than
+# correctly yet, so let's not have people stumble into it more than
 # they have to.
 #patch21 -p1 -b .jx
 
@@ -73,6 +82,12 @@
 %configure --disable-static --libdir=%{_libdir} --mandir=%{_mandir} --enable-dri --enable-kms
 make
 
+pushd ../intel-gpu-tools-%{gputoolsdate}
+autoreconf -v --install
+%configure
+make
+popd
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -80,6 +95,10 @@
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases
 install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases/
 
+pushd ../intel-gpu-tools-%{gputoolsdate}
+make install DESTDIR=$RPM_BUILD_ROOT
+popd
+
 find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
 %clean
@@ -103,7 +122,14 @@
 %{_libdir}/libI810XvMC.so
 %{_libdir}/libIntelXvMC.so
 
+%files -n intel-gpu-tools
+%defattr(-,root,root,-)
+%{_bindir}/intel_*
+
 %changelog
+* Thu Apr 23 2009 Adam Jackson <ajax at redhat.com> 2.7.0-2
+- Add intel-gpu-tools subpackage
+
 * Fri Apr 17 2009 Adam Jackson <ajax at redhat.com> 2.7.0-1
 - intel 2.7.0