SPECS: qt.spec - cosmetics

[glen]

Author: glen                         Date: Thu Dec  6 01:11:55 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- cosmetics

---- Files affected:
SPECS:
   qt.spec (1.385 -> 1.386) 

---- Diffs:

================================================================
Index: SPECS/qt.spec
diff -u SPECS/qt.spec:1.385 SPECS/qt.spec:1.386
--- SPECS/qt.spec:1.385	Thu Dec  6 01:41:20 2007
+++ SPECS/qt.spec	Thu Dec  6 02:11:49 2007
@@ -17,8 +17,8 @@
 %ifnarch %{ix86} %{x8664} sparc sparcv9 alpha ppc
 %undefine	with_ibase
 %endif
-%define		_withsql	1
-%{!?with_sqlite:%{!?with_ibase:%{!?with_mysql:%{!?with_pgsql:%{!?with_odbc:%undefine _withsql}}}}}
+%define		with_sql	1
+%{!?with_sqlite:%{!?with_ibase:%{!?with_mysql:%{!?with_pgsql:%{!?with_odbc:%undefine with_sql}}}}}
 
 %define		_ver		3.3.8
 
@@ -768,9 +768,9 @@
 export PATH=$QTDIR/bin:$PATH
 export LD_LIBRARY_PATH=$QTDIR/%{_lib}:$LD_LIBRARY_PATH
 
-if [ "%{_lib}" != "lib" ] ; then
+%if "%{_lib}" != "lib"
 	ln -sf lib "%{_lib}"
-fi
+%endif
 
 # pass OPTFLAGS to build qmake itself with optimization
 export OPTFLAGS="%{rpmcxxflags}"
@@ -913,7 +913,7 @@
 rm -rf plugins-st
 mkdir plugins-st
 cp -R plugins/{imageformats,styles} plugins-st
-%{?_withsql:cp -R plugins/sqldrivers plugins-st}
+%{?with_sql:cp -R plugins/sqldrivers plugins-st}
 %{__make} clean
 %endif
 
@@ -1117,7 +1117,7 @@
 %dir %{_libdir}/%{name}/plugins-mt/imageformats
 %attr(755,root,root) %{_libdir}/%{name}/plugins-mt/imageformats/*.so
 %dir %{_libdir}/%{name}/plugins-mt/network
-%{?_withsql:%dir %{_libdir}/%{name}/plugins-mt/sqldrivers}
+%{?with_sql:%dir %{_libdir}/%{name}/plugins-mt/sqldrivers}
 %dir %{_libdir}/%{name}/plugins-mt/styles
 %attr(755,root,root) %{_libdir}/%{name}/plugins-mt/styles/*.so
 %dir %{_datadir}/qt
@@ -1204,7 +1204,7 @@
 %attr(755,root,root) %{_libdir}/libqt.so.*.*.*
 %dir %{_libdir}/%{name}/plugins-st
 %dir %{_libdir}/%{name}/plugins-st/network
-%{?_withsql:%dir %{_libdir}/%{name}/plugins-st/sqldrivers}
+%{?with_sql:%dir %{_libdir}/%{name}/plugins-st/sqldrivers}
 %dir %{_libdir}/%{name}/plugins-st/imageformats
 %attr(755,root,root) %{_libdir}/%{name}/plugins-st/imageformats/*.so
 %dir %{_libdir}/%{name}/plugins-st/styles
@@ -1311,6 +1311,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.386  2007-12-06 01:11:49  glen
+- cosmetics
+
 Revision 1.385  2007-12-06 00:41:20  glen
 - qconfig.h is not writable
 
================================================================

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