X-Git-Url: http://git.pld-linux.org/?p=packages%2Fmythplugins.git;a=blobdiff_plain;f=mythplugins.spec;h=f2cd7fed85740af0dc23c05eb54349392b0837da;hp=b9862c8ed80bf488351c449502ef05a7879cd509;hb=f5c8e0a;hpb=35a6e0370e56590142803aec3223742e85014264

diff --git a/mythplugins.spec b/mythplugins.spec
index b9862c8..f2cd7fe 100644
--- a/mythplugins.spec
+++ b/mythplugins.spec
@@ -8,7 +8,6 @@
 %bcond_without	mythgame	# disable building mythgame plugin
 %bcond_without	mythmusic	# disable building mythmusic plugin
 %bcond_without	mythnews	# disable building mythnews plugin
-%bcond_without	mythvideo	# disable building mythvideo plugin
 # Mythweather disabled, as we need DateTime::Format::ISO8601 first
 # not present by default in PLD
 %bcond_with	mythweather	# enable building mythweather plugin
@@ -23,7 +22,6 @@
 %undefine	with_mythgame
 %undefine	with_mythmusic
 %undefine	with_mythnews
-%undefine	with_mythvideo
 %undefine	with_mythweather
 %endif
 
@@ -32,17 +30,19 @@
 Summary:	Main MythTV plugins
 Summary(pl.UTF-8):	Główne wtyczki MythTV
 Name:		mythplugins
-Version:	0.24.3
-Release:	0.1
+Version:	0.26.1
+Release:	3
 License:	GPL v2
 Group:		Applications/Multimedia
-Source0:	ftp://ftp.osuosl.org/pub/mythtv/old_releases/%{name}-%{version}.tar.bz2
-# Source0-md5:	8483036df0a9fa4e821e0066ed35b544
-Source1:	mythweb.conf
+Source0:	ftp://ftp.osuosl.org/pub/mythtv/%{name}-%{version}.tar.bz2
+# Source0-md5:	d896d9f9313ba5dd95e2e977bf9c0f8f
+Source1:	mythweb-apache.conf
 Source2:	mythweb_lighttpd.conf
 Source3:	htdigest.sh
 Source4:	http_servers_conf_tips.txt
+Source5:	mythweb-httpd.conf
 Patch0:		mythweb-chdir.patch
+Patch1:		system-zmq.patch
 Patch10:	%{name}-compile_fixes_for_qt_4_7.patch
 Patch20:	%{name}-mytharchive-INT64.patch
 URL:		http://www.mythtv.org/
@@ -60,23 +60,28 @@ BuildRequires:	QtWebKit-devel
 BuildRequires:	QtXml-devel
 BuildRequires:	SDL-devel
 BuildRequires:	a52dec-libs-devel
-BuildRequires:	cdparanoia-III-devel
 BuildRequires:	faad2-devel >= 2.0-5.2
-%{?with_mythmusic:BuildRequires:	fftw-devel >= 2.1.3}
+%if %{with mythmusic}
+BuildRequires:	cdparanoia-III-devel
+BuildRequires:	fftw3-devel
+BuildRequires:	fftw3-single-devel
 BuildRequires:	flac-devel >= 1.0.4
-BuildRequires:	freetype-devel
+BuildRequires:	lame-libs-devel
 BuildRequires:	libcdaudio-devel >= 0.99.12p2
+BuildRequires:	libvorbis-devel >= 1:1.0
+BuildRequires:	taglib-devel
+%endif
+BuildRequires:	freetype-devel
 BuildRequires:	libdvdcss-devel >= 1.2.7
 BuildRequires:	libdvdread-devel >= 0.9.4
 %{?with_mythgallery:BuildRequires:	libexif-devel >= 1:0.6.9}
 BuildRequires:	libfame-devel >= 0.9.0
 BuildRequires:	libid3tag-devel
 BuildRequires:	libmad-devel
-BuildRequires:	libmyth-devel > 0.21
+BuildRequires:	libmyth-devel > 0.26
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtiff-devel
 BuildRequires:	libvisual-devel
-BuildRequires:	libvorbis-devel >= 1:1.0
 BuildRequires:	mjpegtools-devel >= 1.6.1
 BuildRequires:	nasm
 BuildRequires:	patchutils
@@ -84,8 +89,11 @@ BuildRequires:	patchutils
 %{?with_mythweather:BuildRequires:      perl-Image-Size}
 %{?with_mythweather:BuildRequires:	perl-XML-Simple}
 %{?with_mythweather:BuildRequires:      perl-XML-XPath}
-%{?with_mythnetvision:BuildRequires:	python-MythTV}
-%{?with_mythnetvision:BuildRequires:	python-oauth}
+%if %{with mythnetvision}
+BuildRequires:	python-MythTV
+BuildRequires:	python-lxml
+BuildRequires:	python-oauth
+%endif
 BuildRequires:	qt4-build
 BuildRequires:	qt4-qmake
 BuildRequires:	rpm-perlprov >= 4.1-13
@@ -102,10 +110,12 @@ BuildRequires:	zlib-devel
 %{?with_mythmysic:Requires:	mythmusic}
 %{?with_mythnetvision:Requires:	mythnetvision}
 %{?with_mythnews:Requires:	mythnews}
-%{?with_mythvideo:Requires:	mythvideo}
 %{?with_mythweather:Requires:	mythweather}
 %{?with_mythweb:Requires:	mythweb}
-ExclusiveArch:	%{ix86} %{x8664} ppc
+Obsoletes:	mythdvd < %{version}-%{release}
+Obsoletes:	mythmovies < %{version}-%{release}
+Obsoletes:	mythvideo
+ExclusiveArch:	%{ix86} %{x8664} x32 ppc
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		myth_api_version %(awk -vFS=. '/^LIBVERSION/{sub("LIBVERSION = ", ""); printf ("%s.%s", $1, $2)}' %{_datadir}/mythtv/build/settings.pro 2>/dev/null || echo ERROR)
@@ -162,19 +172,6 @@ Odtwarzacz muzyki dla MythTV. Obsługuje listy odtwarzania,
 wizualizacje, edycję tagów. Potrafi odtwarzać wiele popularnych
 formatów audio - mp3, flac, wav, ogg itd.
 
-%package -n mythvideo
-Summary:	A generic video player frontend module for MythTV
-Summary(pl.UTF-8):	Moduł ogólnego interfejsu do odtwarzania obrazu dla MythTV
-Group:		Applications/Multimedia
-Requires:	mplayer
-Requires:	mythtv-frontend-api = %{myth_api_version}
-
-%description -n mythvideo
-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.
-
 %package -n mythweather
 Summary:	A MythTV module that displays a weather forcast
 Summary(pl.UTF-8):	Moduł MythTV wyświetlający prognozę pogody
@@ -256,6 +253,7 @@ Requires:	php(mysql)
 Requires:	php(posix)
 Requires:	webapps
 Requires:	webserver(php) >= 4.3
+Conflicts:	apache-base < 2.4.0-1
 
 %description -n mythweb
 The web interface to MythTV.
@@ -295,6 +293,7 @@ Obsługa kamer przemysłowych dla MythTV.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 #%patch10 -p1
 %patch20 -p1
 
@@ -321,7 +320,6 @@ export QTDIR="%{_prefix}"
 	%{!?with_mythgame:--disable-mythgame} \
 	%{!?with_mythmusic:--disable-mythmusic}%{?with_mythmysic:--enable-fftw --enable-sdl --enable-aac --enable-opengl} \
 	%{!?with_mythnews:--disable-mythnews} \
-	%{!?with_mythvideo:--disable-mythvideo} \
 	%{!?with_mythweather:--disable-mythweather} \
 	%{!?with_mythweb:--disable-mythweb} \
 	%{!?with_mythnetvision:--disable-mythnetvision} \
@@ -346,7 +344,7 @@ export QTDIR="%{_prefix}"
 %{__make} install \
 	INSTALL_ROOT=$RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT/var/lib/{mythmusic,mythbrowser,mythvideo,pictures}
+install -d $RPM_BUILD_ROOT/var/lib/{mythmusic,mythbrowser,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}
@@ -366,7 +364,7 @@ install -d $RPM_BUILD_ROOT%{_webapps}/%{_webapp}
 cp -a *.php *.pl classes configuration includes js modules skins $RPM_BUILD_ROOT%{_datadir}/mythweb
 ln -sf /var/cache/mythweb $RPM_BUILD_ROOT%{_datadir}/mythweb/data
 install %{SOURCE1} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/apache.conf
-install %{SOURCE1} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/httpd.conf
+install %{SOURCE5} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/httpd.conf
 install %{SOURCE2} $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/lighttpd.conf
 touch $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/htpasswd
 touch $RPM_BUILD_ROOT%{_webapps}/%{_webapp}/htdigest
@@ -375,7 +373,7 @@ cd -
 
 rm -f $RPM_BUILD_ROOT%{_datadir}/data
 mv $RPM_BUILD_ROOT%{_datadir}/mythtv/i18n/mythbrowser_{pt_br,pt}.qm
-for p in mytharchive mythbrowser mythgallery mythgame mythmusic mythnetvision mythnews mythvideo mythweather mythzoneminder; do
+for p in mytharchive mythbrowser mythgallery mythgame mythmusic mythnetvision mythnews 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
@@ -390,13 +388,13 @@ rm -rf $RPM_BUILD_ROOT
 %triggerun -n mythweb -- apache1 < 1.3.37-3, apache1-base
 %webapp_unregister apache %{_webapp}
 
-%triggerin -n mythweb -- apache < 2.2.0, apache-base
+%triggerin -n mythweb -- apache-base
 %webapp_register httpd %{_webapp}
 
 %triggerin -n mythweb -- lighttpd
 %webapp_register lighttpd %{_webapp}
 
-%triggerun -n mythweb -- apache < 2.2.0, apache-base
+%triggerun -n mythweb -- apache-base
 %webapp_unregister httpd %{_webapp}
 
 %triggerun -n mythweb -- lighttpd
@@ -469,10 +467,17 @@ which packages you can need to run mythweb and how to set it quickly."
 /var/lib/mythmusic
 %{_datadir}/mythtv/musicmenu.xml
 %{_datadir}/mythtv/music_settings.xml
+%dir %{_datadir}/mythtv/mythmusic
+%{_datadir}/mythtv/mythmusic/streams.xml
+%{_datadir}/mythtv/themes/default/music-base.xml
 %{_datadir}/mythtv/themes/default/music-ui.xml
+%{_datadir}/mythtv/themes/default/musicsettings-ui.xml
 %{_datadir}/mythtv/themes/default/mm-titlelines.png
+%{_datadir}/mythtv/themes/default-wide/music-base.xml
 %{_datadir}/mythtv/themes/default-wide/music-ui.xml
+%{_datadir}/mythtv/themes/default-wide/musicsettings-ui.xml
 %{_datadir}/mythtv/themes/default-wide/mm-titlelines.png
+%{_datadir}/mythtv/themes/default-wide/stream-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
@@ -503,30 +508,6 @@ which packages you can need to run mythweb and how to set it quickly."
 %{_datadir}/mythtv/themes/default-wide/music-sel-bg.png
 %endif
 
-%if %{with mythvideo}
-%files -n mythvideo -f mythvideo.lang
-%defattr(644,root,root,755)
-%doc mythvideo/README* mythvideo/videodb mythvideo/contrib
-%attr(755,root,root) %{_libdir}/mythtv/plugins/libmythvideo.so
-%{_datadir}/mythtv/themes/default/video-ui.xml
-%{_datadir}/mythtv/themes/default-wide/video-ui.xml
-%{_datadir}/mythtv/themes/default/mv_*.png
-%{_datadir}/mythtv/themes/default-wide/mv_*.png
-%{_datadir}/mythtv/themes/default/md_*.png
-%{_datadir}/mythtv/video_settings.xml
-%{_datadir}/mythtv/videomenu.xml
-%dir %{_datadir}/mythtv/mythvideo
-%dir %{_datadir}/mythtv/mythvideo/scripts
-%dir %{_datadir}/mythtv/mythvideo/scripts/Movie
-%dir %{_datadir}/mythtv/mythvideo/scripts/Movie/MythTV
-%{_datadir}/mythtv/mythvideo/scripts/README
-%{_datadir}/mythtv/mythvideo/scripts/jamu.README
-%{_datadir}/mythtv/mythvideo/scripts/jamu-example.conf
-%{_datadir}/mythtv/mythvideo/scripts/Movie/MythTV/*
-%attr(755,root,root) %{_datadir}/mythtv/mythvideo/scripts/*.py
-/var/lib/mythvideo
-%endif
-
 %if %{with mythweather}
 %files -n mythweather -f mythweather.lang
 %defattr(644,root,root,755)
@@ -599,7 +580,7 @@ which packages you can need to run mythweb and how to set it quickly."
 %defattr(644,root,root,755)
 %doc mythbrowser/README mythbrowser/AUTHORS
 %attr(755,root,root) %{_libdir}/mythtv/plugins/libmythbrowser.so
-%{_datadir}/mythtv/themes/default/mb_progress*.png
+%{_datadir}/mythtv/themes/default/mb_*.png
 %{_datadir}/mythtv/themes/default/browser-ui.xml
 %{_datadir}/mythtv/themes/default-wide/browser-ui.xml
 %endif