rpms/xterm/devel xterm-207-freetype.patch, 1.2, 1.3 xterm.spec, 1.26, 1.27

[fedora-cvs-commits at redhat.com]

Author: jvdias

Update of /cvs/dist/rpms/xterm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23904

Modified Files:
	xterm-207-freetype.patch xterm.spec 
Log Message:
better fix for freetype configuration problem

xterm-207-freetype.patch:
 configure |   68 ++++++++++++--------------------------------------------------
 1 files changed, 14 insertions(+), 54 deletions(-)

Index: xterm-207-freetype.patch
===================================================================
RCS file: /cvs/dist/rpms/xterm/devel/xterm-207-freetype.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xterm-207-freetype.patch	18 Nov 2005 16:24:33 -0000	1.2
+++ xterm-207-freetype.patch	18 Nov 2005 18:14:13 -0000	1.3
@@ -1,6 +1,6 @@
---- xterm-207/configure.freetype	2005-11-18 10:21:15.000000000 -0500
-+++ xterm-207/configure	2005-11-18 11:07:53.000000000 -0500
-@@ -9314,16 +9314,19 @@
+--- xterm-207/configure.freetype	2005-11-18 11:14:20.000000000 -0500
++++ xterm-207/configure	2005-11-18 13:06:55.000000000 -0500
+@@ -9314,16 +9314,18 @@
  echo "$as_me:9307: result: $enable_freetype" >&5
  echo "${ECHO_T}$enable_freetype" >&6
  if test "$enable_freetype" = yes ; then
@@ -10,9 +10,8 @@
 -set dummy xft-config; ac_word=$2
 +if [ -z "$FREETYPE_CONFIG" ]; then
 +#  xft-config is no more; freetype-config gets it wrong - use pkg-config 
-+   FREETYPE_CONFIG='pkg-config freetype2 fontconfig'
++   FREETYPE_CONFIG='pkg-config xft freetype2'
 +fi;
-+cf_extra_freetype_libs='-lXft -lXrender'
 +# Extract the first word of "$FREETYPE_CONFIG", so it can be a program name with args.
 +set dummy $FREETYPE_CONFIG; ac_word=$2; shift; ac_ftc_args="$*";
  echo "$as_me:9314: checking for $ac_word" >&5
@@ -25,7 +24,7 @@
    [\\/]* | ?:[\\/]*)
    ac_cv_path_FREETYPE_CONFIG="$FREETYPE_CONFIG" # Let the user override the test with a path.
    ;;
-@@ -9334,10 +9337,10 @@
+@@ -9334,10 +9336,10 @@
    IFS=$ac_save_IFS
    test -z "$ac_dir" && ac_dir=.
    if $as_executable_p "$ac_dir/$ac_word"; then
@@ -38,7 +37,7 @@
  done
  
    test -z "$ac_cv_path_FREETYPE_CONFIG" && ac_cv_path_FREETYPE_CONFIG="none"
-@@ -9351,49 +9354,7 @@
+@@ -9351,49 +9353,7 @@
  echo "${ECHO_T}$FREETYPE_CONFIG" >&6
  else
    echo "$as_me:9346: result: no" >&5
@@ -89,12 +88,12 @@
  fi
  
  if test "$FREETYPE_CONFIG" != none ; then
-@@ -9436,10 +9397,10 @@
+@@ -9436,10 +9396,10 @@
  cf_save_LIBS="$LIBS"
  cf_save_INCS="$CPPFLAGS"
  
 -cf_cv_x_freetype_libs="$cf_extra_freetype_libs `$FREETYPE_CONFIG --libs 2>/dev/null`"
-+cf_cv_x_freetype_libs="`$FREETYPE_CONFIG --libs 2>/dev/null` $cf_extra_freetype_libs"
++cf_cv_x_freetype_libs="`$FREETYPE_CONFIG --libs 2>/dev/null`"
  
 -LIBS="$cf_cv_x_freetype_libs $LIBS"
 -CPPFLAGS="$cf_cv_x_freetype_incs $CPPFLAGS"
@@ -103,7 +102,7 @@
  
  cat >conftest.$ac_ext <<_ACEOF
  #line 9438 "configure"
-@@ -9486,7 +9447,7 @@
+@@ -9486,7 +9446,7 @@
  fi;
  
  if test -n "$cf_cv_x_freetype_libs" ; then


Index: xterm.spec
===================================================================
RCS file: /cvs/dist/rpms/xterm/devel/xterm.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- xterm.spec	18 Nov 2005 16:24:33 -0000	1.26
+++ xterm.spec	18 Nov 2005 18:14:13 -0000	1.27
@@ -1,7 +1,7 @@
 Summary: xterm terminal emulator for the X Window System
 Name:    xterm
 Version: 207
-Release: 3
+Release: 4
 URL:     http://dickey.his.com/xterm
 License: MIT
 Group:   User Interface/X