SPECS: qt4.spec - --with AC condition - it builds and works fine w...

[pascalek]

Author: pascalek                     Date: Wed Sep 13 18:01:58 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- --with AC condition
- it builds and works fine with AC now (compiled with gcc 3.3.6)
- do NOT make extra branches for AC unless it'll be really necessery

---- Files affected:
SPECS:
   qt4.spec (1.95 -> 1.96) 

---- Diffs:

================================================================
Index: SPECS/qt4.spec
diff -u SPECS/qt4.spec:1.95 SPECS/qt4.spec:1.96
--- SPECS/qt4.spec:1.95	Tue Aug 22 18:12:56 2006
+++ SPECS/qt4.spec	Wed Sep 13 20:01:53 2006
@@ -18,6 +18,7 @@
 %bcond_without	pch		# disable pch in qmake
 %bcond_with	sse		# use SSE instructions in gui/painting module
 %bcond_with	dont_enable	# blocks translations, they are not yet available
+%bcond_with	AC		# build for AC
 
 %undefine	with_dont_enable
 
@@ -65,7 +66,7 @@
 %{?with_cups:BuildRequires:	cups-devel}
 BuildRequires:	fontconfig-devel
 BuildRequires:	freetype-devel >= 1:2.0.0
-%{?with_pch:BuildRequires:	gcc >= 5:4.0}
+%{!?with_AC:%{?with_pch:BuildRequires:	gcc >= 5:4.0}}
 BuildRequires:	libjpeg-devel
 BuildRequires:	libmng-devel >= 1.0.0
 BuildRequires:	libpng-devel >= 2:1.0.8
@@ -79,6 +80,7 @@
 BuildRequires:	sed >= 4.0
 %{?with_sqlite:BuildRequires:	sqlite-devel}
 %{?with_odbc:BuildRequires:	unixODBC-devel}
+%if %{without AC}
 BuildRequires:	xorg-lib-libSM-devel
 BuildRequires:	xorg-lib-libXcursor-devel
 BuildRequires:	xorg-lib-libXext-devel
@@ -86,9 +88,9 @@
 BuildRequires:	xorg-lib-libXinerama-devel
 BuildRequires:	xorg-lib-libXrandr-devel
 BuildRequires:	xorg-lib-libXrender-devel
+%endif
+%{?with_AC:BuildRequires:	X11-devel}
 BuildRequires:	zlib-devel
-# due to -L%{_libdir} before -L%{builddir}/... in makefiles
-#BuildConflicts:	QtCore-devel < %{version}
 Obsoletes:	qt-extensions
 Obsoletes:	qt-utils
 Conflicts:	kdelibs <= 8:3.2-0.030602.1
@@ -194,6 +196,7 @@
 Requires:	fontconfig-devel
 Requires:	freetype-devel >= 1:2.0.0
 Requires:	libpng-devel >= 2:1.0.8
+%if %{with AC}
 Requires:	xorg-lib-libSM-devel
 Requires:	xorg-lib-libXcursor-devel
 Requires:	xorg-lib-libXext-devel
@@ -201,6 +204,8 @@
 Requires:	xorg-lib-libXinerama-devel
 Requires:	xorg-lib-libXrandr-devel
 Requires:	xorg-lib-libXrender-devel
+%endif
+%{?with_AC:Requires:	X11-devel}
 
 %description -n QtGui-devel
 Graphical User Interface components - development files.
@@ -918,7 +923,7 @@
 	-examplesdir %{_examplesdir}/qt4 \
 	-demosdir %{_examplesdir}/qt4-demos \
 	-fast \
-	-%{!?with_pch:no-}pch \
+	-%{!?with_AC:%{!?with_pch:no-}}pch \
 	-%{!?with_sse:no-}sse \
 	-qt-gif \
 	-system-libjpeg \
@@ -931,6 +936,7 @@
 	%{?with_nas:-system-nas-sound} \
 	%{?debug:-debug} \
 	%{!?debug:-release} \
+	%{?with_AC:-L/usr/X11R6/lib} \
 	-qt3support \
 	-fontconfig \
 	-nis \
@@ -1470,6 +1476,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.96  2006/09/13 18:01:53  pascalek
+- --with AC condition
+- it builds and works fine with AC now (compiled with gcc 3.3.6)
+- do NOT make extra branches for AC unless it'll be really necessery
+
 Revision 1.95  2006/08/22 16:12:56  pascalek
 - it seems that QtCore-devel conflict is obsolete
 
================================================================

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