add xdriinfomesa-7_2-0_3_fc10

4 files changed, 22 insertions, 2 deletions

diff --git a/.cvsignore b/.cvsignore
index 3a4010b..c8d4ca6 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,3 @@
 gl-manpages-1.0.1.tar.bz2
 mesa-20080905.tar.bz2
+xdriinfo-1.0.2.tar.bz2
diff --git a/import.log b/import.log
new file mode 100644
index 0000000..1c8753e
--- /dev/null
+++ b/import.log
@@ -0,0 +1 @@
+mesa-7_2-0_3_fc10:HEAD:mesa-7.2-0.3.fc10.src.rpm:1222723005
diff --git a/mesa.spec b/mesa.spec
index 1e60726..a046c47 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -12,12 +12,13 @@
 %define _default_patch_fuzz 2
 
 %define manpages gl-manpages-1.0.1
+%define xdriinfo xdriinfo-1.0.2
 %define gitdate 20080905
 
 Summary: Mesa graphics libraries
 Name: mesa
 Version: 7.2
-Release: 0.2%{?dist}
+Release: 0.3%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://www.mesa3d.org
@@ -29,6 +30,8 @@ Source0: %{name}-%{gitdate}.tar.bz2
 Source2: %{manpages}.tar.bz2
 Source3: make-git-snapshot.sh
 
+Source5: http://www.x.org/pub/individual/app/%{xdriinfo}.tar.bz2
+
 Patch0: mesa-7.1-osmesa-version.patch
 Patch2: mesa-7.1-nukeglthread-debug.patch
 Patch3: mesa-no-mach64.patch
@@ -165,7 +168,7 @@ This package provides some demo applications for testing Mesa.
 
 %prep
 #%setup -q -n Mesa-%{version}pre -b1 -b2
-%setup -q -n mesa-%{gitdate} -b2
+%setup -q -n mesa-%{gitdate} -b2 -b5
 %patch0 -p1 -b .osmesa
 %patch2 -p1 -b .intel-glthread
 %patch3 -p0 -b .no-mach64
@@ -230,6 +233,11 @@ make #{?_smp_mflags}
 make -C progs/xdemos glxgears glxinfo
 make %{?_smp_mflags} -C progs/demos
 
+pushd ../%{xdriinfo}
+%configure
+make %{?_smp_mflags}
+popd
+
 pushd ../%{manpages}
 %configure
 make %{?_smp_mflags}
@@ -271,6 +279,10 @@ install -m 0644 progs/demos/*.dat $RPM_BUILD_ROOT/%{_libdir}/mesa-demos-data
 # and osmesa
 mv osmesa*/* $RPM_BUILD_ROOT%{_libdir}
 
+pushd ../%{xdriinfo}
+make %{?_smp_mflags} install DESTDIR=$RPM_BUILD_ROOT
+popd
+
 # man pages
 pushd ../%{manpages}
 make %{?_smp_mflags} install DESTDIR=$RPM_BUILD_ROOT
@@ -349,6 +361,8 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{_bindir}/glxgears
 %{_bindir}/glxinfo
+%{_bindir}/xdriinfo
+%{_datadir}/man/man1/xdriinfo.1*
 
 %files demos
 %defattr(-,root,root,-)
@@ -408,6 +422,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/mesa-demos-data
 
 %changelog
+* Mon Sep 29 2008 Adam Jackson <ajax@redhat.com> 7.2-0.3
+- Add xdriinfo. (#464388)
+
 * Fri Sep 12 2008 Dave Airlie <airlied@redhat.com> 7.2-0.2
 - intel stop vbl default for now
 
diff --git a/sources b/sources
index 8c9b49d..dd47872 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
 6ae05158e678f4594343f32c2ca50515  gl-manpages-1.0.1.tar.bz2
 d5e2a6d63b4611ec38aaab19b8f68117  mesa-20080905.tar.bz2
+a5ec51ed9f0a55dc3462d90d52ff899c  xdriinfo-1.0.2.tar.bz2