rpms/plt-scheme/devel plt-xft.patch, NONE, 1.1 plt-scheme.spec, 1.15, 1.16

[Gérard Milmeister (gemi)]

Author: gemi

Update of /cvs/extras/rpms/plt-scheme/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv434

Modified Files:
	plt-scheme.spec 
Added Files:
	plt-xft.patch 
Log Message:


plt-xft.patch:

--- NEW FILE plt-xft.patch ---
--- plt/src/configure.xft	2005-11-21 00:30:38.000000000 +0100
+++ plt/src/configure	2005-11-21 00:31:49.000000000 +0100
@@ -9879,7 +9879,7 @@
 fi
 
 if test "${enable_xft}" = "yes" ; then
-  xft_config_ok=`xft-config --cflags  2> /dev/null`
+  xft_config_ok=`pkg-config --cflags xft 2> /dev/null`
   if test "$xft_config_ok" = "" ; then
     if test "${ac_cv_header_X11_Xft_Xft_h+set}" = set; then
   echo "$as_me:$LINENO: checking for X11/Xft/Xft.h" >&5
@@ -10106,9 +10106,9 @@
       echo "no Xft headers; Xft support disabled"
     fi
   else
-    echo "Using xft-config..."
-    xft_cflags=`xft-config --cflags`
-    xft_libs=`xft-config --libs`
+    echo "Using pkg-config xft..."
+    xft_cflags=`pkg-config --cflags xft`
+    xft_libs=`pkg-config --libs xft`
     echo "Xft flags: $xft_cflags"
     echo "Xft libs: $xft_libs"
     MROPTIONS="$MROPTIONS -DWX_USE_XFT"


Index: plt-scheme.spec
===================================================================
RCS file: /cvs/extras/rpms/plt-scheme/devel/plt-scheme.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- plt-scheme.spec	16 Nov 2005 21:19:40 -0000	1.15
+++ plt-scheme.spec	20 Nov 2005 23:38:26 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           plt-scheme
 Version:        299.200
-Release:        15%{?dist}
+Release:        16%{?dist}
 Summary:        Graphical environment for developing programs using Scheme
 
 Group:          Development/Languages
@@ -9,6 +9,7 @@
 Source:         http://download.plt-scheme.org/bundles/299.200/plt/plt-299.200-src-unix.tgz
 Source1:	drscheme.png
 Patch0:		plt-x86_64-lib.patch
+Patch1:		plt-xft.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	openssl-devel
 BuildRequires:	zlib-devel
@@ -60,6 +61,7 @@
 %setup -q -n plt
 %ifarch x86_64
 %patch0 -p1
+%patch1 -p1
 %endif
 
 
@@ -140,6 +142,9 @@
 
 
 %changelog
+* Mon Nov 21 2005 Gerard Milmeister <gemi at bluewin.ch> - 299.200-16
+- patch to use pkg-config instead of xft-config
+
 * Wed Nov 16 2005 Gerard Milmeister <gemi at bluewin.ch> - 299.200-13
 - updated for modular xorg