rpms/mingw32-qt/devel mingw32-qt.spec,1.25,1.26

epienbro epienbro at fedoraproject.org
Sun Jun 27 15:06:22 UTC 2010


Author: epienbro

Update of /cvs/pkgs/rpms/mingw32-qt/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv4072

Modified Files:
	mingw32-qt.spec 
Log Message:
Added a workaround for a bug in qmake 4.7.0.beta1



Index: mingw32-qt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-qt/devel/mingw32-qt.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- mingw32-qt.spec	27 Jun 2010 11:56:53 -0000	1.25
+++ mingw32-qt.spec	27 Jun 2010 15:06:21 -0000	1.26
@@ -124,6 +124,11 @@ for d in %{?subdirs} %{?relsubdirs} %{?d
 #  since we trash the PCH cache, everything is rebuilt again at install time,
 #  so there's no point in building now
 #  make %{?_smp_mflags}
+
+# Qt 4.7.0.beta1 contains a bug where invalid slashes are used in a Makefile
+# when the .pro files contains 'TEMPLATE = subdirs'. Work around this
+  sed -i s/"\\\\usr\\\\bin\\\\qmake-qt4"/"\/usr\/bin\/qmake-qt4"/ Makefile
+
   popd
 
   # As above ...



More information about the scm-commits mailing list