SPECS: qt4.spec - build/install fixes, release 1.

[pluto]

Author: pluto                        Date: Tue Aug 23 10:33:15 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- build/install fixes, release 1.

---- Files affected:
SPECS:
   qt4.spec (1.36 -> 1.37) 

---- Diffs:

================================================================
Index: SPECS/qt4.spec
diff -u SPECS/qt4.spec:1.36 SPECS/qt4.spec:1.37
--- SPECS/qt4.spec:1.36	Mon Aug 22 15:01:45 2005
+++ SPECS/qt4.spec	Tue Aug 23 12:33:10 2005
@@ -35,7 +35,7 @@
 Name:		qt4
 Version:	4.0.1
 #Release:	1.%{_snap}.0.1
-Release:	0.1
+Release:	1
 License:	GPL/QPL
 Group:		X11/Libraries
 Source0:	ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-%{version}.tar.gz
@@ -752,19 +752,12 @@
 	sub-demos-all-ordered \
 	sub-examples-all-ordered
 
-#
-# TODO: 
-#	Check for "with" conditions befor build
-# OR
-#	Find out why and fix the reason of building only mysql sqldriver
-#	(it is not installed either)
-#
-for dir in src/plugins/sqldrivers/{ibase,odbc,psql,sqlite,sqlite2}
-do
-	cd $dir
-	%{__make}
-	cd -
-done
+%{?with_ibase:		%{__make} -C src/plugins/sqldrivers/ibase}
+#{?with_mysql:		#{__make} -C src/plugins/sqldrivers/mysql}
+%{?with_odbc:		%{__make} -C src/plugins/sqldrivers/odbc}
+%{?with_pgsql:		%{__make} -C src/plugins/sqldrivers/psql}
+%{?with_sqlite:		%{__make} -C src/plugins/sqldrivers/sqlite2}
+%{?with_sqlite3:	%{__make} -C src/plugins/sqldrivers/sqlite}
 
 %if %{with dont_enable}
 %if %{with designer}
@@ -783,6 +776,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{_pkgconfigdir}
 QTDIR=`/bin/pwd`
 
 export QTDIR
@@ -855,6 +849,7 @@
 ln -sf ../../QtCore/arch/qatomic.h arch/qatomic.h
 cd -
 
+mv $RPM_BUILD_ROOT%{_libdir}/*.pc $RPM_BUILD_ROOT%{_pkgconfigdir}
 for f in $RPM_BUILD_ROOT%{_pkgconfigdir}/*.pc; do
 	HAVEDEBUG=`echo $f | grep _debug | wc -l`
 	MODULE=`echo $f | basename $f | cut -d. -f1 | cut -d_ -f1`
@@ -1135,6 +1130,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.37  2005/08/23 10:33:10  pluto
+- build/install fixes, release 1.
+
 Revision 1.36  2005/08/22 13:01:45  pluto
 - updated to 4.0.1.
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/qt4.spec?r1=1.36&r2=1.37&f=u