rpms/openmotif/devel openMotif-2.3.0-xft-config.patch, NONE, 1.1 openmotif.spec, 1.36, 1.37

[fedora-cvs-commits at redhat.com]

Author: twoerner

Update of /cvs/dist/rpms/openmotif/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16231

Modified Files:
	openmotif.spec 
Added Files:
	openMotif-2.3.0-xft-config.patch 
Log Message:
[tw]
- patch for missing xft-config



openMotif-2.3.0-xft-config.patch:
 ac_find_xft.m4 |    4 ++--
 configure      |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE openMotif-2.3.0-xft-config.patch ---
--- openmotif-2.3.0/ac_find_xft.m4.xft-config	2005-12-08 15:09:22.000000000 +0100
+++ openmotif-2.3.0/ac_find_xft.m4	2005-12-08 15:09:48.000000000 +0100
@@ -254,9 +254,9 @@
 dnl if test "$LT_HAVE_XRENDER" = "yes" -a "$LT_HAVE_FREETYPE" = "yes"
 dnl then
  	AC_DEFINE(USE_XFT, 1, This means we will be using the Xft library)
-CFLAGS="$CFLAGS `xft-config --cflags`"
+CFLAGS="$CFLAGS `pkg-config xft --cflags`"
 AC_SUBST(CFLAGS)
-LIBS="$LIBS `xft-config --libs`"
+LIBS="$LIBS `pkg-config xft --libs`"
 AC_SUBST(LIBS)
 
 dnl fi
--- openmotif-2.3.0/configure.xft-config	2005-12-08 15:09:30.000000000 +0100
+++ openmotif-2.3.0/configure	2005-12-08 15:09:58.000000000 +0100
@@ -28561,9 +28561,9 @@
 #define USE_XFT 1
 _ACEOF
 
-CFLAGS="$CFLAGS `xft-config --cflags`"
+CFLAGS="$CFLAGS `pkg-config xft --cflags`"
 
-LIBS="$LIBS `xft-config --libs`"
+LIBS="$LIBS `pkg-config xft --libs`"
 
 
 


Index: openmotif.spec
===================================================================
RCS file: /cvs/dist/rpms/openmotif/devel/openmotif.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- openmotif.spec	8 Dec 2005 13:38:25 -0000	1.36
+++ openmotif.spec	8 Dec 2005 14:19:28 -0000	1.37
@@ -16,7 +16,8 @@
 
 BuildPrereq: flex
 BuildPrereq: byacc
-BuildRequires: libXmu-devel libXp-devel libXt-devel libXext-devel
+BuildRequires: libjpeg-devel libpng-devel
+BuildRequires: libXft-devel libXmu-devel libXp-devel libXt-devel libXext-devel
 BuildRequires: xorg-x11-xbitmaps
 BuildRequires: perl
 
@@ -33,6 +34,7 @@
 Patch41: openMotif-2.2.3-CAN-2005-0605.patch
 Patch42: openMotif-2.2.3-mrm.patch
 Patch43: openMotif-2.3.0-rgbtxt.patch
+Patch44: openMotif-2.3.0-xft-config.patch
 
 Conflicts: lesstif <= 0.92.32-6
 
@@ -48,7 +50,8 @@
 Group: Development/Libraries
 Conflicts: lesstif-devel <= 0.92.32-6
 Requires: openmotif = %{version}-%{release}
-Requires: libXmu-devel libXp-devel libXt-devel libXext-devel
+Requires: libjpeg-devel libpng-devel
+Requires: libXft-devel libXmu-devel libXp-devel libXt-devel libXext-devel
 
 %description devel
 This is the Open Motif %{version} development environment. It includes the
@@ -69,6 +72,7 @@
 %patch41 -p1 -b .CAN-2005-0605
 %patch42 -p1 -b .mrm
 %patch43 -p1 -b .rgbtxt
+%patch44 -p1 -b .xft-config
 
 for i in doc/man/man3/{XmColumn,XmDataField}.3; do
 	iconv -f windows-1252 -t utf-8 < "$i" > "${i}_"
@@ -145,6 +149,7 @@
 %changelog
 * Thu Dec  8 2005 Thomas Woerner <twoerner at redhat.com> 2.3.0-0.1.1
 - enabled Xft, jpeg and png support
+- patch for missing xft-config
 
 * Fri Dec  2 2005 Thomas Woerner <twoerner at redhat.com> 2.3.0-0.1
 - new 2.3.0 (beta1)