rpms/iiimf/devel iiimf.spec, 1.12, 1.13 iiimqcf-rh-build.patch, 1.2, 1.3

[fedora-cvs-commits at redhat.com]

Update of /cvs/dist/rpms/iiimf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25877

Modified Files:
	iiimf.spec iiimqcf-rh-build.patch 
Log Message:
fixed iiimqcf build fails


Index: iiimf.spec
===================================================================
RCS file: /cvs/dist/rpms/iiimf/devel/iiimf.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- iiimf.spec	4 Apr 2005 12:13:58 -0000	1.12
+++ iiimf.spec	4 Apr 2005 13:53:44 -0000	1.13
@@ -456,7 +456,10 @@
 ## why doesn't this work in buildsystem?
 #%%global qt_im_dir %(echo $QTDIR)/plugins/inputmethods
 %global qt_im_dir %{_libdir}/qt-3.3/plugins/inputmethods
-LIBDIR=%{_libdir} qmake
+IIIMQCF_PKG_CFLAGS=`/usr/bin/pkg-config --cflags qt-mt glib-2.0` IIIMQCF_PKG_LDADD=`/usr/bin/pkg-config --libs qt-mt glib-2.0` qmake
+# fix the crap Makefile generated by qmake
+mv Makefile Makefile.in
+sed -e 's/-I-I/-I/g' -e 's/-I-D/-D/g' Makefile.in > Makefile
 make
 cd ../..
 %endif

iiimqcf-rh-build.patch:
 iiimqcf.pro |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Index: iiimqcf-rh-build.patch
===================================================================
RCS file: /cvs/dist/rpms/iiimf/devel/iiimqcf-rh-build.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- iiimqcf-rh-build.patch	4 Apr 2005 12:13:58 -0000	1.2
+++ iiimqcf-rh-build.patch	4 Apr 2005 13:53:44 -0000	1.3
@@ -6,13 +6,13 @@
  TEMPLATE = lib
  DEPENDPATH += 
 -INCLUDEPATH += . /usr/lib/qt-3.3/include /usr/lib/im/include /usr/X11R6/include/  /usr/include/glib-2.0/ /usr/lib/glib-2.0/include/ 
-+INCLUDEPATH += . $$(LIBDIR)/qt-3.3/include ../../include ../../include/iiimp /usr/X11R6/include/  /usr/include/glib-2.0/ /usr/lib/glib-2.0/include/ 
++INCLUDEPATH += . $$(IIIMQCF_PKG_CFLAGS) ../../include ../../include/iiimp /usr/X11R6/include/
  
  CONFIG += debug plugin thread
  # Input
  DEFINES += HAVE_STDINT_H
 -LIBS += -L/usr/lib  -L/usr/lib/im/lib -liiimcf -liiimp -Wl,-rpath,/usr/lib/im/lib -L/usr/X11R6/lib  -lX11 -lglib-2.0
-+LIBS += -L$$(LIBDIR)/qt-3.3/lib ../../lib/iiimcf/.libs/libiiimcf.so ../../lib/iiimp/.libs/libiiimp.so -L/usr/X11R6/lib  -lX11 -lglib-2.0
++LIBS += $$(IIIMQCF_PKG_LDADD) ../../lib/iiimcf/.libs/libiiimcf.so ../../lib/iiimp/.libs/libiiimp.so
  HEADERS += iiimqccontext.h  keymapper.h lookup.h imaux.h imaux-int.h debug.h
  SOURCES += iiimqccontext.cpp iiimqcplugin.cpp keymapper.cpp lookup.cpp imaux.cpp
  # test/input.cpp test/test.cpp