Author: qboosh Date: Sun Mar 5 07:48:36 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - renamed nvidia bcond to dlopen_gl, removed bogus X11-driver-nvidia-devel BR
---- Files affected: SPECS: qt.spec (1.350 -> 1.351) ---- Diffs: ================================================================ Index: SPECS/qt.spec diff -u SPECS/qt.spec:1.350 SPECS/qt.spec:1.351 --- SPECS/qt.spec:1.350 Tue Jan 24 08:38:45 2006 +++ SPECS/qt.spec Sun Mar 5 08:48:31 2006 @@ -1,8 +1,8 @@ # $Revision$, $Date$ # # Conditional build: +%bcond_with dlopen_gl # dlopen libGL.so and libXmu.so instead of direct linking (NOTE: should dlopen by soname, not *.so like it does now!) %bcond_with nas # enable NAS audio support -%bcond_with nvidia # prelink Qt/KDE and depend on NVIDIA binaries %bcond_without single # don't build single-threaded libraries %bcond_without static_libs # don't build static libraries %bcond_without cups # disable CUPS support @@ -66,7 +66,6 @@ URL: http://www.trolltech.com/products/qt/ %{?with_ibase:BuildRequires: Firebird-devel >= 1.5.0} BuildRequires: OpenGL-devel -%{?with_nvidia:BuildRequires: X11-driver-nvidia-devel >= 1.0.6111-2} %{?with_cups:BuildRequires: cups-devel} BuildRequires: flex BuildRequires: freetype-devel >= 1:2.0.0 @@ -89,7 +88,6 @@ BuildRequires: xft-devel BuildRequires: xrender-devel BuildRequires: zlib-devel -Requires: OpenGL Requires: freetype >= 1:2.0.0 #Requires: libjpeg Requires: libmng >= 1.0.0 @@ -175,7 +173,7 @@ Summary(pt_BR): Arquivos de inclusăo necessária para compilar aplicaçőes Qt Group: X11/Development/Libraries Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: OpenGL-devel +%{!?with_dlopen_gl:Requires: OpenGL-devel} Requires: freetype-devel >= 1:2.0.0 Requires: libjpeg-devel Requires: libmng-devel >= 1.0.0 @@ -753,7 +751,7 @@ -I%{_includedir}/mysql \ %{!?with_cups:-no-cups} \ %{?with_nas:-system-nas-sound} \ - %{?with_nvidia:-dlopen-opengl} \ + %{?with_dlopen_gl:-dlopen-opengl} \ %{?with_pch:-pch} \ %{?debug:-debug}" @@ -1258,6 +1256,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.351 2006/03/05 07:48:31 qboosh +- renamed nvidia bcond to dlopen_gl, removed bogus X11-driver-nvidia-devel BR + Revision 1.350 2006/01/24 07:38:45 glen - add epoches ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/qt.spec?r1=1.350&r2=1.351&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
