[xorg-x11-drv-glint] xorg-x11-drv-glint-1.2.5-1.fc16

[Adam Jackson]

commit ad750c5aeaf7b415040807c0ed781675f2424c86
Author: Adam Jackson <ajax at redhat.com>
Date:   Tue Jun 21 13:24:02 2011 -0400

    xorg-x11-drv-glint-1.2.5-1.fc16

 .gitignore              |    1 +
 sources                 |    2 +-
 xorg-x11-drv-glint.spec |   20 ++++++--------------
 3 files changed, 8 insertions(+), 15 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b094030..ad1c1c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 xf86-video-glint-1.2.4.tar.bz2
+/xf86-video-glint-1.2.5.tar.bz2
diff --git a/sources b/sources
index ed42f53..5011983 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-960df34e129faa411e58c0d6b56d79a3  xf86-video-glint-1.2.4.tar.bz2
+77313a32280bdfee6269e28eca144274  xf86-video-glint-1.2.5.tar.bz2
diff --git a/xorg-x11-drv-glint.spec b/xorg-x11-drv-glint.spec
index 1c6acf2..116739a 100644
--- a/xorg-x11-drv-glint.spec
+++ b/xorg-x11-drv-glint.spec
@@ -2,14 +2,10 @@
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/drivers
 
-# FIXME: DRI support for glint is more or less nonfunctional and unlikely to
-# ever be fixed.
-%define with_dri        1
-
 Summary:   Xorg X11 glint video driver
 Name:      xorg-x11-drv-glint
-Version:   1.2.4
-Release:   8%{?dist}
+Version:   1.2.5
+Release:   1%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -20,10 +16,6 @@ Source1:   glint.xinf
 ExcludeArch: s390 s390x
 
 BuildRequires: xorg-x11-server-devel >= 1.6.0
-%if %{with_dri}
-BuildRequires: mesa-libGL-devel >= 6.4-4
-BuildRequires: libdrm-devel >= 2.0-1
-%endif
 
 Requires:  hwdata
 Requires: Xorg %(xserver-sdk-abi-requires ansic)
@@ -36,10 +28,7 @@ X.Org X11 glint video driver.
 %setup -q -n %{tarball}-%{version}
 
 %build
-%configure --disable-static \
-%if ! %{with_dri}
-           --disable-dri
-%endif
+%configure --disable-static --disable-dri
 make
 
 %install
@@ -64,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/glint.4*
 
 %changelog
+* Tue Jun 21 2011 Adam Jackson <ajax at redhat.com> 1.2.5-1
+- glint 1.2.5
+
 * Wed May 11 2011 Peter Hutterer <peter.hutterer at redhat.com> - 1.2.4-8
 - Rebuild for server 1.11