SPECS: qt.spec - AC-branch merge

[glen]

Author: glen                         Date: Wed Dec  5 23:48:41 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- AC-branch merge

---- Files affected:
SPECS:
   qt.spec (1.383 -> 1.384) 

---- Diffs:

================================================================
Index: SPECS/qt.spec
diff -u SPECS/qt.spec:1.383 SPECS/qt.spec:1.384
--- SPECS/qt.spec:1.383	Thu Dec  6 00:47:21 2007
+++ SPECS/qt.spec	Thu Dec  6 00:48:36 2007
@@ -717,6 +717,7 @@
 %patch181 -p0
 %patch182 -p0
 %patch183 -p0
+
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -929,7 +930,7 @@
 yes
 _EOF_
 
-%if !%{with designer}
+%if %{without designer}
 grep -v designer tools/tools.pro > tools/tools.pro.1
 mv tools/tools.pro{.1,}
 %{__make} -C tools/designer/uic \
@@ -1026,7 +1027,7 @@
 # From now QMAKE_INCDIR_QT becomes %{_includedir}/qt
 perl -pi -e "
 	s|(QMAKE_INCDIR_QT\\s*=\\s*\\\$\\(QTDIR\\)/include)|\$1/qt|
-	" $RPM_BUILD_ROOT/%{_datadir}/qt/mkspecs/linux-g++/qmake.conf
+	" $RPM_BUILD_ROOT%{_datadir}/qt/mkspecs/linux-g++/qmake.conf
 
 # We provide qt style classes as plugins,
 # so make corresponding changes to the qconfig.h.
@@ -1309,6 +1310,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.384  2007-12-05 23:48:36  glen
+- AC-branch merge
+
 Revision 1.383  2007-12-05 23:47:21  glen
 - adapter
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/qt.spec?r1=1.383&r2=1.384&f=u