packages: mythplugins/mythplugins.spec - clean up; adapterized

w.kier w.kier at pld-linux.org
Mon Sep 27 01:04:33 CEST 2010 

Author: w.kier                       Date: Sun Sep 26 23:04:33 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- clean up; adapterized

---- Files affected:
packages/mythplugins:
   mythplugins.spec (1.63 -> 1.64) 

---- Diffs:

================================================================
Index: packages/mythplugins/mythplugins.spec
diff -u packages/mythplugins/mythplugins.spec:1.63 packages/mythplugins/mythplugins.spec:1.64
--- packages/mythplugins/mythplugins.spec:1.63	Sat Sep 25 23:48:32 2010
+++ packages/mythplugins/mythplugins.spec	Mon Sep 27 01:04:25 2010
@@ -41,23 +41,19 @@
 Summary(pl.UTF-8):	Główne wtyczki MythTV
 Name:		mythplugins
 Version:	0.23.1
-#Release:	fix%{fix}.1
 Release:	2
+#Release:	fix%{fix}.1
 License:	GPL v2
 Group:		Applications/Multimedia
 Source0:	ftp://ftp.osuosl.org/pub/mythtv/%{name}-%{version}.tar.bz2
 # Source0-md5:	edd9c5f8a9ae0189b1c8951fa8282c4d
 Source1:	mythweb.conf
-Source2:        mythweb_lighttpd.conf
+Source2:	mythweb_lighttpd.conf
 Source3:	htdigest.sh
 Source4:	http_servers_conf_tips.txt
-#Patch0: %{name}-lib64.patch
-#Patch1: %{name}-paths.patch
-Patch2:		mythweb-chdir.patch
-Patch3:		%{name}-compile_fixes_for_qt_4_7.patch
+Patch0:		mythweb-chdir.patch
+Patch10:	%{name}-compile_fixes_for_qt_4_7.patch
 Patch20:	%{name}-mytharchive-INT64.patch
-#Patch21:	mythmusic_fftw3.patch
-#Patch100:	mythtv-branch.diff
 URL:		http://www.mythtv.org/
 %if %{with binary}
 %if %{with mythgallery} || %{with myhtmusic}
@@ -92,10 +88,10 @@
 BuildRequires:	mjpegtools-devel >= 1.6.1
 BuildRequires:	nasm
 BuildRequires:	patchutils
+%{?with_mythweather:BuildRequires:      perl-DateTime-Format-ISO8601}
+%{?with_mythweather:BuildRequires:      perl-Image-Size}
 %{?with_mythweather:BuildRequires:	perl-XML-Simple}
 %{?with_mythweather:BuildRequires:      perl-XML-XPath}
-%{?with_mythweather:BuildRequires:      perl-Image-Size}
-%{?with_mythweather:BuildRequires:      perl-DateTime-Format-ISO8601}
 BuildRequires:	qt4-build
 BuildRequires:	qt4-qmake
 BuildRequires:	rpm-perlprov >= 4.1-13
@@ -109,10 +105,10 @@
 %{?with_mytharchive:Requires:	mytharchive}
 %{?with_mythbrowser:Requires:	mythbrowser}
 %{?with_mythdvd:Requires:	mythdvd}
-%{?with_mythnetvision:Requires:	mythnetvision}
 %{?with_mythgallery:Requires:	mythgallery}
 %{?with_mythgame:Requires:	mythgame}
 %{?with_mythmysic:Requires:	mythmusic}
+%{?with_mythnetvision:Requires:	mythnetvision}
 %{?with_mythnews:Requires:	mythnews}
 %{?with_mythvideo:Requires:	mythvideo}
 %{?with_mythweather:Requires:	mythweather}
@@ -166,14 +162,14 @@
 Requires:	mythtv-frontend-api = %{myth_api_version}
 
 %description -n mythmusic
-Music add-on for MythTV. Support playlists, visualisations, tag editing
-and plays many popular audio file formats - mp3, flac, wav, ogg etc.
+Music add-on for MythTV. Support playlists, visualisations, tag
+editing and plays many popular audio file formats - mp3, flac, wav,
+ogg etc.
 
 %description -n mythmusic -l pl.UTF-8
-Odtwarzacz muzyki dla MythTV. Obsługuje listy odtwarzania, wizualizacje,
-edycję tagów.
-Potrafi odtwarzać wiele popularnych formatów audio - mp3, flac, wav, ogg
-itd.
+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
@@ -292,8 +288,6 @@
 Requires:	php(posix)
 Requires:	webapps
 Requires:	webserver(php) >= 4.3
-#Suggests:	apache(mod_auth)
-#Suggests:	apache(mod_env)
 
 %description -n mythweb
 The web interface to MythTV.
@@ -305,15 +299,15 @@
 Summary:	Mythtv extension to watch network movie shows
 Summary(pl.UTF-8):	Dodatek do MythTV do oglądania sieciowych transmisji
 Group:		Applications/Multimedia
-Requires:	mythtv-frontend-api = %{myth_api_version}
 Requires:	mythbrowser
+Requires:	mythtv-frontend-api = %{myth_api_version}
 
 %description -n mythnetvision
 Mythtv extension to watch network movie shows (ex. YouTube).
 
 %description -n mythnetvision -l pl.UTF-8
-Dodatek do MythTV do oglądania sieciowych transmisji.
-Na przykład z YouTube.
+Dodatek do MythTV do oglądania sieciowych transmisji. Na przykład z
+YouTube.
 
 %package -n mythmovies
 Summary:	MythTV cinemas timetable
@@ -342,25 +336,16 @@
 Obsługa kamer przemysłowych dla MythTV.
 
 %prep
-%setup -q -n %{name}-%{version}
-#%if %{_lib} != "lib"
-#%patch0 -p1
-#%endif
-#%patch1 -p1
-%patch2 -p1
-%patch3 -p1
+%setup -q
+%patch0 -p1
+%patch10 -p1
 %patch20 -p1
-#%patch21 -p1
-#filterdiff -i 'mythplugins/*' %{PATCH100} | %{__patch} -p1 -s
-
-# make it visible
-#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/,/%{_lib}/,g
+s,%{_prefix}/lib/,/%{_lib}/,g
 	s,{PREFIX}/lib,{PREFIX}/%{_lib},g
 '
 exit 1
@@ -583,9 +568,9 @@
 %{_datadir}/mythtv/mythvideo/scripts/jamu-example.conf
 %attr(755,root,root) %{_datadir}/mythtv/mythvideo/scripts/Movie/*.pl
 %attr(755,root,root) %{_datadir}/mythtv/mythvideo/scripts/Movie/*.py
-%attr(644,root,root) %{_datadir}/mythtv/mythvideo/scripts/Movie/MythTV/*
+%{_datadir}/mythtv/mythvideo/scripts/Movie/MythTV/*
 %attr(755,root,root) %{_datadir}/mythtv/mythvideo/scripts/*.py
-%attr(644,root,root) %{_datadir}/mythtv/mythvideo/scripts/Television/*
+%{_datadir}/mythtv/mythvideo/scripts/Television/*
 /var/lib/mythvideo
 %endif
 
@@ -718,7 +703,7 @@
 %attr(755,root,root) %{_datadir}/mythtv/mythnetvision/scripts/*.py
 %dir %{_datadir}/mythtv/mythnetvision/scripts/nv_python_libs
 %{_datadir}/mythtv/mythnetvision/scripts/nv_python_libs/*
-%{_datadir}/mythtv/themes/default-wide/netvision-ui.xml   
+%{_datadir}/mythtv/themes/default-wide/netvision-ui.xml
 %{_datadir}/mythtv/themes/default/netvision-ui.xml
 %endif
 
@@ -757,6 +742,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.64  2010/09/26 23:04:25  w.kier
+- clean up; adapterized
+
 Revision 1.63  2010/09/25 21:48:32  w.kier
 - a little correction to api definition
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mythplugins/mythplugins.spec?r1=1.63&r2=1.64&f=u

More information about the pld-cvs-commit mailing list