rpms/mesa/devel import.log, NONE, 1.1 .cvsignore, 1.28, 1.29 mesa.spec, 1.193, 1.194 sources, 1.28, 1.29

[Adam Jackson]

Author: ajax

Update of /cvs/pkgs/rpms/mesa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2814/devel

Modified Files:
	.cvsignore mesa.spec sources 
Added Files:
	import.log 
Log Message:
add xdriinfo



--- NEW FILE import.log ---
mesa-7_2-0_3_fc10:HEAD:mesa-7.2-0.3.fc10.src.rpm:1222723005


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	5 Sep 2008 05:48:02 -0000	1.28
+++ .cvsignore	29 Sep 2008 21:19:22 -0000	1.29
@@ -1,2 +1,3 @@
 gl-manpages-1.0.1.tar.bz2
 mesa-20080905.tar.bz2
+xdriinfo-1.0.2.tar.bz2


Index: mesa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/mesa.spec,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -r1.193 -r1.194
--- mesa.spec	12 Sep 2008 07:24:14 -0000	1.193
+++ mesa.spec	29 Sep 2008 21:19:22 -0000	1.194
@@ -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 @@
 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 @@
 
 %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 -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 @@
 # 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 @@
 %defattr(-,root,root,-)
 %{_bindir}/glxgears
 %{_bindir}/glxinfo
+%{_bindir}/xdriinfo
+%{_datadir}/man/man1/xdriinfo.1*
 
 %files demos
 %defattr(-,root,root,-)
@@ -408,6 +422,9 @@
 %{_libdir}/mesa-demos-data
 
 %changelog
+* Mon Sep 29 2008 Adam Jackson <ajax at redhat.com> 7.2-0.3
+- Add xdriinfo. (#464388)
+
 * Fri Sep 12 2008 Dave Airlie <airlied at redhat.com> 7.2-0.2
 - intel stop vbl default for now
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mesa/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	5 Sep 2008 05:48:02 -0000	1.28
+++ sources	29 Sep 2008 21:19:22 -0000	1.29
@@ -1,2 +1,3 @@
 6ae05158e678f4594343f32c2ca50515  gl-manpages-1.0.1.tar.bz2
 d5e2a6d63b4611ec38aaab19b8f68117  mesa-20080905.tar.bz2
+a5ec51ed9f0a55dc3462d90d52ff899c  xdriinfo-1.0.2.tar.bz2