SPECS: qt4.spec - glen changes from AC-branch; removing AC bcond c...

[pascalek]

Author: pascalek                     Date: Thu Mar 22 11:45:37 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- glen changes from AC-branch; removing AC bcond continued (glen: why?)

---- Files affected:
SPECS:
   qt4.spec (1.126 -> 1.127) 

---- Diffs:

================================================================
Index: SPECS/qt4.spec
diff -u SPECS/qt4.spec:1.126 SPECS/qt4.spec:1.127
--- SPECS/qt4.spec:1.126	Wed Mar 14 16:58:11 2007
+++ SPECS/qt4.spec	Thu Mar 22 12:45:32 2007
@@ -28,7 +28,6 @@
 
 %define		_withsql	1
 %{!?with_sqlite3:%{!?with_sqlite:%{!?with_ibase:%{!?with_mysql:%{!?with_pgsql:%{!?with_odbc:%undefine _withsql}}}}}}
-%{?with_AC:%undefine with_pch}
 
 Summary:	The Qt GUI application framework
 Summary(es.UTF-8):	Biblioteca para ejecutar aplicaciones GUI Qt
@@ -60,10 +59,10 @@
 %{?with_sqlite3:BuildRequires:	sqlite3-devel}
 # incompatible with bison
 %{?with_cups:BuildRequires:	cups-devel}
-BuildRequires:	dbus-devel
+BuildRequires:	dbus-devel >= 0.62
 BuildRequires:	fontconfig-devel
 BuildRequires:	freetype-devel >= 1:2.0.0
-%{!?with_AC:%{?with_pch:BuildRequires:	gcc >= 5:4.0}}
+BuildRequires:	gcc >= 5:4.0
 BuildRequires:	giflib-devel
 BuildRequires:	glib2-devel >= 2.0.0
 BuildRequires:	libjpeg-devel
@@ -985,21 +984,22 @@
 	-qdbus \
 	-qt-gif \
 	-system-libjpeg \
+	-system-libmng \
 	-system-libpng \
 	-system-zlib \
 	-no-exceptions \
+	-largefile \
 	-I%{_includedir}/postgresql/server \
 	-I%{_includedir}/mysql \
 	%{?with_cups:-cups} \
 	%{?with_nas:-system-nas-sound} \
 	%{?debug:-debug} \
 	%{!?debug:-release} \
-	%{?with_AC:-L/usr/X11R6/lib} \
 	-qt3support \
 	-fontconfig \
 	-iconv \
 	-no-separate-debug-info \
-	-%{?with_AC:no-}xfixes \
+	-xfixes \
 	-nis \
 	-sm \
 	-tablet \
@@ -1014,12 +1014,12 @@
 
 %if %{with static_libs}
 OPT=" \
-	%{?with_mysql:-qt-sql-mysql} \
-	%{?with_odbc:-qt-sql-odbc} \
-	%{?with_pgsql:-qt-sql-psql} \
-	%{?with_sqlite3:-qt-sql-sqlite} \
-	%{?with_sqlite:-qt-sql-sqlite2} \
-	%{?with_ibase:-qt-sql-ibase} \
+	-%{!?with_mysql:no}%{?with_mysql:qt}-sql-mysql \
+	-%{!?with_odbc:no}%{?with_odbc:qt}-sql-odbc \
+	-%{!?with_pgsql:no}%{?with_pgsql:qt}-sql-psql \
+	-%{!?with_sqlite3:no}%{?with_sqlite3:qt}-sql-sqlite \
+	-%{!?with_sqlite:no}%{?with_sqlite:qt}-sql-sqlite2 \
+	-%{!?with_ibase:no}%{?with_ibase:qt}-sql-ibase \
 	-static"
 
 echo "yes" | ./configure $COMMONOPT $OPT
@@ -1040,12 +1040,12 @@
 ##################################
 
 OPT=" \
-	%{?with_mysql:-plugin-sql-mysql} \
-	%{?with_odbc:-plugin-sql-odbc} \
-	%{?with_pgsql:-plugin-sql-psql} \
-	%{?with_sqlite3:-plugin-sql-sqlite} \
-	%{?with_sqlite:-plugin-sql-sqlite2} \
-	%{?with_ibase:-plugin-sql-ibase}"
+	-%{!?with_mysql:no}%{?with_mysql:plugin}-sql-mysql \
+	-%{!?with_odbc:no}%{?with_odbc:plugin}-sql-odbc \
+	-%{!?with_pgsql:no}%{?with_pgsql:plugin}-sql-psql \
+	-%{!?with_sqlite3:no}%{?with_sqlite3:plugin}-sql-sqlite \
+	-%{!?with_sqlite:no}%{?with_sqlite:plugin}-sql-sqlite2 \
+	-%{!?with_ibase:no}%{?with_ibase:plugin}-sql-ibase"
 
 echo "yes" | ./configure $COMMONOPT $OPT
 
@@ -1552,6 +1552,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.127  2007/03/22 11:45:32  pascalek
+- glen changes from AC-branch; removing AC bcond continued (glen: why?)
+
 Revision 1.126  2007/03/14 15:58:11  qboosh
 - missing ;
 
================================================================

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