packages: mythtv/mythtv.spec - some corrections for nvidia and fftw3 BR's

[w.kier]

Author: w.kier                       Date: Wed Nov  4 18:41:01 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- some corrections for nvidia and fftw3 BR's

---- Files affected:
packages/mythtv:
   mythtv.spec (1.88 -> 1.89) 

---- Diffs:

================================================================
Index: packages/mythtv/mythtv.spec
diff -u packages/mythtv/mythtv.spec:1.88 packages/mythtv/mythtv.spec:1.89
--- packages/mythtv/mythtv.spec:1.88	Wed Nov  4 13:27:36 2009
+++ packages/mythtv/mythtv.spec	Wed Nov  4 19:40:56 2009
@@ -73,7 +73,8 @@
 Patch20:	%{name}-dshowserver_trunk.patch
 URL:		http://www.mythtv.org/
 %{?without_nvidia_headers:BuildConflicts:	xorg-driver-video-nvidia-libs}
-%{?without_nvidia_headers:BuildConflicts: xorg-driver-video-nvidia-devel}
+%{?without_nvidia_headers:BuildConflicts: 	xorg-driver-video-nvidia-devel}
+%{?with_nvidia_headers:%{?with_vdpau:BuildRequires: xorg-driver-video-nvidia-devel}}
 BuildRequires:	Mesa-libGLU-devel
 #BuildRequires:	OpenGL-GLU-devel
 BuildRequires:	OpenGL-devel
@@ -96,7 +97,7 @@
 BuildRequires:	libdts-devel
 %{?with_dvb:BuildRequires:	libdvb-devel}
 BuildRequires:	libdvdnav-devel
-%{?with_fftw3:BuildRequires: fftw3-devel}
+%{?with_fftw3:BuildRequires: fftw3-devel,fftw3-single-devel}
 %{?with_firewire:BuildRequires:	libiec61883-devel}
 %{?with_firewire:BuildRequires:	libraw1394-devel}
 BuildRequires:	linux-libc-headers >= 7:2.6.10
@@ -112,7 +113,7 @@
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.228
 BuildRequires:	sed >= 4.0
-%{?with_vdpau:BuildRequires:	libvdpau-devel}
+%{?without_nvidia_headers:%{?with_vdpau:BuildRequires:	libvdpau-devel}}
 BuildRequires:	xorg-lib-libXext-devel
 %{?with_xvmc:BuildRequires:	xorg-lib-libXvMC-devel}
 BuildRequires:	xorg-lib-libXxf86vm-devel
@@ -626,6 +627,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.89  2009/11/04 18:40:56  w.kier
+- some corrections for nvidia and fftw3 BR's
+
 Revision 1.88  2009/11/04 12:27:36  w.kier
 - forced linking against libfftw3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mythtv/mythtv.spec?r1=1.88&r2=1.89&f=u