- Install just enough LBX headers to make libXext build. (#203815)

This commit is contained in:
Adam Jackson 2006-10-03 16:08:20 +00:00
parent 24b071e576
commit 5cbad4d7be

View File

@ -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 @@ for dir in $(ls -1) ; do
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 @@ rm -rf $RPM_BUILD_ROOT
%{_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 @@ rm -rf $RPM_BUILD_ROOT
%{_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 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pkgconfig/xproxymngproto.pc
%changelog
* Tue Oct 3 2006 Adam Jackson <ajackson@redhat.com> 7.1-10
- Install just enough LBX headers to make libXext build. (#203815)
* Sun Oct 01 2006 Jesse Keating <jkeating@redhat.com> - 7.1-9
- rebuilt for unwind info generation, broken in gcc-4.1.1-21