- Install just enough LBX headers to make libXext build. (#203815)
This commit is contained in:
parent
24b071e576
commit
5cbad4d7be
@ -10,7 +10,7 @@
|
|||||||
Summary: X.Org X11 Protocol headers
|
Summary: X.Org X11 Protocol headers
|
||||||
Name: xorg-x11-proto-devel
|
Name: xorg-x11-proto-devel
|
||||||
Version: 7.1
|
Version: 7.1
|
||||||
Release: 9%{?dist}
|
Release: 10%{?dist}
|
||||||
License: The Open Group License
|
License: The Open Group License
|
||||||
Group: Development/System
|
Group: Development/System
|
||||||
URL: http://www.x.org
|
URL: http://www.x.org
|
||||||
@ -90,9 +90,13 @@ for dir in $(ls -1) ; do
|
|||||||
popd
|
popd
|
||||||
done
|
done
|
||||||
|
|
||||||
# NOTE: LBX has been discontinued upstream, however xextproto still installs
|
# libXext still needs XLbx.h and lbxstr.h to build. The rest are junk.
|
||||||
# the headers for it. Probably an upstream oversight, so we remove them here.
|
rm -f $RPM_BUILD_ROOT%{_includedir}/X11/extensions/lbxbuf.h \
|
||||||
rm -f $RPM_BUILD_ROOT%{_includedir}/X11/extensions/{XLbx,lbx}*.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
|
%clean
|
||||||
rm -rf $RPM_BUILD_ROOT
|
rm -rf $RPM_BUILD_ROOT
|
||||||
@ -151,9 +155,7 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{_includedir}/X11/extensions/XKBproto.h
|
%{_includedir}/X11/extensions/XKBproto.h
|
||||||
%{_includedir}/X11/extensions/XKBsrv.h
|
%{_includedir}/X11/extensions/XKBsrv.h
|
||||||
%{_includedir}/X11/extensions/XKBstr.h
|
%{_includedir}/X11/extensions/XKBstr.h
|
||||||
%if 0
|
|
||||||
%{_includedir}/X11/extensions/XLbx.h
|
%{_includedir}/X11/extensions/XLbx.h
|
||||||
%endif
|
|
||||||
%{_includedir}/X11/extensions/XResproto.h
|
%{_includedir}/X11/extensions/XResproto.h
|
||||||
%{_includedir}/X11/extensions/XShm.h
|
%{_includedir}/X11/extensions/XShm.h
|
||||||
%{_includedir}/X11/extensions/XTest.h
|
%{_includedir}/X11/extensions/XTest.h
|
||||||
@ -184,13 +186,13 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{_includedir}/X11/extensions/fontcache.h
|
%{_includedir}/X11/extensions/fontcache.h
|
||||||
%{_includedir}/X11/extensions/fontcacheP.h
|
%{_includedir}/X11/extensions/fontcacheP.h
|
||||||
%{_includedir}/X11/extensions/fontcachstr.h
|
%{_includedir}/X11/extensions/fontcachstr.h
|
||||||
|
%{_includedir}/X11/extensions/lbxstr.h
|
||||||
%if 0
|
%if 0
|
||||||
%{_includedir}/X11/extensions/lbxbuf.h
|
%{_includedir}/X11/extensions/lbxbuf.h
|
||||||
%{_includedir}/X11/extensions/lbxbufstr.h
|
%{_includedir}/X11/extensions/lbxbufstr.h
|
||||||
%{_includedir}/X11/extensions/lbxdeltastr.h
|
%{_includedir}/X11/extensions/lbxdeltastr.h
|
||||||
%{_includedir}/X11/extensions/lbximage.h
|
%{_includedir}/X11/extensions/lbximage.h
|
||||||
%{_includedir}/X11/extensions/lbxopts.h
|
%{_includedir}/X11/extensions/lbxopts.h
|
||||||
%{_includedir}/X11/extensions/lbxstr.h
|
|
||||||
%{_includedir}/X11/extensions/lbxzlib.h
|
%{_includedir}/X11/extensions/lbxzlib.h
|
||||||
%endif
|
%endif
|
||||||
%{_includedir}/X11/extensions/mitmiscstr.h
|
%{_includedir}/X11/extensions/mitmiscstr.h
|
||||||
@ -279,6 +281,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%{_libdir}/pkgconfig/xproxymngproto.pc
|
%{_libdir}/pkgconfig/xproxymngproto.pc
|
||||||
|
|
||||||
%changelog
|
%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
|
* Sun Oct 01 2006 Jesse Keating <jkeating@redhat.com> - 7.1-9
|
||||||
- rebuilt for unwind info generation, broken in gcc-4.1.1-21
|
- rebuilt for unwind info generation, broken in gcc-4.1.1-21
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user