X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=mythtv.spec;h=1ba2327bdb740675a01a8797b49fe38909f9e0ba;hb=d80d4d611c0cac64de0be2fd30f34d744a117f13;hp=3189eafa7ab8975685f9df9a025021f0d98ac0b6;hpb=df418ad171a6bb11a52a709f08d27a242804b6ae;p=packages%2Fmythtv.git

diff --git a/mythtv.spec b/mythtv.spec
index 3189eaf..1ba2327 100644
--- a/mythtv.spec
+++ b/mythtv.spec
@@ -1,8 +1,14 @@
 # TODO
 # - bconds: altivec joystick lcd
 # - lcd? (app-misc/lcdproc)
-# - icons for desktop entries
 # - alpha, sparc, ppc arches?
+# - http://outflux.net/software/pkgs/mythtvfs-fuse/
+# - vaapi support - check for compatible versions of libva?
+# - bindings:
+#   WARNING: disabling Python bindings; missing MySQLdb
+#   WARNING: disabling Perl bindings; missing Net::UPnP::QueryResponse
+#   WARNING: disabling Perl bindings; missing Net::UPnP::ControlPoint
+# - dozen of unpackaged files
 #
 # Specfile for MythTV
 #
@@ -15,16 +21,26 @@
 %bcond_without	lirc		# lirc support
 %bcond_without	alsa		# alsa support
 %bcond_without	oss		# oss support
-%bcond_without	arts		# arts support
 %bcond_without	jack		# jack audio connection kit
-%bcond_with	oggvorbis	# ogg vorbis (gone?!)
+%bcond_without  pulseaudio	# pulseaudio support
 %bcond_without	opengl		# opengl vsync
 %bcond_without	dvb		# DVB support
 %bcond_without	xrandr		# disable X11 resolution switching
-%bcond_with	ivtv		# ivtv support (PVR-250, PVR-350) NFY
-%bcond_with	firewire	# ieee1394 (NFY)
+%bcond_without	ivtv		# ivtv support (PVR-250, PVR-350) NFY
+%bcond_without	iptv
+%bcond_without	firewire	# ieee1394 (NFY)
 %bcond_without	xvmc		# do not use XvMCW
-%bcond_with	mmx			# enable mmx
+%bcond_without  vdpau		# disable nvidia vdpau support
+%bcond_without  fftw3		# disable fftw3 support
+%bcond_with	mmx		# enable MMX
+%bcond_without	nellymoserdec
+%bcond_with	vaapi		# enable vaapi
+%bcond_with     dshowserver	# enable directshow codecs server
+%bcond_with 	directfb
+%bcond_with 	perl
+%bcond_with 	python
+%bcond_with	nvidia_headers	# build vdpau support with nvidia headers 
+				# instead of libvdpau
 
 # enable mmx automatically on arches having it
 %ifarch %{ix86} %{x8664}
@@ -33,59 +49,93 @@
 %endif
 %endif
 
+# dshowserver is exclusive arch for x86 x86_64 only
+%ifnarch %{ix86} %{x8664}
+%undefine with_dshowserver
+%endif
+
+%include	/usr/lib/rpm/macros.perl
 Summary:	A personal video recorder (PVR) application
-Summary(pl):	Osobista aplikacja do nagrywania obrazu (PVR)
+Summary(pl.UTF-8):	Osobista aplikacja do nagrywania obrazu (PVR)
 Name:		mythtv
-Version:	0.19
-Release:	3
+Version:	0.24.1
+Release:	0.2
 License:	GPL v2
 Group:		Applications/Multimedia
-Source0:	http://www.mythtv.org/mc/%{name}-%{version}.tar.bz2
-# Source0-md5:	ebba5829d264bb4de2f75cae936141f4
+Source0:	ftp://ftp.osuosl.org/pub/mythtv/%{name}-%{version}.tar.bz2
+# Source0-md5:	6870c679619ec58456e76839745411d8
 Source1:	mythbackend.sysconfig
 Source2:	mythbackend.init
 Source3:	mythbackend.logrotate
-Source5:	mythfrontend.desktop
-Patch0:		%{name}-lib64.patch
-Patch1:		%{name}-x86_64-configure.patch
-Patch2:		%{name}-mythstream.patch
-Patch3:		%{name}-ldconfig.patch
-Patch4:		%{name}-pl.patch
-Patch5:		%{name}-sbinpath.patch
-Patch6:		%{name}-ticket-1310.patch
-Patch7:		%{name}-optflags.patch
-Patch8:		%{name}-branch.diff
+Source5:	pld-mythfrontend.desktop
+# Source5-md5:	f37a903ac97463683bebacdf29406951
+Source6:	pld-mythfrontend.png
+# Source6-md5:	bf76bd1463a022e174e4af976a03e678
+Source20:	dshowcodecs
+# Source20-md5:	48327772b9e150f69e1ab8ff44b9a76c
+Patch0:		%{name}-configure.patch
+Patch10:	%{name}-sbinpath.patch
+Patch20:	%{name}-compile_fixes_for_qt_4_7.patch
+Patch30:	%{name}-dshowserver-0.22.patch
 URL:		http://www.mythtv.org/
-#BuildRequires:	DirectFB-devel
-BuildRequires:	XFree86-devel
+BuildRequires:	Mesa-libGLU-devel
+BuildRequires:	OpenGL-devel
+BuildRequires:	Qt3Support-devel
+BuildRequires:	QtCore-devel
+BuildRequires:	QtGui-devel
+BuildRequires:	QtNetwork-devel
+BuildRequires:	QtOpenGL-devel
+BuildRequires:	QtScript-devel
+BuildRequires:	QtSql-devel
+BuildRequires:	QtWebKit-devel
+BuildRequires:	QtXml-devel
 %{?with_alsa:BuildRequires:	alsa-lib-devel}
-%{?with_arts:BuildRequires:	arts-devel >= 13:0.9.5}
+BuildRequires:	ffmpeg-devel
+%{?with_fftw3:BuildRequires: fftw3-devel,fftw3-single-devel}
 BuildRequires:	freetype-devel >= 1:2.0.0
 %{?with_jack:BuildRequires:	jack-audio-connection-kit-devel}
 BuildRequires:	lame-libs-devel
-%{?with_xvmc:BuildRequires:	libXvMCW-devel}
 %{?with_firewire:BuildRequires:	libavc1394-devel}
+BuildRequires:	libdts-devel
 %{?with_dvb:BuildRequires:	libdvb-devel}
 BuildRequires:	libdvdnav-devel
 %{?with_firewire:BuildRequires:	libiec61883-devel}
 %{?with_firewire:BuildRequires:	libraw1394-devel}
-%{?with_oggvorbis:BuildRequires:	libvorbis-devel}
+%{!?with_nvidia_headers:%{?with_vdpau:BuildRequires:	libvdpau-devel}}
 BuildRequires:	linux-libc-headers >= 7:2.6.10
 %{?with_lirc:BuildRequires:	lirc-devel}
 BuildRequires:	mysql-devel
-BuildRequires:	patchutils
-BuildRequires:	qmake >= 6:3.2.1-4
-BuildRequires:	qt-devel >= 6:3.2.1-4
+BuildRequires:	perl-devel
+BuildRequires:	perl-tools-pod
+BuildRequires:	pkgconfig
+%{?with_pulseaudio:BuildRequires: pulseaudio-devel}
+BuildRequires:	python-devel
+BuildRequires:	qt4-build
+BuildRequires:	qt4-qmake
+BuildRequires:	rpm-perlprov >= 4.1-13
+BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.228
 BuildRequires:	sed >= 4.0
-# for bundled libavcodec
-BuildRequires:	libdts-devel
-#BuildConflicts:	libmyth-devel
+BuildRequires:	which
+%{?with_nvidia_headers:%{?with_vdpau:BuildRequires: xorg-driver-video-nvidia-devel}}
+BuildRequires:	xorg-lib-libXext-devel
+%{?with_xvmc:BuildRequires:	xorg-lib-libXvMC-devel}
+BuildRequires:	xorg-lib-libXxf86vm-devel
+%{!?with_pulseaudio:BuildConflicts: pulseaudio-devel}
+%{!?with_nvidia_headers:BuildConflicts:	xorg-driver-video-nvidia-devel}
+# for Perl bindings
+BuildRequires:	perl-ExtUtils-MakeMaker
+Conflicts:	logrotate < 3.8.0
 ExclusiveArch:	%{ix86} %{x8664} ppc
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define	myth_api_version %(echo %{version} | cut -d. -f1,2)
 
+# libmythavdevice.so.52.2.1 missing -l???: sem_init sem_destroy sem_post sem_timedwait
+# libmythavcodec.so.52.86.1 missing -lpthread: pthread_create pthread_join
+%define		skip_post_check_so	libmythavdevice.so libmythavcodec.so
+%define		no_install_post_check_so 1
+
 %description
 MythTV implements the following PVR features, and more, with a unified
 graphical interface:
@@ -98,22 +148,22 @@ graphical interface:
 - Resolution of conflicts between scheduled recordings
 - Basic video editing
 
-%description -l pl
-MythTV implementuje nastêpuj±ce mo¿liwo¶ci PVR, a nawet wiêcej, wraz z
+%description -l pl.UTF-8
+MythTV implementuje następujące możliwości PVR, a nawet więcej, wraz z
 ujednoliconym interfejsem graficznym:
-- podstawowa funkcjonalno¶æ "live-tv"; pauza, szybkie przewijanie,
-  przewijanie "¿ywej" telewizji
-- kompresja obrazu przy u¿yciu RTjpeg lub MPEG-4
-- odczyt listy programów przy u¿yciu XMLTV
-- pseudoprzezroczyste wy¶wietlanie na obrazie (OSD) z obs³ug± motywów
+- podstawowa funkcjonalność "live-tv"; pauza, szybkie przewijanie,
+  przewijanie "żywej" telewizji
+- kompresja obrazu przy użyciu RTjpeg lub MPEG-4
+- odczyt listy programów przy użyciu XMLTV
+- pseudoprzezroczyste wyświetlanie na obrazie (OSD) z obsługą motywów
 - elektroniczny przewodnik po programie
-- planowane nagrywanie programów telewizyjnych
-- rozwi±zywanie konfliktów miêdzy planowanymi nagraniami
+- planowane nagrywanie programów telewizyjnych
+- rozwiązywanie konfliktów między planowanymi nagraniami
 - podstawowa edycja obrazu
 
 %package backend
 Summary:	Server component of mythtv (a PVR)
-Summary(pl):	Czê¶æ serwerowa mythtv (PVR)
+Summary(pl.UTF-8):	Część serwerowa mythtv (PVR)
 Group:		Applications/Multimedia
 Requires(post,preun):	/sbin/chkconfig
 Requires(postun):	/usr/sbin/groupdel
@@ -124,6 +174,7 @@ Requires(pre):	/usr/sbin/groupadd
 Requires(pre):	/usr/sbin/useradd
 Requires:	libmyth = %{version}-%{release}
 Requires:	mythtv = %{version}-%{release}
+Suggests:	mysql
 Provides:	group(mythtv)
 Provides:	user(mythtv)
 
@@ -137,19 +188,19 @@ and audio capture and encoding services. In order to be useful, it
 requires a mythtv-frontend installation, either on the same system or
 one reachable via the network.
 
-%description backend -l pl
+%description backend -l pl.UTF-8
 MythTV dostarcza ujednolicony interfejs graficzny do nagrywania i
-ogl±dania programów telewizyjnych. Wiêcej informacji w pakiecie
+oglądania programów telewizyjnych. Więcej informacji w pakiecie
 mythtv.
 
-Ten pakiet zawiera tylko oprogramowanie serwerowe, udostêpniaj±ce
-us³ugi przechwytywania i kodowania obrazu i d¼wiêku. Aby by³o
+Ten pakiet zawiera tylko oprogramowanie serwerowe, udostępniające
+usługi przechwytywania i kodowania obrazu i dźwięku. Aby było
 przydatne, wymaga instalacji mythtv-frontend - na tym samym systemie,
-albo innym osi±galnym po sieci.
+albo innym osiągalnym w sieci.
 
 %package frontend
 Summary:	Client component of mythtv (a PVR)
-Summary(pl):	Czê¶æ kliencka mythtv (PVR)
+Summary(pl.UTF-8):	Część kliencka mythtv (PVR)
 Group:		Applications/Multimedia
 Requires:	libmyth = %{version}-%{release}
 Requires:	mythtv = %{version}-%{release}
@@ -166,19 +217,18 @@ front-end for playback and configuration. It requires access to a
 mythtv-backend installation, either on the same system or one
 reachable via the network.
 
-%description frontend -l pl
+%description frontend -l pl.UTF-8
 MythTV dostarcza ujednolicony interfejs graficzny do nagrywania i
-ogl±dania programów telewizyjnych. Wiêcej informacji w pakiecie
+oglądania programów telewizyjnych. Więcej informacji w pakiecie
 mythtv.
 
-Ten pakiet zawiera tylko oprogramowanie klienckie, dostarczaj±ce
-frontend do odtwarzania i konfiguracji. Wymaga dostêpu do instalacji
-mythtv-backend - na tym samym systemie, albo innym osi±galnym po
-sieci.
+Ten pakiet zawiera tylko oprogramowanie klienckie, dostarczające
+frontend do odtwarzania i konfiguracji. Wymaga dostępu do instalacji
+mythtv-backend - na tym samym systemie, albo innym osiągalnym w sieci.
 
 %package setup
 Summary:	Setup the mythtv backend
-Summary(pl):	Konfigurator backendu mythtv
+Summary(pl.UTF-8):	Konfigurator backendu mythtv
 Group:		Applications/Multimedia
 Requires:	libmyth = %{version}-%{release}
 
@@ -190,17 +240,18 @@ information.
 This package contains only the setup software for configuring the
 mythtv backend.
 
-%description setup -l pl
+%description setup -l pl.UTF-8
 MythTV dostarcza ujednolicony interfejs graficzny do nagrywania i
-ogl±dania programów telewizyjnych. Wiêcej informacji w pakiecie
+oglądania programów telewizyjnych. Więcej informacji w pakiecie
 mythtv.
 
 Ten pakiet zawiera tylko program do konfigurowania backendu mythtv.
 
 %package themes
 Summary:	Base themes for mythtv's frontend
-Summary(pl):	Podstawowe motywy dla frontendu mythtv
-Group:		Applications/Multimedia
+Summary(pl.UTF-8):	Podstawowe motywy dla frontendu mythtv
+Group:		Themes
+Requires:	%{name}-frontend = %{version}-%{release}
 
 %description themes
 MythTV provides a unified graphical interface for recording and
@@ -210,37 +261,36 @@ information.
 This package contains only the base themes used by the frontend and
 mythtvsetup.
 
-%description themes -l pl
+%description themes -l pl.UTF-8
 MythTV dostarcza ujednolicony interfejs graficzny do nagrywania i
-ogl±dania programów telewizyjnych. Wiêcej informacji w pakiecie
+oglądania programów telewizyjnych. Więcej informacji w pakiecie
 mythtv.
 
-Ten pakiet zawiera tylko podstawowe motywy u¿ywane przez frontend oraz
+Ten pakiet zawiera tylko podstawowe motywy używane przez frontend oraz
 mythtvsetup.
 
 %package -n libmyth
 Summary:	Library providing mythtv support
-Summary(pl):	Biblioteka udostêpniaj±ca obs³ugê mythtv
+Summary(pl.UTF-8):	Biblioteka udostępniająca obsługę mythtv
 Group:		Libraries
+Requires:	QtSql-mysql
 Requires:	freetype >= 1:2.0.0
 Requires:	lame
-Requires:	qt >= 6:3.2.1-4
-Requires:	qt-plugin-mysql >= 6:3.2.1-4
 
 %description -n libmyth
 Common library code for MythTV and add-on modules (development) MythTV
 provides a unified graphical interface for recording and viewing
 television programs. Refer to the mythtv package for more information.
 
-%description -n libmyth -l pl
-Wspólny kod biblioteki dla MythTV i dodatkowych modu³ów MythTV
-dostarczaj±cy ujednolicony interfejs graficzny do nagrywania i
-ogl±dania programów telewizyjnych. Wiêcej informacji w pakiecie
+%description -n libmyth -l pl.UTF-8
+Wspólny kod biblioteki dla MythTV i dodatkowych modułów MythTV
+dostarczający ujednolicony interfejs graficzny do nagrywania i
+oglądania programów telewizyjnych. Więcej informacji w pakiecie
 mythtv.
 
 %package -n libmyth-devel
 Summary:	Development files for libmyth
-Summary(pl):	Pliki nag³ówkowe libmyth
+Summary(pl.UTF-8):	Pliki nagłówkowe libmyth
 Group:		Development/Libraries
 Requires:	libmyth = %{version}-%{release}
 
@@ -248,34 +298,55 @@ Requires:	libmyth = %{version}-%{release}
 This package contains the header files for developing add-ons for
 mythtv.
 
-%description -n libmyth-devel -l pl
-Ten pakiet zawiera pliki nag³ówkowe do tworzenia dodatków dla mythtv.
+%description -n libmyth-devel -l pl.UTF-8
+Ten pakiet zawiera pliki nagłówkowe do tworzenia dodatków dla mythtv.
 
 %package -n libmyth-static
 Summary:	Static libmyth library
-Summary(pl):	Statyczna biblioteka libmyth
+Summary(pl.UTF-8):	Statyczna biblioteka libmyth
 Group:		Development/Libraries
 Requires:	libmyth-devel = %{version}-%{release}
 
 %description -n libmyth-static
 Static libmyth library.
 
-%description -n libmyth-static -l pl
+%description -n libmyth-static -l pl.UTF-8
 Statyczna biblioteka libmyth.
 
+%package -n perl-MythTV
+Summary:	MythTV Perl bindings
+Summary(pl.UTF-8):	Interfejs Perla dla MythTV
+Group:		Libraries
+
+%description -n perl-MythTV
+MythTV Perl bindings.
+
+%description -n perl-MythTV -l pl.UTF-8
+Ten pakiet zawiera moduły Perla do tworzenia dodatków dla mythtv.
+
+%package -n python-MythTV
+Summary:	MythTV Python bindings
+Summary(pl.UTF-8):	Interfejs Pythona dla MythTV
+Group:		Libraries
+Requires:	python-MySQLdb
+
+%description -n python-MythTV
+MythTV Python bindings.
+
+%description -n python-MythTV -l pl.UTF-8
+Ten pakiet zawiera moduły Pythona do tworzenia dodatków dla mythtv.
+
 %prep
-%setup -q %{?_rev:-n %{name}}
-%if %{_lib} != "lib"
-%patch0 -p1
-%endif
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p0
-%patch7 -p1
-filterdiff -i 'mythtv/*' %{PATCH8} | %{__patch} -p1 -s
+
+%setup -q
+
+%{__sed} -i -e 's,/var/log/mythfilldatabase.log,/var/log/mythtv/mythfilldatabase.log,' \
+	programs/mythbackend/housekeeper.cpp programs/mythwelcome/welcomedialog.cpp
+
+%patch0  -p1
+%patch10 -p1
+%{?with_dshowserver:%patch20 -p1}
+#%patch30 -p1
 
 rm -rf database/old # not supported in PLD
 
@@ -290,7 +361,45 @@ xargs grep -l /lib . | xargs sed -i -e '
 exit 1
 %endif
 
+# Assigning null to QMAKE_LIBDIR_QT will prevent makefiles contain
+# -L$(QTDIR)/%{_lib} and -Wl,-rpath,$(QTDIR)/%{_lib}. And that will
+# prevent compiler finding libs from system when they should be looked
+# from current buildtree.
+# but that made it link with -lqt which doesn't exist, instead of -lqt-mt
+# so we make QMAKE wrapper which will do sed subst after calling
+# qmake. this is the wrapper.
+cat > qmake-wrapper.sh <<'EOF'
+#!/bin/sh
+getmakefile() {
+	while [ $# -gt 0 ]; do
+		case "$1" in
+		-o)
+			shift
+			makefile="$1"
+			return
+			;;
+	esac
+		shift
+	done
+}
+
+qmake-qt4 "$@"
+getmakefile "$@"
+if [ "$makefile" ]; then
+	%{__sed} -i -e '
+		s;-Wl,-rpath,$(QTDIR)/%{_lib};;
+		s;-L$(QTDIR)/%{_lib};;
+	' $makefile
+fi
+EOF
+chmod +x qmake-wrapper.sh
+
+# move perl bindings to vendor prefix
+sed -i -e 's#perl Makefile.PL#%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"#' \
+  bindings/perl/Makefile
+
 %build
+
 %if %{with cpu_autodetect}
 # Make sure we have /proc mounted
 if [ ! -r /proc/cpuinfo ]; then
@@ -298,22 +407,12 @@ if [ ! -r /proc/cpuinfo ]; then
 	exit 1
 fi
 %endif
-export QTDIR="%{_prefix}"
-
-%if "%{_lib}" != "lib"
-export QMAKE_LIBDIR_X11=%{_prefix}/X11R6/%{_lib}
-# help configure::has_library() to locate libs
-export LD_LIBRARY_PATH=%{_libdir}
-%endif
 
-# NB: not autoconf configure
-export CC="%{__cc}"
-export CXX="%{__cxx}"
 ./configure \
  	--prefix=%{_prefix} \
 	--libdir=%{_libdir} \
+	--libdir-name=%{_lib} \
 	--mandir=%{_mandir} \
-	--disable-opts \
 	--disable-distcc --disable-ccache \
 	--compile-type=%{?debug:debug}%{!?debug:release} \
 	--extra-cflags="%{rpmcflags} -fomit-frame-pointer" \
@@ -325,55 +424,61 @@ export CXX="%{__cxx}"
 		%ifarch athlon
 			--arch=athlon \
 		%else
-			--cpu=i386 --tune=pentium4 \
+			--cpu=%{_target_cpu} --tune=pentium4 \
 		%endif
 	%endif
+	%ifarch i386 i486 i586
+	--enable-disable-mmx-for-debugging \
+	%endif
 	%ifarch %{x8664}
 	--arch=x86_64 \
 	%endif
 	%{?with_mmx:--enable-mmx} \
 %endif
-	%{?with_dvb:--enable-dvb --dvb-path=%{_includedir} --enable-dvb-eit} \
-	--%{?with_arts:en}%{!?with_arts:dis}able-audio-arts \
+	%{?with_dvb:--enable-dvb --dvb-path=%{_includedir}} \
 	--%{?with_alsa:en}%{!?with_alsa:dis}able-audio-alsa \
 	--%{?with_oss:en}%{!?with_oss:dis}able-audio-oss \
 	--%{?with_jack:en}%{!?with_jack:dis}able-audio-jack \
-	--enable-dvd \
 	--%{?with_opengl:en}%{!?with_opengl:dis}able-opengl-vsync \
 	--%{?with_lirc:en}%{!?with_lirc:dis}able-lirc \
 	--%{?with_firewire:en}%{!?with_firewire:dis}able-firewire \
 	--%{?with_xrandr:en}%{!?with_xrandr:dis}able-xrandr \
 	--%{?with_xvmc:en}%{!?with_xvmc:dis}able-xvmc \
+	--%{?with_ivtv:en}%{!?with_ivtv:dis}able-ivtv \
+	--%{?with_iptv:en}%{!?with_iptv:dis}able-iptv \
+	--%{?with_nellymoserdec:en}%{!?with_nellymoserdec:dis}able-decoder=nellymoser \
+	--%{?with_vaapi:en}%{!?with_vaapi:dis}able-vaapi \
+	--%{?with_vdpau:en}%{!?with_vdpau:dis}able-vdpau \
+	--%{?with_directfb:en}%{!?with_directfb:dis}able-directfb \
+	--%{?with_fftw3:en}%{!?with_fftw3:dis}able-libfftw3 \
 	--enable-xv \
 	--enable-x11 \
 
-#	--%{?with_oggvorbis:en}%{!?with_oggvorbis:dis}able-vorbis \
-#	--disable-joystick-menu \
-#	--disable-ivtv \
-#	--enable-directfb	enable DirectFB (Linux non-X11 video)
-#	--enable-directx	enable DirectX  (Microsoft video)
-
-qmake mythtv.pro
+#%{_libdir}/qt4/bin/qmake mythtv.pro
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/{logrotate.d,sysconfig} \
 		$RPM_BUILD_ROOT{/etc/rc.d/init.d,%{_desktopdir}} \
-		$RPM_BUILD_ROOT/var/{cache,lib,log,run}/mythtv \
-		$RPM_BUILD_ROOT%{_libdir}/mythtv/plugins
+		$RPM_BUILD_ROOT/var/{cache,log,run}/mythtv \
+		$RPM_BUILD_ROOT/var/lib/mythtv/tmp \
+		$RPM_BUILD_ROOT%{_libdir}/mythtv \
+		$RPM_BUILD_ROOT%{_libdir}/mythtv/plugins \
+		$RPM_BUILD_ROOT%{_pixmapsdir}
 
-export QTDIR="%{_prefix}"
 %{__make} install \
 	INSTALL_ROOT=$RPM_BUILD_ROOT
 
 # Install the files that we added on top of mythtv's own stuff
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/mythbackend
-install %{SOURCE3} $RPM_BUILD_ROOT/etc/logrotate.d/mythbackend
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/sysconfig/mythbackend
+install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/mythbackend
+cp -p %{SOURCE3} $RPM_BUILD_ROOT/etc/logrotate.d/mythbackend
+cp -p %{SOURCE1} $RPM_BUILD_ROOT/etc/sysconfig/mythbackend
+%{?with_dshowserver:cp -p %{SOURCE20} $RPM_BUILD_ROOT%{_datadir}/mythtv}
 
 # desktop entries
 install %{SOURCE5} $RPM_BUILD_ROOT%{_desktopdir}
+install %{SOURCE6} $RPM_BUILD_ROOT%{_pixmapsdir}
 
 # Install settings.pro so people can see the build options we used
 install -d $RPM_BUILD_ROOT%{_datadir}/mythtv/build
@@ -438,7 +543,7 @@ fi
 %files
 %defattr(644,root,root,755)
 %doc README* UPGRADING AUTHORS FAQ
-%doc docs contrib configfiles
+%doc docs contrib config
 %doc keys.txt mythtvosd mythwelcome mythlcdserver
 
 %files backend
@@ -449,7 +554,9 @@ fi
 %attr(755,root,root) %{_sbindir}/mythjobqueue
 %attr(755,root,root) %{_sbindir}/mythlcdserver
 %attr(755,root,root) %{_bindir}/mythtranscode
+%attr(755,root,root) %{_bindir}/mythreplex
 %attr(775,root,mythtv) %dir /var/lib/mythtv
+%attr(700,root,mythtv) %dir /var/lib/mythtv/tmp
 %attr(775,root,mythtv) %dir /var/cache/mythtv
 %attr(775,root,mythtv) %dir /var/run/mythtv
 %attr(754,root,root) /etc/rc.d/init.d/mythbackend
@@ -461,18 +568,23 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/mythfrontend
 %attr(755,root,root) %{_bindir}/mythshutdown
-%attr(755,root,root) %{_bindir}/mythtv
+%attr(755,root,root) %{_bindir}/mythavtest
 %attr(755,root,root) %{_bindir}/mythtvosd
 %attr(755,root,root) %{_bindir}/mythwelcome
 %dir %{_datadir}/mythtv
+%dir %{_datadir}/mythtv/themes
 %dir %{_libdir}/mythtv
 %{_datadir}/mythtv/*.xml
 %dir %{_libdir}/mythtv/filters
 %dir %{_libdir}/mythtv/plugins
 %attr(755,root,root) %{_libdir}/mythtv/filters/*.so
-%{_datadir}/mythtv/*.ttf
+%{_datadir}/mythtv/fonts/*.ttf
 %dir %{_datadir}/mythtv/i18n
+%if %{with dshowserver}
+%{_datadir}/mythtv/dshowcodecs
+%endif
 %{_desktopdir}/*.desktop
+%{_pixmapsdir}/*.png
 
 %files setup
 %defattr(644,root,root,755)
@@ -481,11 +593,13 @@ fi
 
 %files themes
 %defattr(644,root,root,755)
-%{_datadir}/mythtv/themes
+%{_datadir}/mythtv/themes/*
 
 %files -n libmyth
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so.*.*.*
+%attr(755,root,root) %{_libdir}/lib*.so*
+%attr(755,root,root) %{_libdir}/lib*.a
+%{_datadir}/mythtv/*.pl
 
 %files -n libmyth-devel
 %defattr(644,root,root,755)
@@ -495,4 +609,23 @@ fi
 
 %files -n libmyth-static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+
+%if %{with perl}
+%files -n perl-MythTV
+%defattr(644,root,root,755)
+%{perl_vendorlib}/MythTV.pm
+%dir %{perl_vendorlib}/MythTV
+%{perl_vendorlib}/MythTV/*.pm
+%dir %{perl_vendorlib}/IO/Socket/INET
+%{perl_vendorlib}/IO/Socket/INET/MythTV.pm
+%exclude %{perl_vendorarch}/auto/MythTV/.packlist
+%endif
+
+%if %{with python}
+%files -n python-MythTV
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/mythpython
+%dir %{py_sitescriptdir}/MythTV
+%{py_sitescriptdir}/MythTV/*
+%{py_sitescriptdir}/*.egg-info
+%endif