rpms/gnash/devel gnash.spec,1.27,1.28

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/gnash/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15340/devel

Modified Files:
	gnash.spec 
Log Message:
Try passing _kde4_prefix (/usr) for the Qt dir, maybe that works.


Index: gnash.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnash/devel/gnash.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- gnash.spec	8 Oct 2008 18:48:30 -0000	1.27
+++ gnash.spec	8 Oct 2008 19:07:52 -0000	1.28
@@ -86,7 +86,7 @@
 # handle the /usr/lib(64)/kde4/devel hack
 # If only this package used cmake, this wouldn't be necessary...
 sed -i -e 's!KDECORE="-lkdecore"!KDECORE="-L$KDE/$LibDir/kde4/devel -lkdecore"!g' macros/kde4.m4
-# both the kde4 patch and the above sed touched autotools stuff
+# both the kde4 patch and the above sed hacks touched autotools stuff
 autoreconf
 
 chmod a-x libgeometry/snappingrange.h backend/render*.h gui/gtk_glue_agg.{h,cpp} 
@@ -97,12 +97,14 @@
 
 %build
 # --enable-ghelp is disabled
+# We use /usr (_kde4_prefix) as the Qt prefix because the stuff it's looking for
+# is actually in /, not in the QT4DIR (_qt4_prefix).
 %configure --disable-static --with-npapi-plugindir=%{_libdir}/mozilla/plugins \
   --enable-docbook --enable-ghelp --enable-media=GST \
   --disable-dependency-tracking --disable-rpath \
   --enable-cygnal \
   --enable-gui=gtk,kde4,sdl,fb \
-  --with-qt4=%{_qt4_prefix} \
+  --with-qt4=%{_kde4_prefix} \
   --with-kde4=%{_kde4_prefix}
 #doesn't work currently: %%{?_smp_mflags}
 make