rpms/xorg-x11-proto-devel/devel xorg-x11-proto-devel.spec, 1.45, 1.46

[fedora-cvs-commits at redhat.com]

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-proto-devel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20623

Modified Files:
	xorg-x11-proto-devel.spec 
Log Message:
* Tue Oct 3 2006 Adam Jackson <ajackson at redhat.com> 7.1-10
- Install just enough LBX headers to make libXext build. (#203815)



Index: xorg-x11-proto-devel.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-proto-devel/devel/xorg-x11-proto-devel.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- xorg-x11-proto-devel.spec	1 Oct 2006 21:19:24 -0000	1.45
+++ xorg-x11-proto-devel.spec	3 Oct 2006 16:08:20 -0000	1.46
@@ -10,7 +10,7 @@
 Summary: X.Org X11 Protocol headers
 Name: xorg-x11-proto-devel
 Version: 7.1
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: The Open Group License
 Group: Development/System
 URL: http://www.x.org
@@ -90,9 +90,13 @@
 	popd
 done
 
-# NOTE: LBX has been discontinued upstream, however xextproto still installs
-# the headers for it.  Probably an upstream oversight, so we remove them here.
-rm -f $RPM_BUILD_ROOT%{_includedir}/X11/extensions/{XLbx,lbx}*.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 \
+      $RPM_BUILD_ROOT%{_includedir}/X11/extensions/lbxbufstr.h \
+      $RPM_BUILD_ROOT%{_includedir}/X11/extensions/lbxdeltastr.h \
+      $RPM_BUILD_ROOT%{_includedir}/X11/extensions/lbximage.h \
+      $RPM_BUILD_ROOT%{_includedir}/X11/extensions/lbxopts.h \
+      $RPM_BUILD_ROOT%{_includedir}/X11/extensions/lbxzlib.h
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -151,9 +155,7 @@
 %{_includedir}/X11/extensions/XKBproto.h
 %{_includedir}/X11/extensions/XKBsrv.h
 %{_includedir}/X11/extensions/XKBstr.h
-%if 0
 %{_includedir}/X11/extensions/XLbx.h
-%endif
 %{_includedir}/X11/extensions/XResproto.h
 %{_includedir}/X11/extensions/XShm.h
 %{_includedir}/X11/extensions/XTest.h
@@ -184,13 +186,13 @@
 %{_includedir}/X11/extensions/fontcache.h
 %{_includedir}/X11/extensions/fontcacheP.h
 %{_includedir}/X11/extensions/fontcachstr.h
+%{_includedir}/X11/extensions/lbxstr.h
 %if 0
 %{_includedir}/X11/extensions/lbxbuf.h
 %{_includedir}/X11/extensions/lbxbufstr.h
 %{_includedir}/X11/extensions/lbxdeltastr.h
 %{_includedir}/X11/extensions/lbximage.h
 %{_includedir}/X11/extensions/lbxopts.h
-%{_includedir}/X11/extensions/lbxstr.h
 %{_includedir}/X11/extensions/lbxzlib.h
 %endif
 %{_includedir}/X11/extensions/mitmiscstr.h
@@ -279,6 +281,9 @@
 %{_libdir}/pkgconfig/xproxymngproto.pc
 
 %changelog
+* Tue Oct 3 2006 Adam Jackson <ajackson at redhat.com> 7.1-10
+- Install just enough LBX headers to make libXext build. (#203815)
+
 * Sun Oct 01 2006 Jesse Keating <jkeating at redhat.com> - 7.1-9
 - rebuilt for unwind info generation, broken in gcc-4.1.1-21