+# TODO:
+# - update and fix tdfx patchs
+# - cleanups
+# - man4/mouse from modules conflicts with man4/mouse from man-pages
+# - add missing files
+# - separate XFS to be standalone - is it possible without duplicated files?
+
# _without_tdfx disables tdfx build
%define _sver %(echo %{version} | tr -d .)
Summary(uk): âÁÚÏצ ÛÒÉÆÔÉ, ÐÒÏÇÒÁÍÉ ÔÁ ÄÏËÕÍÅÎÔÁÃ¦Ñ ÄÌÑ ÒÏÂÏÞϧ ÓÔÁÎæ§ Ð¦Ä X
Summary(zh_CN): XFree86 ´°¿Úϵͳ·þÎñÆ÷ºÍ»ù±¾³ÌÐò
Name: XFree86
-Version: 4.2.1
-Release: 9.2
+Version: 4.2.99.4
+Release: 0.20030124.1
License: MIT
Group: X11/XFree86
-Source0: ftp://ftp.xfree86.org/pub/XFree86/4.2.0/source/X420src-1.tgz
+#Source0: ftp://ftp.xfree86.org/pub/XFree86/4.2.0/source/X420src-1.tgz
+Source0: X42994src-1-20030124.tar.bz2
Source1: ftp://ftp.pld.org.pl/software/xinit/xdm-xinitrc-0.2.tar.bz2
Source2: cvs://anonymous@cvs.gatos.sourceforge.net/cvsroot/gatos/ati.2-20021001.tar.bz2
Source3: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-Xman-pages.tar.bz2
Source35: xclock.png
Source36: oclock.png
Source37: xconsole.png
+Source38: http://www.winischhofer/sis/sis_drv_src_141202-1.tar.gz
Patch0: %{name}-PLD.patch
Patch1: %{name}-HasZlib.patch
Patch2: %{name}-DisableDebug.patch
# Original from: ftp://ftp.xfree86.org/pub/XFree86/4.2.1/fixes/4.2.1-mit-shm-security.patch
Patch58: %{name}-4.2.1-mit-shm-security.patch
Patch59: %{name}-disable_glide.patch
+Patch60: %{name}-expat.patch
+Patch61: %{name}-pkgconfig.patch
BuildRequires: bison
BuildRequires: flex
BuildRequires: freetype-devel >= 2.0.0
BuildRequires: utempter-devel
BuildRequires: zlib-devel
BuildRequires: libstdc++-devel
+BuildRequires: Xft-devel >= 2.1
%ifarch %{ix86} alpha
%{!?_without_tdfx:BuildRequires: Glide3-DRI-devel}
%endif
%endif
Requires: xauth
Requires: %{name}-libs = %{version}
+Requires: Xft >= 2.1
ExclusiveArch: %{ix86} alpha sparc m68k armv4l noarch ppc
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
Obsoletes: xpm-progs
%define _prefix /usr/X11R6
%define _mandir %{_prefix}/man
+%define _pixmapsdir /usr/share/pixmaps
+%define _icondir /usr/share/icons
%define _wmpropsdir %{_datadir}/wm-properties
# avoid Mesa dependency in XFree86-OpenGL-libs
%description PEX-static -l pl
Statyczna biblioteka rozszerzenia PEX.
-%package xft
+%package xft1
Summary: Font rendering library
Summary(pl): Biblioteka wy¶wietlaj±ca fonty
Group: X11/XFree86
Requires: %{name}-libs = %{version}
+Obsoletes: XFree86-xft
-%description xft
+%description xft1
Font rendering library.
-%description xft -l pl
+%description xft1 -l pl
Biblioteka wy¶wietlaj±ca fonty.
-%package xft-devel
-Summary: Xft font rendering library headers
-Summary(pl): Pliki nag³ówkowe biblioteki Xft wy¶wietlaj±cej fonty
-Group: X11/XFree86
-Requires: %{name}-Xft = %{version}
-Requires: %{name}-devel = %{version}
-
-%description xft-devel
-Xft font rendering library headers.
-
-%description xft-devel -l pl
-Pliki nag³ówkowe biblioteki Xft wy¶wietlaj±cej fonty.
-
-%package xft-static
-Summary: Xft font rendering static library
-Summary(pl): Statyczna biblioteka Xft wy¶wietlaj±ca fonty
-Group: X11/XFree86
-Requires: %{name}-Xft-devel = %{version}
-
-%description xft-static
-Xft font rendering static library.
-
-%description xft-static -l pl
-Statyczna biblioteka Xft wy¶wietlaj±ca fonty.
-
%package XIE
Summary: XIE extension library
Summary(pl): Biblioteka rozszerzenia XIE
%package OpenGL-devel
Summary: OpenGL for X11R6 development
Summary(pl): Pliki nag³ówkowe OpenGL dla systemu X11R6
-Group: X11/Libraries
+Group: X11/Development/Libraries
Requires: %{name}-OpenGL-libs = %{version}
Requires: %{name}-devel
Provides: OpenGL-devel
%package OpenGL-static
Summary: X11R6 static libraries with OpenGL
Summary(pl): Biblioteki statyczne do X11R6 ze wsparciem dla OpenGL
-Group: X11/Libraries
+Group: X11/Development/Libraries
Requires: %{name}-OpenGL-devel = %{version}
Provides: OpenGL-static
Obsoletes: Mesa-static
Requires: %{name}-modules = %{version}-%{release}
Requires: %{name}-common /usr/X11R6/lib/X11/rgb.txt
Requires: XFree86-fonts-base
+PreReq: xprint-initrc
%description Xprt
Xprt provides an X server with the print extension and special DDX
Summary(ru): âÉÂÌÉÏÔÅËÉ ÒÁÚÒÁÂÏÔÞÉËÁ, ÈÅÄÅÒÁ É ÄÏËÕÍÅÎÔÁÃÉÑ ÐÏ ÐÒÏÇÒÁÍÍÉÒÏ×ÁÎÉÀ X11R6
Summary(tr): X11R6 ile geliþtirme için gerekli dosyalar
Summary(uk): â¦Â̦ÏÔÅËÉ ÐÒÏÇÒÁͦÓÔÁ, ÈÅÄÅÒÉ ÔÁ ÄÏËÕÍÅÎÔÁÃ¦Ñ ÐÏ ÐÒÏÇÒÁÍÕ×ÁÎÎÀ X11R6
-Group: X11/Libraries
+Group: X11/Development/Libraries
Requires: %{name}-libs = %{version}
Requires: imake = %{version}
Obsoletes: xpm-devel
Summary(pl): Biblioteki statyczne X11R6
Summary(ru): óÔÁÔÉÞÅÓËÉÅ ÂÉÂÌÉÏÔÅËÉ X11R6
Summary(uk): óÔÁÔÉÞΦ ¦Â̦ÏÔÅËÉ X11R6
-Group: X11/Libraries
+Group: X11/Development/Libraries
Requires: %{name}-devel = %{version}
%ifarch sparc sparc64
Obsoletes: X11R6.1-devel
%prep
%setup -q -c -a1
-%patch0 -p1
+%patch0 -p0
%patch1 -p1
%patch2 -p1
-%patch3 -p1
+%patch3 -p0
%patch4 -p1
%patch5 -p0
# not ready yet
%patch8 -p1
%patch9 -p1
%patch10 -p1
-%patch11 -p0
+#%patch11 -p0 --seems to be obsoleted
%patch12 -p1
%patch13 -p1
-%patch14 -p1
+%patch14 -p0
%patch15 -p1
-%patch16 -p1
-%patch17 -p1
+%patch16 -p0
+#%patch17 -p1 -- not ready, is it required?
%patch18 -p1
#%patch19 -p1
-%patch20 -p1
+%patch20 -p0
%patch21 -p1
%patch22 -p1
%patch23 -p1
# needs updating (14 rejects)
#%patch28 -p1
%endif
-%patch29 -p1
-%patch30 -p1
+%patch29 -p0
+#%patch30 -p1 -- obsoleted
%patch31 -p1
-%patch32 -p1
-%patch33 -p1
-%patch34 -p1
+#%patch32 -p1 --obsoleted
+%patch33 -p0
+#%patch34 -p1 --obsoleted????????
%ifarch ppc
-%patch35
+%patch35 --new version required
%endif
-%{?_without_tdfx:%patch35}
-%patch36 -p0
+#%%{?_without_tdfx:%patch35} --same as above
+#%patch36 -p0 --obsoleted
%patch37 -p1
-%patch38 -p1
+####%patch38 -p1
#%patch39 -p1
-%patch40 -p0
-%patch41 -p1
-%patch42 -p1
-%patch43 -p1
-%patch44 -p1
-%patch45 -p1
-%patch46 -p1
+####%patch40 -p0
+####%patch41 -p1
+####%patch42 -p1 --obsoleted (all with ####)
+####%patch43 -p1
+####%patch44 -p1
+####%patch45 -p1
+####%patch46 -p1
%{!?_without_tdfx:%patch47 -p0}
-%{!?_without_tdfx:%patch48 -p0}
+#%{!?_without_tdfx:%patch48 -p0}
%{!?_without_tdfx:%patch49 -p1}
#%patch50 -p0
%{!?_without_tdfx:%patch51 -p0}
#%patch52 -p1
#%patch53 -p1
-%patch54 -p1
-%patch55 -p0
+#%patch54 -p1
+#%patch55 -p0
%patch56 -p1
-%{!?debug:%patch57 -p1}
-%patch58 -p0
+#%%{!?debug:%patch57 -p1} --obsoleted
+#%patch58 -p0 --obsoleted
%{?_without_tdfx:%patch59 -p0}
+%patch60 -p0
+%patch61 -p0
rm -f xc/config/cf/host.def
# New ATI drivers
cd xc/programs/Xserver/hw/xfree86/drivers
-bzcat %{SOURCE2} | tar x
+#%bzcat %{SOURCE2} | tar x
# ati.2 directory
+# New SiS drivers
+cd sis
+zcat %{SOURCE38} | tar x
+
#--- %build --------------------------
%build
"BOOTSTRAPCFLAGS=%{rpmcflags}" \
"CCOPTIONS=%{rpmcflags}" \
"CXXOPTIONS=%{rpmcflags}" \
- "CXXDEBUGFLAGS=" "CDEBUGFLAGS="
+ "CXXDEBUGFLAGS=" "CDEBUGFLAGS=" \
+ "ICONDIR=%{_icondir}"
%ifnarch alpha
-%{__make} -C xc/programs/Xserver/hw/xfree86/drivers SUBDIRS="ati.2" Makefiles
-%{__make} -C xc/programs/Xserver/hw/xfree86/drivers SUBDIRS="ati.2" all \
- "BOOTSTRAPCFLAGS=%{rpmcflags}" \
- "CCOPTIONS=%{rpmcflags}" \
- "CXXOPTIONS=%{rpmcflags}" \
- "CXXDEBUGFLAGS=" "CDEBUGFLAGS="
+#%%{__make} -C xc/programs/Xserver/hw/xfree86/drivers SUBDIRS="ati.2" Makefiles
+#%%{__make} -C xc/programs/Xserver/hw/xfree86/drivers SUBDIRS="ati.2" all \
+# "BOOTSTRAPCFLAGS=%{rpmcflags}" \
+# "CCOPTIONS=%{rpmcflags}" \
+# "CXXOPTIONS=%{rpmcflags}" \
+# "CXXDEBUGFLAGS=" "CDEBUGFLAGS="
%endif
#--- %install ------------------------
"CCOPTIONS=%{rpmcflags}" \
"CXXOPTIONS=%{rpmcflags}" \
"CXXDEBUGFLAGS=" "CDEBUGFLAGS=" \
+ "ICONDIR=%{_icondir}" \
install install.man
%ifnarch alpha
-install -d $RPM_BUILD_ROOT%{_libdir}/modules.gatos/{drivers,dri}
-install xc/programs/Xserver/hw/xfree86/drivers/ati.2/*_drv.o \
- $RPM_BUILD_ROOT%{_libdir}/modules.gatos/drivers
-install xc/programs/Xserver/hw/xfree86/drivers/ati.2/*_dri.o \
- $RPM_BUILD_ROOT%{_libdir}/modules.gatos/dri
+#install -d $RPM_BUILD_ROOT%{_libdir}/modules.gatos/{drivers,dri}
+#install xc/programs/Xserver/hw/xfree86/drivers/ati.2/*_drv.o \
+# $RPM_BUILD_ROOT%{_libdir}/modules.gatos/drivers
+#install xc/programs/Xserver/hw/xfree86/drivers/ati.2/*_dri.o \
+# $RPM_BUILD_ROOT%{_libdir}/modules.gatos/dri
%endif
install %{SOURCE23} $RPM_BUILD_ROOT%{_applnkdir}/Terminals
install %{SOURCE24} %{SOURCE25} %{SOURCE26} %{SOURCE27} \
$RPM_BUILD_ROOT%{_applnkdir}/Utilities
-install %{SOURCE30} $RPM_BUILD_ROOT%{_datadir}/pixmaps
+install %{SOURCE30} $RPM_BUILD_ROOT%{_pixmapsdir}
install %{SOURCE31} %{SOURCE32} %{SOURCE33} %{SOURCE34} %{SOURCE35} \
%{SOURCE36} %{SOURCE37} \
$RPM_BUILD_ROOT%{_pixmapsdir}
%post XIE -p /sbin/ldconfig
%postun XIE -p /sbin/ldconfig
-%post xft -p /sbin/ldconfig
-%postun xft -p /sbin/ldconfig
+%post xft1 -p /sbin/ldconfig
+%postun xft1 -p /sbin/ldconfig
%post OpenGL-libs -p /sbin/ldconfig
%postun OpenGL-libs -p /sbin/ldconfig
%post libs
-grep "^%{_libdir}$" /etc/ld.so.conf >/dev/null 2>&1
+umask 022
+grep -qs "^%{_libdir}$" /etc/ld.so.conf
[ $? -ne 0 ] && echo "%{_libdir}" >> /etc/ld.so.conf
/sbin/ldconfig
%postun libs
if [ "$1" = "0" ]; then
+ umask 022
grep -v "%{_libdir}" /etc/ld.so.conf > /etc/ld.so.conf.new
mv -f /etc/ld.so.conf.new /etc/ld.so.conf
fi
%verifyscript libs
echo -n "Looking for %{_libdir} in /etc/ld.so.conf... "
-if ! grep "^%{_libdir}$" /etc/ld.so.conf > /dev/null; then
+if ! grep -q "^%{_libdir}$" /etc/ld.so.conf ; then
echo "missing"
echo "%{_libdir} missing from /etc/ld.so.conf" >&2
else
%{_libdir}/X11/app-defaults/XTerm
%lang(pl) %{_libdir}/X11/app-defaults/pl/XTerm
%{_libdir}/X11/app-defaults/XTerm-color
+%dir %{_icondir}
+%{_icondir}/*
%attr(755,root,root) %{_libdir}/X11/lbxproxy
%attr(755,root,root) %{_libdir}/X11/proxymngr
%attr(755,root,root) %{_bindir}/cxpm
%attr(755,root,root) %{_bindir}/dga
%attr(755,root,root) %{_bindir}/editres
+%attr(755,root,root) %{_bindir}/gtf
%attr(755,root,root) %{_bindir}/iceauth
%attr(755,root,root) %{_bindir}/lbxproxy
%attr(755,root,root) %{_bindir}/lndir
%attr(755,root,root) %{_bindir}/mergelib
%attr(755,root,root) %{_bindir}/mkdirhier
%attr(755,root,root) %{_bindir}/mkfontdir
+%attr(755,root,root) %{_bindir}/mkfontscale
+%attr(755,root,root) %{_bindir}/mkhtmlindex
%attr(755,root,root) %{_bindir}/proxymngr
%attr(755,root,root) %{_bindir}/resize
%attr(755,root,root) %{_bindir}/revpath
%attr(755,root,root) %{_bindir}/uxterm
%attr(755,root,root) %{_bindir}/xcmsdb
%attr(755,root,root) %{_bindir}/xconsole
+%attr(755,root,root) %{_bindir}/xcursorgen
%attr(755,root,root) %{_bindir}/xcutsel
%attr(755,root,root) %{_bindir}/xdpyinfo
%attr(755,root,root) %{_bindir}/xfindproxy
%attr(755,root,root) %{_bindir}/xmodmap
%attr(755,root,root) %{_bindir}/xon
%attr(755,root,root) %{_bindir}/xprop
+%attr(755,root,root) %{_bindir}/xrandr
%attr(755,root,root) %{_bindir}/xrdb
%attr(755,root,root) %{_bindir}/xrefresh
%attr(755,root,root) %{_bindir}/xset
%{_mandir}/man1/cxpm.1*
%{_mandir}/man1/dga.1*
%{_mandir}/man1/editres.1*
+%{_mandir}/man1/gtf.1*
%{_mandir}/man1/iceauth.1*
%{_mandir}/man1/lbxproxy.1*
%{_mandir}/man1/libxrx.1*
%{_mandir}/man1/luit.1x*
%{_mandir}/man1/makestrs.1*
%{_mandir}/man1/makeg.1*
+%{_mandir}/man1/mergelib.1*
%{_mandir}/man1/mkdirhier.1*
%{_mandir}/man1/mkfontdir.1*
+%{_mandir}/man1/mkfontscale.1*
+%{_mandir}/man1/mkhtmlindex.1*
%{_mandir}/man1/proxymngr.1*
%{_mandir}/man1/resize.1*
%{_mandir}/man1/revpath.1*
%{_mandir}/man1/sxpm.1*
%{_mandir}/man1/xcmsdb.1*
%{_mandir}/man1/xconsole.1*
+%{_mandir}/man1/xcursorgen.1*
%{_mandir}/man1/xcutsel.1*
%{_mandir}/man1/xdpyinfo.1*
%{_mandir}/man1/xfindproxy.1*
%{_mandir}/man1/xlsfonts.1*
%{_mandir}/man1/xmodmap.1*
%{_mandir}/man1/xprop.1*
+%{_mandir}/man1/xrandr.1*
%{_mandir}/man1/xrdb.1*
%{_mandir}/man1/xrefresh.1*
%{_mandir}/man1/xset.1*
%{_libdir}/libPEX5.a
%endif
-%files xft
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libXft.so.*.*
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/X11/XftConfig
-
-%files xft-devel
+%files xft1
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libXft.so
-%{_includedir}/X11/Xft
-
-%files xft-static
-%defattr(644,root,root,755)
-%{_libdir}/libXft.a
+%attr(755,root,root) %{_libdir}/libXft.so.1.1
%files XIE
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libXIE.so.*.*
+%attr(755,root,root) %{_bindir}/xieperf
+%{_mandir}/man1/xieperf.1*
%files XIE-devel
%defattr(644,root,root,755)
%files devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/bdftopcf
+%attr(755,root,root) %{_bindir}/xcursor-config
%attr(755,root,root) %{_libdir}/libX[1Ta-eg-t]*.so
%attr(755,root,root) %{_libdir}/libXfont*.so
%attr(755,root,root) %{_libdir}/libI*.so
%attr(755,root,root) %{_libdir}/libS*.so
%attr(755,root,root) %{_libdir}/libx*.so
+%attr(755,root,root) %{_libdir}/libXv.so
%{_libdir}/libfntstubs.a
%{_libdir}/libfontenc.a
%{_libdir}/libFS.a
%{_libdir}/libI810XvMC.a
%{_libdir}/liboldX.a
%{_libdir}/libXau.a
+%{_libdir}/libXcursor.a
%{_libdir}/libXdmcp.a
%{_libdir}/libxf86config.a
%{_libdir}/libXfontcache.a
%{_includedir}/X11/extensions/XI.h
%{_includedir}/X11/extensions/XI[^E]*.h
%{_includedir}/X11/fonts
+%{_includedir}/X11/Xcursor
%{_includedir}/xf86*.h
%{_libdir}/X11/config
+%{_pkgconfigdir}/xcursor.pc
%{_mandir}/man3/[A-EH-Z]*
%attr(755,root,root) %{_libdir}/modules/drivers/radeon*_drv.o
%ifnarch sparc sparc64
%attr(755,root,root) %{_libdir}/modules/dri/radeon_dri.so
+%attr(755,root,root) %{_libdir}/modules/dri/r200_dri.so
%endif
%ifnarch alpha
-%files driver-ati.2
-%defattr(644,root,root,755)
-%dir %{_libdir}/modules.gatos/drivers
-%attr(755,root,root) %{_libdir}/modules.gatos/drivers/ati*_drv.o
-%attr(755,root,root) %{_libdir}/modules.gatos/drivers/[bfmt]*_drv.o
+#%%files driver-ati.2
+#%defattr(644,root,root,755)
+#%dir %{_libdir}/modules.gatos/drivers
+#%attr(755,root,root) %{_libdir}/modules.gatos/drivers/ati*_drv.o
+#%attr(755,root,root) %{_libdir}/modules.gatos/drivers/[bfmt]*_drv.o
%endif
%ifnarch alpha
-%files driver-r128.2
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules.gatos/drivers/r128*_drv.o
-%ifnarch sparc sparc64
-%attr(755,root,root) %{_libdir}/modules.gatos/dri/r128_dri.o
-%endif
-%{_mandir}/man4/r128*
+#%files driver-r128.2
+#%defattr(644,root,root,755)
+#%attr(755,root,root) %{_libdir}/modules.gatos/drivers/r128*_drv.o
+#%ifnarch sparc sparc64
+#%attr(755,root,root) %{_libdir}/modules.gatos/dri/r128_dri.o
+#%endif
+#%{_mandir}/man4/r128*
%endif
%ifnarch alpha
-%files driver-radeon.2
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules.gatos/drivers/radeon*_drv.o
-%attr(755,root,root) %{_libdir}/modules.gatos/drivers/saa7114_drv.o
-%ifnarch sparc sparc64
-%attr(755,root,root) %{_libdir}/modules.gatos/dri/radeon_dri.o
-%endif
+#%files driver-radeon.2
+#%defattr(644,root,root,755)
+#%attr(755,root,root) %{_libdir}/modules.gatos/drivers/radeon*_drv.o
+#%attr(755,root,root) %{_libdir}/modules.gatos/drivers/saa7114_drv.o
+#%ifnarch sparc sparc64
+#%attr(755,root,root) %{_libdir}/modules.gatos/dri/radeon_dri.o
+#%endif
%endif
%ifnarch sparc sparc64 ppc
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/sis_drv.o
%ifnarch ppc
-%attr(755,root,root) %{_libdir}/modules/dri/sis_dri.so
+#%attr(755,root,root) %{_libdir}/modules/dri/sis_dri.so
%endif
%{_mandir}/man4/sis*
%endif
%{_libdir}/X11/locale
%dir %{_includedir}
%dir %{_includedir}/X11
-%dir %{_sbindir}
/usr/include/X11
+%dir %{_sbindir}
%dir %{_datadir}/locale
%dir %{_datadir}/misc
%dir %{_datadir}/sounds
%attr(755,root,root) %{_libdir}/libI*.so.*.*
%attr(755,root,root) %{_libdir}/libS*.so.*.*
%attr(755,root,root) %{_libdir}/libx*.so.*.*
+%attr(755,root,root) %{_libdir}/libXv.so.*.*
%files modules
%defattr(644,root,root,755)
%{_mandir}/man4/dynapro*
%{_mandir}/man4/keyboard*
%{_mandir}/man4/microtouch*
-%{_mandir}/man4/mouse*
+#%{_mandir}/man4/mouse* - conflicts with man-pages - fixme
%{_mandir}/man4/penmount.4*
%{_mandir}/man4/v4l*
%ifnarch sparc sparc64
%{_libdir}/libICE.a
%{_libdir}/libSM.a
%{_libdir}/libX11.a
+%{_libdir}/libXRes.a
%{_libdir}/libXaw.a
%{_libdir}/libXext.a
%{_libdir}/libXfont.a
%{_libdir}/X11/app-defaults/Xmag
%{_libdir}/X11/app-defaults/Xman
%{_libdir}/X11/app-defaults/Xmessage
+%{_libdir}/X11/app-defaults/Xmessage-color
%{_libdir}/X11/app-defaults/Xmh
%{_libdir}/X11/app-defaults/XFontSel
%{_libdir}/X11/app-defaults/Xditview
%files -n imake
%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/ccmakedep
+%attr(755,root,root) %{_bindir}/cleanlinks
%attr(755,root,root) %{_bindir}/gccmakedep
%attr(755,root,root) %{_bindir}/imake
%attr(755,root,root) %{_bindir}/makedepend
%attr(755,root,root) %{_bindir}/xmkmf
%{_mandir}/man1/imake.1*
+%{_mandir}/man1/ccmakedep.1*
+%{_mandir}/man1/cleanlinks.1*
+%{_mandir}/man1/gccmakedep.1*
%{_mandir}/man1/makedepend.1*
%{_mandir}/man1/xmkmf.1*
%attr(755,root,root) %{_bindir}/fstobdf
%attr(755,root,root) %{_bindir}/mkcfm
%attr(755,root,root) %{_bindir}/xfsinfo
-%attr(755,root,root) %{_bindir}/xftcache
+#%attr(755,root,root) %{_bindir}/xftcache
%{_mandir}/man1/xfs.1*
%{_mandir}/man1/fslsfonts.1*
%{_mandir}/man1/fstobdf.1*
%{_mandir}/man1/mkcfm.1*
%{_mandir}/man1/xfsinfo.1*
-%{_mandir}/man1/xftcache.1*
+#%{_mandir}/man1/xftcache.1*