MythTV 0.22. + MythTV plugins 0.22

WK w.kier at farba.eu.org
Mon Feb 16 21:18:08 CET 2009


No to tyle by było.
Jeżeli Państo są zainteresownia, proszę o potwierdzenie.
Wystawię src.rpm.
-- 
WK
-------------- next part --------------
--- mythtv.spec	2009-02-16 20:54:32.000000000 +0100
+++ mythtv_svn.spec	2009-02-16 21:01:08.000000000 +0100
@@ -1,4 +1,4 @@
-# $Revision: 1.75 $, $Date: 2008/10/14 09:55:33 $
+# $Revision: 1.69 $, $Date: 2008/10/13 10:22:00 $
 # TODO
 # - bconds: altivec joystick lcd
 # - lcd? (app-misc/lcdproc)
@@ -16,15 +16,22 @@
 %bcond_without	lirc		# lirc support
 %bcond_without	alsa		# alsa support
 %bcond_without	oss		# oss support
-%bcond_without	arts		# arts support
+%bcond_with	arts		# arts support
 %bcond_without	jack		# jack audio connection kit
 %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_without	ivtv		# ivtv support (PVR-250, PVR-350) NFY
+%bcond_without	iptv
 %bcond_with	firewire	# ieee1394 (NFY)
 %bcond_without	xvmc		# do not use XvMCW
 %bcond_with	mmx		# enable MMX
+%bcond_with     dshowserver	# enable directshow codecs server
+%bcond_without nellymoserdec    # disable nellymoser flash audio decoder 
+				# with some ffmpeg versions nellymorsedecoder 
+				# causes build errors
+%bcond_with 	directfb
+#%{!?without_dshowserver: %with_ivtv}
 
 # enable mmx automatically on arches having it
 %ifarch %{ix86} %{x8664}
@@ -33,33 +40,40 @@
 %endif
 %endif
 
+%define _snap 20090211
+#%define _rev 18770
+%define _rel 0.1
 Summary:	A personal video recorder (PVR) application
 Summary(pl.UTF-8):	Osobista aplikacja do nagrywania obrazu (PVR)
 Name:		mythtv
-Version:	0.21
-Release:	6
+Version:	0.22
+Release:	%{?_snap:%{_snap}.}%{_rel}
 License:	GPL v2
 Group:		Applications/Multimedia
-Source0:	http://www.mythtv.org/mc/%{name}-%{version}.tar.bz2
+Source0:	%{name}-%{version}-%{?_snap:%{_snap}}.tar.bz2
 # Source0-md5:	49fc135e1cde90cd935c1229467fa37e
+#Source0:	%{name}-%{version}-fix.tar.bz2
+#Source0:	%{name}-%{_snap}.%{_rev}.tar.bz2
 Source1:	mythbackend.sysconfig
 Source2:	mythbackend.init
 Source3:	mythbackend.logrotate
 Source5:	mythfrontend.desktop
+Source6:        mythfrontend.png
+%{?with_dshowserver:Source20: dshowcodecs}
 #Patch100:		%{name}-branch.diff
-Patch0:		%{name}-lib64.patch
-Patch1:		%{name}-configure.patch
-Patch2:		%{name}-mythstream.patch
-Patch3:		%{name}-ldconfig.patch
+#Patch0:		%{name}-lib64.patch
+Patch1:			%{name}-configure.patch
+#Patch2:		%{name}-mythstream.patch
+#Patch3:		%{name}-ldconfig.patch
 #Patch4:		%{name}-pl.patch
-Patch5:		%{name}-sbinpath.patch
-Patch6:		%{name}-dvdnav-shared.patch
-Patch7:		%{name}-libs.patch
-Patch8:		%{name}-fixes.patch
-Patch9:		%{name}-ffmpeg-API.patch
+Patch5:			%{name}-sbinpath.patch
+#Patch7:		%{name}-optflags.patch
+#Patch8:		mythtv-dvdnav-shared.patch
+#Patch9:		%{name}-libs.patch
+%{?with_dshowserver:Patch20: %{name}-trunk-dshowserver.patch}
 URL:		http://www.mythtv.org/
-BuildRequires:	OpenGL-devel
-BuildRequires:	OpenGL-GLU-devel
+BuildRequires: OpenGL-devel
+BuildRequires: OpenGL-GLU-devel
 %{?with_alsa:BuildRequires:	alsa-lib-devel}
 %{?with_arts:BuildRequires:	arts-devel >= 13:0.9.5}
 BuildRequires:	ffmpeg-devel
@@ -75,14 +89,31 @@
 BuildRequires:	linux-libc-headers >= 7:2.6.10
 %{?with_lirc:BuildRequires:	lirc-devel}
 BuildRequires:	mysql-devel
-BuildRequires:	qmake >= 6:3.2.1-4
-BuildRequires:	qt-devel >= 6:3.2.1-4
+#BuildRequires:	patchutils
+BuildRequires:	qt4-qmake
+BuildRequires:	python-devel
+BuildRequires:  rpm-pythonprov
+BuildRequires:	perl-devel
+BuildRequires:	perl-tools-pod
+BuildRequires:	Qt3Support-devel
+BuildRequires:	QtOpenGL-devel
+BuildRequires:	QtXml-devel
+BuildRequires:	qt4-build
+BuildRequires:	QtNetwork-devel
+BuildRequires:	QtGui-devel
+BuildRequires:	QtSql-devel
+BuildRequires:	QtCore-devel
+BuildRequires:  QtWebKit-devel
 BuildRequires:	rpmbuild(macros) >= 1.228
 BuildRequires:	sed >= 4.0
 # for bundled libavcodec
 BuildRequires:	libdts-devel
 BuildRequires:	xorg-lib-libXext-devel
 BuildRequires:	xorg-lib-libXxf86vm-devel
+BuildRequires:	Mesa-libGLU-devel
+# for Perl bindings
+BuildRequires:	perl-ExtUtils-MakeMaker
+
 ExclusiveArch:	%{ix86} %{x8664} ppc
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -227,8 +258,7 @@
 Group:		Libraries
 Requires:	freetype >= 1:2.0.0
 Requires:	lame
-Requires:	qt >= 6:3.2.1-4
-Requires:	qt-plugin-mysql >= 6:3.2.1-4
+Requires:	QtSql-mysql
 
 %description -n libmyth
 Common library code for MythTV and add-on modules (development) MythTV
@@ -266,21 +296,37 @@
 %description -n libmyth-static -l pl.UTF-8
 Statyczna biblioteka libmyth.
 
+%package -n perl-MythTV
+Summary: MythTV Perl bindings
+Group: System Environment/Libraries
+
+%description -n perl-MythTV
+MythTV Perl bindings.
+
+%package -n python-MythTV
+Summary: MythTV Python bindings
+Group: System Environment/Libraries
+Requires: MySQL-python
+
+%description -n python-MythTV
+MythTV Python bindings.
+
 %prep
-%setup -q %{?_rev:-n %{name}}
-%if %{_lib} != "lib"
+
+%setup -q %{SOURCE0}
+
+
 #%patch0 -p1
-%endif
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
+%patch1 -p0
+#%patch2 -p1
+#%patch3 -p1
 #%patch4 -p1 REDIFF and submit
 %patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
 
+#%patch7 -p1
+#%patch8 -p1
+#%patch9 -p1
+%{?with_dshowserver:%patch20 -p1}
 rm -rf database/old # not supported in PLD
 
 # lib64 fix - enable to update patch
@@ -311,12 +357,12 @@
 			makefile="$1"
 			return
 			;;
-		esac
+	esac
 		shift
 	done
 }
 
-qmake "$@"
+qmake-qt4 "$@"
 getmakefile "$@"
 if [ "$makefile" ]; then
 	%{__sed} -i -e '
@@ -328,6 +374,10 @@
 chmod +x qmake-wrapper.sh
 
 %build
+# move perl bindings to vendor prefix
+sed -i -e 's#perl Makefile.PL#%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"#' \
+   bindings/perl/perl.pro
+
 %if %{with cpu_autodetect}
 # Make sure we have /proc mounted
 if [ ! -r /proc/cpuinfo ]; then
@@ -336,14 +386,10 @@
 fi
 %endif
 
-# NB: not autoconf configure
-# help configure::has_library() to locate libs
-LD_LIBRARY_PATH=%{_libdir} \
-CC="%{__cc}" \
-CXX="%{__cxx}" \
 ./configure \
  	--prefix=%{_prefix} \
 	--libdir=%{_libdir} \
+	--libdir-name=`basename %{_libdir}` \
 	--mandir=%{_mandir} \
 	--disable-distcc --disable-ccache \
 	--compile-type=%{?debug:debug}%{!?debug:release} \
@@ -374,35 +420,46 @@
 	--%{?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_directfb:en}%{!?with_directfb:dis}able-directfb \
 	--enable-xv \
 	--enable-x11 \
 
-qmake mythtv.pro \
-	QTDIR="%{_prefix}" \
-	QMAKE_LIBDIR_X11=%{?_x_libraries}%{!?_x_libraries:%{_libdir}}
-
-%{__make} \
-	QTDIR="%{_prefix}" \
-	QMAKE=$(pwd)/qmake-wrapper.sh
+%{_libdir}/qt4/bin/qmake mythtv.pro
+#sed -i -e 's/usr\/\/usr/usr/g' config.ep
+
+
+%{__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%{_libdir}/mythtv \
+		$RPM_BUILD_ROOT%{_libdir}/mythtv/plugins \
+		$RPM_BUILD_ROOT%{_pixmapsdir}
 
-export QTDIR="%{_prefix}"
 %{__make} install \
 	INSTALL_ROOT=$RPM_BUILD_ROOT
 
+# required to build some plugins
+#	install libs/libavcodec/*.h $RPM_BUILD_ROOT%{_includedir}/mythtv \
+#		libs/libavformat/*.h $RPM_BUILD_ROOT%{_includedir}/mythtv \
+#		libs/libavutil/*.h $RPM_BUILD_ROOT%{_includedir}/mythtv
+
 # 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
+%{?with_dshowserver:install %{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
@@ -467,18 +524,18 @@
 %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
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/mythfilldatabase
-%attr(755,root,root) %{_bindir}/mythtranscode
-%attr(755,root,root) %{_bindir}/mythreplex
 %attr(755,root,root) %{_sbindir}/mythbackend
 %attr(755,root,root) %{_sbindir}/mythcommflag
+%attr(755,root,root) %{_bindir}/mythfilldatabase
 %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(775,root,mythtv) %dir /var/cache/mythtv
 %attr(775,root,mythtv) %dir /var/run/mythtv
@@ -503,7 +560,11 @@
 %attr(755,root,root) %{_libdir}/mythtv/filters/*.so
 %{_datadir}/mythtv/*.ttf
 %dir %{_datadir}/mythtv/i18n
+%if %{with dshowserver}
+%attr(644,root,root) %{_datadir}/mythtv/dshowcodecs
+%endif
 %{_desktopdir}/*.desktop
+%{_pixmapsdir}/*.png
 
 %files setup
 %defattr(644,root,root,755)
@@ -516,7 +577,9 @@
 
 %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
+%attr(644,root,root) %{_datadir}/mythtv/*.pl
 
 %files -n libmyth-devel
 %defattr(644,root,root,755)
@@ -527,46 +590,39 @@
 %files -n libmyth-static
 %defattr(644,root,root,755)
 
+%files -n perl-MythTV
+%defattr(644,root,root,755)
+%attr(644,root,root) %{perl_vendorlib}/MythTV.pm
+%attr(755,root,root) %dir %{perl_vendorlib}/MythTV
+%attr(644,root,root) %{perl_vendorlib}/MythTV/*.pm
+%attr(644,root,root) %{perl_vendorlib}/IO/Socket/INET/MythTV.pm
+%exclude %{perl_vendorarch}/auto/MythTV/.packlist
+
+%files -n python-MythTV
+%defattr(644,root,root,755)
+%attr(755,root,root) %dir %{python_sitelib}/MythTV/
+%attr(644,root,root) %{python_sitelib}/MythTV/*
+
 %define	date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
-------------- next part --------------
--- mythplugins.spec	2009-02-16 20:54:10.000000000 +0100
+++ mythplugins_svn.spec	2009-02-16 19:27:22.000000000 +0100
@@ -4,22 +4,23 @@
 %bcond_without	binary		# skip building binary plugins (build only mythweb)
 %bcond_without	mytharchive	# disable mytharchive plugin
 %bcond_without	mythbrowser	# disable building mythbrowser plugin
-%bcond_without	mythcontrols	# disable mythcontrols plugin
-%bcond_without	mythdvd		# disable building mythgallery plugin
+%bcond_without	mythmovies	# disable mythmovies plugin
+%bcond_without	mythdvd		# mythvideo part
 %bcond_without	mythflix	# disable building mythflix plugin
 %bcond_without	mythgallery	# disable building mythgallery plugin
 %bcond_without	mythgame	# disable building mythgallery plugin
 %bcond_without	mythmusic	# disable building mythmusic plugin
 %bcond_without	mythnews	# disable building mythgallery plugin
-%bcond_without	mythphone	# disable building mythgallery plugin
+%bcond_with	mythphone	# discontnued ??
 %bcond_without	mythvideo	# disable building mythgallery plugin
 %bcond_without	mythweather	# disable building mythgallery plugin
 %bcond_without	mythweb		# disable building mythgallery plugin
-#
+%bcond_without  mythzoneminder  # disable building mythzoneminder plugin
+
 %if !%{with binary}
 %undefine	with_mytharchive
 %undefine	with_mythbrowser
-%undefine	with_mythcontrols
+%undefine	with_mythmovies
 %undefine	with_mythdvd
 %undefine	with_mythflix
 %undefine	with_mythgallery
@@ -33,23 +34,23 @@
 
 %include	/usr/lib/rpm/macros.perl
 
-#define _snap 20060905
+%define _snap 20090211
 #define _rev 11046
 %define _rel 0.1
 Summary:	Main MythTV plugins
 Summary(pl.UTF-8):	Główne wtyczki MythTV
 Name:		mythplugins
-Version:	0.20.2
-Release:	%{?_snap:0.%{_snap}.%{_rev}.}%{_rel}
+Version:	0.22
+Release:	%{?_snap:%{_snap}.}%{_rel}
 License:	GPL v2
 Group:		Applications/Multimedia
-Source0:	http://www.mythtv.org/mc/%{name}-%{version}.tar.bz2
-# Source0-md5:	53fcf62c3d2bac31cde610621a08ef33
-#Source0:	%{name}-%{_snap}.%{_rev}.tar.bz2
+Source0:	%{name}-%{version}-%{_snap}.tar.bz2
+# Source0-md5:	6c08043227bef1384858deee12b5cdc3
 Source1:	mythweb.conf
-Patch0:		%{name}-lib64.patch
-Patch1:		%{name}-paths.patch
+#Patch0:		%{name}-lib64.patch
+#Patch1:		%{name}-paths.patch
 Patch2:		mythweb-config.patch
+Patch20:	mytharchive-INT64.patch
 Patch100:	mythtv-branch.diff
 URL:		http://www.mythtv.org/
 %if %{with binary}
@@ -57,14 +58,24 @@
 BuildRequires:	OpenGL-devel
 %endif
 BuildRequires:	SDL-devel
-BuildRequires:	XFree86-devel
+BuildRequires:  xorg-lib-libX11-devel	
 BuildRequires:	a52dec-libs-devel
 BuildRequires:	cdparanoia-III-devel
 BuildRequires:	faad2-devel >= 2.0-5.2
 %{?with_mythmusic:BuildRequires:	fftw-devel >= 2.1.3}
+%{?with_mythmusic:BuildRequires:        taglib-devel}
 BuildRequires:	flac-devel >= 1.0.4
 BuildRequires:	freetype-devel
-BuildRequires:	kdelibs-devel
+BuildRequires:  qt4-qmake
+BuildRequires:  Qt3Support-devel
+BuildRequires:  QtOpenGL-devel
+BuildRequires:  QtXml-devel
+BuildRequires:  qt4-build
+BuildRequires:  QtNetwork-devel
+BuildRequires:  QtGui-devel
+BuildRequires:  QtSql-devel
+BuildRequires:  QtCore-devel
+BuildRequires:  QtWebKit-devel
 BuildRequires:	libcdaudio-devel >= 0.99.12p2
 BuildRequires:	libdvdcss-devel >= 1.2.7
 BuildRequires:	libdvdread-devel >= 0.9.4
@@ -117,6 +128,11 @@
 Summary(pl.UTF-8):	Moduł MythTV do tworzenia i wypalania DVD
 Group:		Applications/Multimedia
 Requires:	mythtv-frontend-api = %{myth_api_version}
+Requires:	python-PIL
+Requires:	python-MySQLdb
+Requires:	mjpegtools
+Requires:	dvdauthor
+Suggests:	dvdrtools-mkisofs
 
 %description -n mytharchive
 MythArchive is a MythTV style plugin that uses the Mythburn Script to
@@ -153,7 +169,7 @@
 Requires:	mythtv-frontend-api = %{myth_api_version}
 
 %description -n mythvideo
-A generic video player frontend module for MythTV.
+A generic video and dvd player frontend module for MythTV.
 
 %description -n mythvideo -l pl.UTF-8
 Moduł ogólnego interfejsu do odtwarzania obrazu dla MythTV.
@@ -195,27 +211,28 @@
 Interfejs do gier (xmame, nes, snes, pc) dla MythTV.
 
 %package -n mythdvd
-Summary:	A DVD player module for MythTV
-Summary(pl.UTF-8):	Moduł odtwarzacza DVD dla MythTV
+Summary:	A DVD ripper module for MythTV
+Summary(pl.UTF-8):	ModuĹ‚ rippujÄ
cy DVD dla MythTV
 Group:		Applications/Multimedia
 Requires:	mythtv-frontend-api = %{myth_api_version}
 Requires:	transcode >= 0.6.8
+Requires:	mythvideo
 
 %description -n mythdvd
-MythDVD is a MythTV module that allows you to play DVDs on a myth-box
-and (optionally) rip DVD's and transcode their video and audio content
-to other (generally smaller) formats. The playing features are simply
-myth-style wrappers for your favourite DVD playing software (mplayer,
-ogle, xine, etc). The transcoding is based on and derived from the
-excellent transcode package.
+MythDVD is a MythTV module that allows you to rip DVD's and transcode 
+their video and audio content to other (generally smaller) formats. 
+The playing features are simply myth-style wrappers for your 
+favourite DVD playing software (mplayer, ogle, xine, etc). 
+The transcoding is based on and derived from the excellent transcode 
+package.
 
 %description -n mythdvd -l pl.UTF-8
-MythDVD to moduĹ‚ MythTV umoĹźliwiajÄ
cy odtwarzanie płyt DVD w MythTV i
-(opcjonalnie) rippowanie ich oraz przekodowywanie obrazu i dźwięku do
-innych (zwykle mniej zajmujÄ
cych) formatów. Moşliwości odtwarzania to
-po prostu obudowanie w stylu myth dla ulubionego oprogramowania do
-odtwarzania DVD (mplayer, ogle, xine itp.). Przekodowywanie jest
-oparte i wywodzi się z wspaniałego pakietu transcode.
+MythDVD to moduĹ‚ MythTV umoĹźliwiajÄ
cy rippowanie DVD oraz 
+przekodowywanie obrazu i dĹşwiÄ™ku do innych (zwykle mniej zajmujÄ
cych) 
+formatów. Moşliwości odtwarzania to po prostu obudowanie w stylu myth 
+dla ulubionego oprogramowania do odtwarzania DVD (mplayer, ogle, xine 
+itp.). Przekodowywanie jest oparte i wywodzi się ze wspaniałego 
+pakietu transcode.
 
 %package -n mythnews
 Summary:	A RSS News Feed plugin for MythTV
@@ -309,37 +326,51 @@
 jeszcze zbyt dojrzała, co znaczy, şe coś moşe nie działać lub psuć coś
 innego.
 
-%package -n mythcontrols
-Summary:	MythTV keybindings editor
-Summary(pl.UTF-8):	Edytor przypisań klawiszy MythTV
+%package -n mythmovies
+Summary:	MythTV cinemas timetable
+Summary(pl.UTF-8):	Moduł MythTV do repertuaru kinowego
 Group:		Applications/Multimedia
 Requires:	mythtv-frontend-api = %{myth_api_version}
 
-%description -n mythcontrols
-This plugin allows you to configure your keybindings on the frontend
-without having to use mythweb or edit tables by hand.
+%description -n mythmovies
+MythTV cinemas timetable.
+
+
+%description -n mythmovies -l pl.UTF-8
+Moduł MythTV do repertuaru kinowego.
+
+%package -n mythzoneminder
+Summary:        MythTV security TV manager
+Summary(pl.UTF-8):      Obsługa kamer przemysłowych dla MythTV
+Group:          Applications/Multimedia
+Requires:       mythtv-frontend-api = %{myth_api_version}
+
+%description -n mythzoneminder
+MythTV security TV manager.
 
-%description -n mythcontrols -l pl.UTF-8
-Ta wtyczka pozwala konfigurować przypisania klawiszy we frontendzie
-bez konieczności uşywania mythweba ani ręcznego modyfikowania tabel.
+
+%description -n mythzoneminder -l pl.UTF-8
+Obsługa kamer przemysłowych dla MythTV.
 
 %prep
-%setup -q %{?_snap:-n %{name}}
-%if %{_lib} != "lib"
+#%setup -q %{?_snap:-n %{name}}
+%setup -q %{SOURCE0}
+#%if %{_lib} != "lib"
 #%patch0 -p1
-%endif
-%patch1 -p1
-%patch2 -p1
+#%endif
+#%patch1 -p1
+#%patch2 -p1
+%patch20 -p1
 #filterdiff -i 'mythplugins/*' %{PATCH100} | %{__patch} -p1 -s
 
 # make it visible
-mv mythweb/{.,}htaccess
+#mv mythweb/data/{.,}htaccess
 
 # lib64 fix - enable to update patch
 %if %{_lib} != "lib" && 0
 find '(' -name '*.[ch]' -o -name '*.cpp' -o -name '*.pro' ')' | \
 xargs grep -l /lib/ . | xargs sed -i -e '
-	s,/usr/lib/,/usr/%{_lib}/,g
+	s,/usr/lib/,/%{_lib}/,g
 	s,{PREFIX}/lib,{PREFIX}/%{_lib},g
 '
 exit 1
@@ -350,7 +381,7 @@
 export QTDIR="%{_prefix}"
 # Not gnu configure
 %configure \
-	--libdir-name=%{_lib} \
+	--libdir-name=`basename %{_lib}` \
 	--enable-all \
 	%{!?with_mytharchive:--disable-mytharchive} \
 	%{!?with_mythbrowser:--disable-mythbrowser} \
@@ -363,7 +394,7 @@
 	%{!?with_mythvideo:--disable-mythvideo} \
 	%{!?with_mythweather:--disable-mythweather} \
 	%{!?with_mythweb:--disable-mythweb} \
-	%{!?with_mythcontrols:--disable-mythcontrols} \
+	%{!?with_mythmovies:--disable-mythmovies} \
 	%{!?with_mythflix:--disable-mythflix} \
 
 mv mythconfig.mak mythconfig.mak.old
@@ -387,7 +418,7 @@
 %{__make} install \
 	INSTALL_ROOT=$RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT/var/lib/{mythmusic,mythvideo,pictures}
+install -d $RPM_BUILD_ROOT/var/lib/{mythmusic,mythbrowser,mythvideo,pictures}
 %if %{with mythgame}
 install -d $RPM_BUILD_ROOT%{_datadir}/mythtv/games/nes/{roms,screens}
 install -d $RPM_BUILD_ROOT%{_datadir}/mythtv/games/snes/{roms,screens}
@@ -411,7 +442,7 @@
 
 mv $RPM_BUILD_ROOT%{_datadir}/mythtv/i18n/mythbrowser_{pt_br,pt}.qm
 rm $RPM_BUILD_ROOT%{_datadir}/mythtv/i18n/mythflix_nb.ts # i18n source
-for p in mytharchive mythbrowser mythcontrols mythdvd mythflix mythgallery mythgame mythmusic mythnews mythphone mythvideo mythweather; do
+for p in mytharchive mythbrowser mythmovies mythdvd mythflix mythgallery mythgame mythmusic mythnews mythphone mythvideo mythweather mythzoneminder; do
 	for l in $RPM_BUILD_ROOT%{_datadir}/mythtv/i18n/${p}_*.qm; do
 		echo $l | sed -e "s,^$RPM_BUILD_ROOT\(.*${p}_\(.*\).qm\),%%lang(\2) \1,"
 	done > $p.lang
@@ -474,13 +505,15 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/mytharchivehelper
 %attr(755,root,root) %{_libdir}/mythtv/plugins/libmytharchive.so
-%{_datadir}/mythtv/archiveformat.xml
 %{_datadir}/mythtv/archivemenu.xml
-%{_datadir}/mythtv/archiveselect.xml
+%{_datadir}/mythtv/archiveutils.xml
 %{_datadir}/mythtv/themes/default/ma_*.png
 %{_datadir}/mythtv/themes/default/mytharchive-ui.xml
 %{_datadir}/mythtv/themes/default/mythburn-ui.xml
 %{_datadir}/mythtv/themes/default/mythnative-ui.xml
+%{_datadir}/mythtv/themes/default-wide/mytharchive-ui.xml
+%{_datadir}/mythtv/themes/default-wide/mythburn-ui.xml
+%{_datadir}/mythtv/themes/default-wide/mythnative-ui.xml
 %{_datadir}/mythtv/mytharchive
 %endif
 
@@ -493,28 +526,12 @@
 %{_datadir}/mythtv/musicmenu.xml
 %{_datadir}/mythtv/music_settings.xml
 %{_datadir}/mythtv/themes/default/music-ui.xml
+%{_datadir}/mythtv/themes/default-wide/music-ui.xml
 %{_datadir}/mythtv/themes/default/ff_button_off.png
 %{_datadir}/mythtv/themes/default/ff_button_on.png
 %{_datadir}/mythtv/themes/default/ff_button_pushed.png
-%{_datadir}/mythtv/themes/default/mm_blackhole_border.png
-%{_datadir}/mythtv/themes/default/mm_blankbutton_off.png
-%{_datadir}/mythtv/themes/default/mm_blankbutton_on.png
-%{_datadir}/mythtv/themes/default/mm_blankbutton_pushed.png
-%{_datadir}/mythtv/themes/default/mm_checked.png
-%{_datadir}/mythtv/themes/default/mm_checked_high.png
-%{_datadir}/mythtv/themes/default/mm_down_arrow.png
-%{_datadir}/mythtv/themes/default/mm_left_arrow.png
-%{_datadir}/mythtv/themes/default/mm_leftright_off.png
-%{_datadir}/mythtv/themes/default/mm_leftright_on.png
-%{_datadir}/mythtv/themes/default/mm_leftright_pushed.png
-%{_datadir}/mythtv/themes/default/mm_rating.png
-%{_datadir}/mythtv/themes/default/mm_right_arrow.png
-%{_datadir}/mythtv/themes/default/mm_unchecked.png
-%{_datadir}/mythtv/themes/default/mm_unchecked_high.png
-%{_datadir}/mythtv/themes/default/mm_up_arrow.png
-%{_datadir}/mythtv/themes/default/mm_volume_background.png
-%{_datadir}/mythtv/themes/default/mm_volume_tick.png
-%{_datadir}/mythtv/themes/default/mm_waiting.png
+%{_datadir}/mythtv/themes/default/miniplayer_background.png
+%{_datadir}/mythtv/themes/default/mm_*.png
 %{_datadir}/mythtv/themes/default/music-sel-bg.png
 %{_datadir}/mythtv/themes/default/next_button_off.png
 %{_datadir}/mythtv/themes/default/next_button_on.png
@@ -535,10 +552,9 @@
 %{_datadir}/mythtv/themes/default/stop_button_off.png
 %{_datadir}/mythtv/themes/default/stop_button_on.png
 %{_datadir}/mythtv/themes/default/stop_button_pushed.png
-%{_datadir}/mythtv/themes/default/text_button_off.png
-%{_datadir}/mythtv/themes/default/text_button_on.png
-%{_datadir}/mythtv/themes/default/text_button_pushed.png
 %{_datadir}/mythtv/themes/default/track_info_background.png
+%{_datadir}/mythtv/themes/default-wide/mm_*.png
+%{_datadir}/mythtv/themes/default-wide/music-sel-bg.png
 %endif
 
 %if %{with mythvideo}
@@ -547,16 +563,18 @@
 %doc mythvideo/README mythvideo/videodb
 %attr(755,root,root) %{_libdir}/mythtv/plugins/libmythvideo.so
 %{_datadir}/mythtv/themes/default/video-ui.xml
-%{_datadir}/mythtv/themes/default/mv-*.png
+%{_datadir}/mythtv/themes/default-wide/video-ui.xml
 %{_datadir}/mythtv/themes/default/mv_*.png
+%{_datadir}/mythtv/themes/default-wide/mv_*.png
 %{_datadir}/mythtv/video_settings.xml
 %{_datadir}/mythtv/videomenu.xml
 %dir %{_datadir}/mythtv/mythvideo
 %dir %{_datadir}/mythtv/mythvideo/scripts
 %{_datadir}/mythtv/mythvideo/scripts/README
-%attr(755,root,root) %{_datadir}/mythtv/mythvideo/scripts/imdb.pl
-%attr(755,root,root) %{_datadir}/mythtv/mythvideo/scripts/allocine.pl
-%attr(755,root,root) %{_datadir}/mythtv/mythvideo/scripts/ofdb.pl
+%attr(755,root,root) %{_datadir}/mythtv/mythvideo/scripts/*.pl
+%attr(755,root,root) %{_datadir}/mythtv/mythvideo/scripts/*.py
+%dir %{_datadir}/mythtv/mythvideo/scripts/MythTV
+%attr(644,root,root)%{_datadir}/mythtv/mythvideo/scripts/MythTV/MythVideoCommon.pm
 /var/lib/mythvideo
 %endif
 
@@ -566,7 +584,9 @@
 %doc mythweather/README
 %attr(755,root,root) %{_libdir}/mythtv/plugins/libmythweather.so
 %{_datadir}/mythtv/mythweather
+%{_datadir}/mythtv/weather_settings.xml
 %{_datadir}/mythtv/themes/default/weather-ui.xml
+%{_datadir}/mythtv/themes/default-wide/weather-ui.xml
 %{_datadir}/mythtv/themes/default/cloudy.png
 %{_datadir}/mythtv/themes/default/fair.png
 %{_datadir}/mythtv/themes/default/flurries.png
@@ -574,7 +594,7 @@
 %{_datadir}/mythtv/themes/default/logo.png
 %{_datadir}/mythtv/themes/default/lshowers.png
 %{_datadir}/mythtv/themes/default/mcloudy.png
-%{_datadir}/mythtv/themes/default/mw-*.png
+%{_datadir}/mythtv/themes/default/mw_*.png
 %{_datadir}/mythtv/themes/default/mwmain.png
 %{_datadir}/mythtv/themes/default/pcloudy.png
 %{_datadir}/mythtv/themes/default/rainsnow.png
@@ -583,6 +603,7 @@
 %{_datadir}/mythtv/themes/default/sunny.png
 %{_datadir}/mythtv/themes/default/thunshowers.png
 %{_datadir}/mythtv/themes/default/unknown.png
+%{_datadir}/mythtv/themes/default-wide/mw-*.png
 %endif
 
 %if %{with mythgallery}
@@ -591,6 +612,7 @@
 %doc mythgallery/README
 %attr(755,root,root) %{_libdir}/mythtv/plugins/libmythgallery.so
 %{_datadir}/mythtv/themes/default/gallery-ui.xml
+%{_datadir}/mythtv/themes/default-wide/gallery-ui.xml
 %{_datadir}/mythtv/themes/default/gallery-*.png
 # FIXME: this is definately stupid path
 /var/lib/pictures
@@ -599,22 +621,20 @@
 %if %{with mythgame}
 %files -n mythgame -f mythgame.lang
 %defattr(644,root,root,755)
-%doc mythgame/README
+#%doc mythgame/README
 %attr(755,root,root) %{_libdir}/mythtv/plugins/libmythgame.so
 %{_datadir}/mythtv/games
 %{_datadir}/mythtv/game_settings.xml
 %{_datadir}/mythtv/themes/default/game-ui.xml
+%{_datadir}/mythtv/themes/default-wide/game-ui.xml
 %endif
 
 %if %{with mythdvd}
-%files -n mythdvd -f mythdvd.lang
+%files -n mythdvd
 %defattr(644,root,root,755)
-%doc mythdvd/README mythdvd/AUTHORS
 %attr(755,root,root) %{_bindir}/mtd
-%attr(755,root,root) %{_libdir}/mythtv/plugins/libmythdvd.so
-%{_datadir}/mythtv/dvd_settings.xml
-%{_datadir}/mythtv/dvdmenu.xml
 %{_datadir}/mythtv/themes/default/dvd-ui.xml
+%{_datadir}/mythtv/themes/default-wide/dvd-ui.xml
 %{_datadir}/mythtv/themes/default/md_*.png
 %endif
 
@@ -627,6 +647,10 @@
 %{_datadir}/mythtv/themes/default/news-ui.xml
 # DUPLICATE WITH MYTHFLIX?
 %{_datadir}/mythtv/themes/default/news-info-bg.png
+%{_datadir}/mythtv/themes/default/enclosures.png
+%{_datadir}/mythtv/themes/default/need-download.png
+%{_datadir}/mythtv/themes/default/podcast.png
+%{_datadir}/mythtv/themes/default-wide/news-ui.xml
 %endif
 
 %if %{with mythbrowser}
@@ -635,7 +659,9 @@
 %doc mythbrowser/README mythbrowser/AUTHORS
 %attr(755,root,root) %{_bindir}/mythbrowser
 %attr(755,root,root) %{_libdir}/mythtv/plugins/libmythbookmarkmanager.so
-%{_datadir}/mythtv/themes/default/webpage.png
+%{_datadir}/mythtv/themes/default/mb_progress*.png
+%{_datadir}/mythtv/themes/default/browser-ui.xml
+%{_datadir}/mythtv/themes/default-wide/browser-ui.xml
 %endif
 
 %if %{with mythphone}
@@ -652,7 +678,8 @@
 %if %{with mythweb}
 %files -n mythweb
 %defattr(644,root,root,755)
-%doc mythweb/{README,TODO,htaccess}
+%doc mythweb/README
+#%doc mythweb/data/htaccess
 %dir %attr(750,root,http) %{_webapps}/%{_webapp}
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_webapps}/%{_webapp}/apache.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_webapps}/%{_webapp}/httpd.conf
@@ -677,21 +704,39 @@
 %attr(755,root,root) %{_datadir}/mythtv/mythflix/scripts/netflix.pl
 %{_datadir}/mythtv/netflix_menu.xml
 %{_datadir}/mythtv/themes/default/title_netflix.png
+%{_datadir}/mythtv/themes/default/mythflix_background.png
 %{_datadir}/mythtv/themes/default/netflix-ui.xml
+%{_datadir}/mythtv/themes/default-wide/netflix-ui.xml
+%{_datadir}/mythtv/themes/default-wide/netflix-bg.png
 # DUPLICATE WITH MYTHNEWS?
 %{_datadir}/mythtv/themes/default/news-info-bg.png
 %endif
 
-%if %{with mythcontrols}
-%files -n mythcontrols -f mythcontrols.lang
-%defattr(644,root,root,755)
-%doc mythcontrols/{AUTHORS,README,TODO}
-%attr(755,root,root) %{_libdir}/mythtv/plugins/libmythcontrols.so
-%{_datadir}/mythtv/themes/default/controls-ui.xml
-%{_datadir}/mythtv/themes/default/kb-button-off.png
-%{_datadir}/mythtv/themes/default/kb-button-on.png
+%if %{with mythmovies}
+%files -n mythmovies
+#-f mythmovies.lang
+%defattr(644,root,root,755)
+%doc mythmovies/{README,TODO}
+%attr(755,root,root) %{_bindir}/ignyte
+%attr(755,root,root) %{_libdir}/mythtv/plugins/libmythmovies.so
+%{_datadir}/mythtv/themes/default/movies-ui.xml
+%{_datadir}/mythtv/themes/default-wide/movies-ui.xml
+%endif
+
+%if %{with mythzoneminder}
+%files -n mythzoneminder
+#-f mythmovies.lang
+%defattr(644,root,root,755)
+%doc mythzoneminder/{AUTHORS,README}
+%attr(755,root,root) %{_bindir}/mythzmserver
+%attr(755,root,root) %{_libdir}/mythtv/plugins/libmythzoneminder.so
+%dir %{_datadir}/mythtv/zonemindermenu.xml
+%{_datadir}/mythtv/themes/default/zoneminder-ui.xml
+%{_datadir}/mythtv/themes/default-wide/zoneminder-ui.xml
+%{_datadir}/mythtv/themes/default/mz_*png
 %endif
 
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
@@ -789,10 +834,10 @@
 - cleanup patches
 
 Revision 1.12.2.24  2006/02/03 10:39:24  qboosh
-- pl for mythflix and mythcontrols
+- pl for mythflix and mythmovies
 
 Revision 1.12.2.23  2006/02/03 10:36:34  glen
-- finish mythcontrols module
+- finish mythmovies module
 
 Revision 1.12.2.22  2006/02/03 01:07:12  glen
 - *this* build time cflags hack (override libmyth buildtime flags)
@@ -887,7 +932,7 @@
 
 Revision 1.7  2005/09/08 22:14:06  glen
 - fixed amd64 build
-- added macros.perl for mythvideo scripts
+- added macros.perl for mythbrowser scripts
 
 Revision 1.6  2005/09/08 14:48:54  glen
 - fix libmyth-devel BR
@@ -906,3 +951,4 @@
 
 Revision 1.1  2005/09/07 19:54:19  glen
 - adapterized from atrpms spec, minor cleanups, NFY, DNT
+


More information about the pld-devel-pl mailing list