- Remove dri_interface.h. It's not protocol, it belongs in Mesa.

xorg-x11-proto-devel.spec

@@ -10,7 +10,7 @@
 Summary: X.Org X11 Protocol headers
 Name: xorg-x11-proto-devel
 Version: 7.2
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: MIT
 Group: Development/System
 URL: http://www.x.org
@@ -104,6 +104,8 @@ done
 for i in composite damage randr ; do
     mv $RPM_BUILD_ROOT/usr/share/doc/${i}proto/${i}proto.txt .
 done
+# this header is supposed to come from Mesa, not driproto
+rm -f $RPM_BUILD_ROOT/GL/internal/dri_interface.h
 
 # libXext still needs XLbx.h and lbxstr.h to build.  The rest are junk.
 rm -f $RPM_BUILD_ROOT%{_includedir}/X11/extensions/lbxbuf.h \
@@ -129,7 +131,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/GL/glxtokens.h
 %dir %{_includedir}/GL/internal
 %{_includedir}/GL/internal/glcore.h
-%{_includedir}/GL/internal/dri_interface.h
 %dir %{_includedir}/X11
 %{_includedir}/X11/DECkeysym.h
 %{_includedir}/X11/HPkeysym.h
@@ -291,6 +292,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/xproxymngproto.pc
 
 %changelog
+* Tue Jul 24 2007 Adam Jackson <ajax@redhat.com> 7.2-12
+- Remove dri_interface.h.  It's not protocol, it belongs in Mesa.
+
 * Wed Jul 11 2007 Adam Jackson <ajax@redhat.com> 7.2-11
 - compositeproto 0.4