Hi,

I've found a collection of related issues centering around Xft.

Previously, the Xft include files (/usr/X11R6/include/X11/Xft/*) were
provided in the libXft2-devel RPM. This RPM was made obsolete by
XFree86-devel, which says it provides "libXft2-devel". However, the Xft
include files and /usr/X11R6/bin/xft-config script are *not* included.

This causes a rebuild of the pango SRPM to fail on a current cooker
(BuildRequires are fine, but the Xft files are missing).

Also, gtk+2.0-2.2.0-1mdk has a BuildRequire on Xft-devel.
libXft2-devel Provided libXft-devel, libXft2-devel and Xft-devel.
XFree86-devel only Provides libXft2-devel.


I've attached two patches:

(1) Fix gtk+2.0 spec to BuildRequire libXft2-devel instead of Xft-devel
(2) Fix XFree86-devel spec to package the Xft header files and xft-config.

I'm not sure whether (1) should be fixing the gtk+2.0 spec or adding
Provides to XFree86-devel. I decided updating the gtk+2.0 spec was
better than adding more to the XFree86 spec.

Also, I'm not that familiar with Xft/fontconfig/XFree86, so take (2) carefully. There is a warning of some other unpackaged files at the end of the XFree86 rebuild - perhaps someone knowledgeable should have a look at whether they should be included.

In case it isn't clear these are the versions that I'm talking about:
XFree86-4.2.99.3-1.20021223.3mdk
gtk+2.0-2.2.0-1mdk
pango-1.2.0-1mdk

--
Mark Scott



--- gtk+2.0.spec.erroneous      2003-01-02 08:44:44.000000000 +0000
+++ gtk+2.0.spec        2003-01-03 15:59:05.000000000 +0000
@@ -50,7 +50,7 @@
 
 URL:           http://www.gtk.org
 Requires:      common-licenses
-BuildRequires: Xft-devel
+BuildRequires: libXft2-devel
 BuildRequires: autoconf2.5
 BuildRequires: gettext-devel
 BuildRequires:  libglib2.0-devel >= %{req_glib_version}



--- XFree86.spec.xft    2002-12-31 13:38:28.000000000 +0000
+++ XFree86.spec        2003-01-04 00:16:12.000000000 +0000
@@ -1715,9 +1715,7 @@
 /usr/X11R6/include/X11/Xaw
 /usr/X11R6/include/X11/Xmu
 /usr/X11R6/include/X11/Xcursor
-%if ! %{with_new_fontconfig_Xft}
-%{_x11dir}/include/X11/Xft
-%endif
+/usr/X11R6/include/X11/Xft
 /usr/X11R6/include/X11/*.h
 /usr/X11R6/include/GL
 /usr/X11R6/include/DPS
@@ -1731,6 +1729,7 @@
 /usr/X11R6/bin/makedepend
 /usr/X11R6/bin/gccmakedep
 /usr/X11R6/bin/xmkmf
+/usr/X11R6/bin/xft-config
 
 /usr/X11R6/man/man1/imake.1x*
 /usr/X11R6/man/man1/makedepend.1x*


Reply via email to