packages: mythtv/mythtv.spec - up to full 0.22 version - pulseaudio bcond/B...

[w.kier]

Author: w.kier                       Date: Sat Nov  7 17:32:57 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to full 0.22 version
- pulseaudio bcond/BR added
- vdpau/nvidia BRs corrected
- all important (apart arts) futures enabled by default

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

---- Diffs:

================================================================
Index: packages/mythtv/mythtv.spec
diff -u packages/mythtv/mythtv.spec:1.89 packages/mythtv/mythtv.spec:1.90
--- packages/mythtv/mythtv.spec:1.89	Wed Nov  4 19:40:56 2009
+++ packages/mythtv/mythtv.spec	Sat Nov  7 18:32:52 2009
@@ -14,23 +14,24 @@
 %bcond_with	cpu_autodetect	# enable CPU autodetection at compile time (sets "-march", "-mcpu" compile flags really)
 %bcond_without	lirc		# lirc support
 %bcond_without	alsa		# alsa support
-%bcond_without	oss			# oss support
-%bcond_with	arts			# arts support
+%bcond_without	oss		# oss support
+%bcond_with	arts		# arts support
 %bcond_without	jack		# jack audio connection kit
+%bcond_without  pulseaudio	# pulseaudio support
 %bcond_without	opengl		# opengl vsync
-%bcond_without	dvb			# DVB support
+%bcond_without	dvb		# DVB support
 %bcond_without	xrandr		# disable X11 resolution switching
 %bcond_without	ivtv		# ivtv support (PVR-250, PVR-350) NFY
 %bcond_without	iptv
-%bcond_with	firewire		# ieee1394 (NFY)
+%bcond_without	firewire	# ieee1394 (NFY)
 %bcond_without	xvmc		# do not use XvMCW
 %bcond_without  vdpau		# disable nvidia vdpau support
-%bcond_without      fftw3   # disable fftw3 support
-%bcond_with	mmx				# enable MMX
+%bcond_without  fftw3		# disable fftw3 support
+%bcond_with	mmx		# enable MMX
 %bcond_with     dshowserver	# enable directshow codecs server
 %bcond_with 	directfb
-%bcond_with		nvidia_headers # build vdpau support with nvidia headers
-							   # instead of libvdpau	
+%bcond_with	nvidia_headers	# build vdpau support with nvidia headers 
+				# instead of libvdpau	
 
 # enable mmx automatically on arches having it
 %ifarch %{ix86} %{x8664}
@@ -44,17 +45,16 @@
 %undefine with_dshowserver
 %endif
 
-%define snap rc2
-#%define rel 0.1
+#%define snap rc2
 Summary:	A personal video recorder (PVR) application
 Summary(pl.UTF-8):	Osobista aplikacja do nagrywania obrazu (PVR)
 Name:		mythtv
 Version:	0.22
-Release:	0.%{snap}.2
+Release:	1
 License:	GPL v2
 Group:		Applications/Multimedia
-Source0:	ftp://ftp.osuosl.org/pub/mythtv/%{name}-%{version}%{snap}.tar.bz2
-# Source0-md5:	1e4be634b137e5b944c94b418d8c3791
+Source0:	ftp://ftp.osuosl.org/pub/mythtv/%{name}-%{version}.tar.bz2
+# Source0-md5:	e8f8b5b6a51cd7be700e215b2a1bf2c0
 Source1:	mythbackend.sysconfig
 Source2:	mythbackend.init
 Source3:	mythbackend.logrotate
@@ -72,8 +72,8 @@
 #Patch4: %{name}-dvdnav-shared.patch
 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}
+%{!?with_nvidia_headers:BuildConflicts:	xorg-driver-video-nvidia-libs}
+%{!?with_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
@@ -108,12 +108,14 @@
 BuildRequires:	perl-tools-pod
 BuildRequires:	pkgconfig
 BuildRequires:	python-devel
+%{?with_pulseaudio:BuildRequires: pulseaudio-devel}
+%{?without_pulseaudio:BuildConflicts: pulseaudio-devel}
 BuildRequires:	qt4-build
 BuildRequires:	qt4-qmake
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.228
 BuildRequires:	sed >= 4.0
-%{?without_nvidia_headers:%{?with_vdpau:BuildRequires:	libvdpau-devel}}
+%{!?with_nvidia_headers:%{?with_vdpau:BuildRequires:	libvdpau-devel}}
 BuildRequires:	xorg-lib-libXext-devel
 %{?with_xvmc:BuildRequires:	xorg-lib-libXvMC-devel}
 BuildRequires:	xorg-lib-libXxf86vm-devel
@@ -327,7 +329,7 @@
 
 %prep
 
-%setup -q -n %{name}-%{version}%{snap}
+%setup -q -n %{name}-%{version}
 
 
 %patch0 -p1
@@ -627,6 +629,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.90  2009/11/07 17:32:52  w.kier
+- up to full 0.22 version
+- pulseaudio bcond/BR added
+- vdpau/nvidia BRs corrected
+- all important (apart arts) futures enabled by default
+
 Revision 1.89  2009/11/04 18:40:56  w.kier
 - some corrections for nvidia and fftw3 BR's
 
================================================================

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