SPECS (AC-branch): qt.spec - adapter

[glen]

Author: glen                         Date: Wed Dec  5 23:45:10 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- adapter

---- Files affected:
SPECS:
   qt.spec (1.352.2.2.2.4 -> 1.352.2.2.2.5) 

---- Diffs:

================================================================
Index: SPECS/qt.spec
diff -u SPECS/qt.spec:1.352.2.2.2.4 SPECS/qt.spec:1.352.2.2.2.5
--- SPECS/qt.spec:1.352.2.2.2.4	Sat Sep 15 12:20:26 2007
+++ SPECS/qt.spec	Thu Dec  6 00:45:04 2007
@@ -815,7 +815,7 @@
 %endif
 
 ##################################
-#      STATIC SINGLE-THREAD      #
+#	  STATIC SINGLE-THREAD	  #
 ##################################
 
 %if %{with static_libs} && %{with single}
@@ -833,7 +833,7 @@
 %endif
 
 ##################################
-#      STATIC MULTI-THREAD       #
+#	  STATIC MULTI-THREAD	   #
 ##################################
 
 %if %{with static_libs}
@@ -874,7 +874,7 @@
 	-plugin-style-windows"
 
 ##################################
-#      SHARED SINGLE-THREAD      #
+#	  SHARED SINGLE-THREAD	  #
 ##################################
 
 %if %{with single}
@@ -907,7 +907,7 @@
 %endif
 
 ##################################
-#      SHARED MULTI-THREAD       #
+#	  SHARED MULTI-THREAD	   #
 ##################################
 
 ./configure \
@@ -1016,11 +1016,10 @@
 # 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.
-chmod 644 $RPM_BUILD_ROOT%{_includedir}/qt/qconfig.h
 
 cat >> $RPM_BUILD_ROOT%{_includedir}/qt/qconfig.h << EOF
 
@@ -1300,6 +1299,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.352.2.2.2.5  2007-12-05 23:45:04  glen
+- adapter
+
 Revision 1.352.2.2.2.4  2007-09-15 10:20:26  adamg
 - two more patches from qt-copy (one fixes CVE-2007-4137)
 - CVE entry for 3.3.8 merge
================================================================

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