Author: hobbes1069 Update of /cvs/free/rpms/mythweb/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv9381 Modified Files: .cvsignore ChangeLog mythweb-0.27-fixes.patch mythweb.spec sources Log Message: * Wed Jul 29 2015 Richard Shaw <hobbes1069(a)gmail.com&gt; - 0.27-5-1 - Update to latest upstream release. Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/mythweb/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 5 Nov 2014 03:17:48 -0000 1.9 +++ .cvsignore 5 Nov 2015 16:30:09 -0000 1.10 @@ -1 +1 @@ -mythweb-0.27.4.tar.gz +mythweb-0.27.5.tar.gz Index: ChangeLog =================================================================== RCS file: /cvs/free/rpms/mythweb/devel/ChangeLog,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- ChangeLog 27 May 2015 14:31:53 -0000 1.10 +++ ChangeLog 5 Nov 2015 16:30:09 -0000 1.11 @@ -1,52 +0,0 @@ -commit 799db438533acd7fed7b9137b63badb6f163b7da -Author: Jim Stichnoth <jstichnoth(a)mythtv.org&gt; -Date: Sun May 3 14:35:19 2015 -0700 - - Move .type_* entries above .cat_* entries. Refs #12351 - - This makes categories take precedence over types when deciding on - colors, resulting in a more colorful (and easier to read) search - results page. - - (cherry picked from commit cb588d870f215a4e65854a4665cc01b95dc4547e) - -commit c50228f1b8505ca5d4420ae5a696b08d4fb9c909 -Author: Alex Tomlins <alex(a)tomlins.org.uk&gt; -Date: Wed Mar 18 22:14:53 2015 +0000 - - Reduce cache headers for program details ajax popup. - - As it stands, these are being set to 10 days beyond the program start - time. This means that mythweb will often show stale data for programs - that have been updated since they were initially added to the guide. - - This reduces the cache time to 2 hours, which seems like a reasonable - time to cache for, yet still get timely updates. - - Fixes #12415 - - (cherry picked from commit 97a33211bd8d4dee6e0badb88760f07d66fe5d40) - -commit a8c6695bc851887ed6d9ae565b9c2788f1d60a6a -Author: Josu Lazkano <josu.lazkano(a)gmail.com&gt; -Date: Sat Apr 4 16:34:34 2015 -0400 - - Spanish MythWeb translation update - - OKed by the Spanish translation maintainer, Antonion Marcos Lopez Alonso. - - Thank you Josu! - - Close #12353 - -commit e0c2a3aea94bc96be5836472a1c53e62b5e43c93 -Author: Karl Dietz <dekarl(a)mythtv.org&gt; -Date: Thu Jan 22 20:57:13 2015 +0100 - - unbreak guide colors based on category_type - - It appears as if changes around other areas of the guide code uncovered - this issue which has been around for a long time. - - Fixes #12351 - (cherry picked from commit 1b86b5763e4c55bed4428bb227079a1ce0568e80) mythweb-0.27-fixes.patch: 0 files changed Index: mythweb-0.27-fixes.patch =================================================================== RCS file: /cvs/free/rpms/mythweb/devel/mythweb-0.27-fixes.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mythweb-0.27-fixes.patch 27 May 2015 14:31:53 -0000 1.3 +++ mythweb-0.27-fixes.patch 5 Nov 2015 16:30:09 -0000 1.4 @@ -1,260 +0,0 @@ - modules/_shared/lang/Spanish.lang | 8 ++++---- - modules/tv/get_show_details.php | 4 ++-- - skins/clean_blue/programming.css | 8 ++++---- - skins/default/programming.css | 8 ++++---- - skins/elkin/programming.css | 8 ++++---- - skins/grey/programming.css | 8 ++++---- - skins/haze_dark/programming.css | 8 ++++---- - skins/haze_light/programming.css | 8 ++++---- - skins/wap/handheld.css | 6 +++--- - skins/wap/style.css | 8 ++++---- - 10 files changed, 37 insertions(+), 37 deletions(-) - -diff --git a/modules/_shared/lang/Spanish.lang b/modules/_shared/lang/Spanish.lang -index 8758a65..5a23a6d 100644 ---- a/modules/_shared/lang/Spanish.lang -+++ b/modules/_shared/lang/Spanish.lang -@@ -360,7 +360,7 @@ - "Don't Record" - No grabar - "Don't record this program." -- No borrar este programa -+ No grabar este programa - "Done, Unknown Status" - Terminado, Estado Desconocido - "Down" -@@ -894,7 +894,7 @@ - "recstatus: willrecord" - estado: se grabará - "rectype-long: always" -- rectype-long: siempre -+ Grabar a cualquier hora y y canal. - "rectype-long: daily" - rectype-long: diario - "rectype-long: dontrec" -@@ -902,11 +902,11 @@ - "rectype-long: finddaily" - rectype-long: buscar diario - "rectype-long: findone" -- rectype-long: buscar uno -+ Encontrar y grabar un episodio con este titulo. - "rectype-long: findweekly" - rectype-long: buscar semana - "rectype-long: once" -- rectype-long: una vez -+ Grabar solo este episodio. - "rectype-long: override" - rectype-long: excepción - "rectype-long: weekly" -diff --git a/modules/tv/get_show_details.php b/modules/tv/get_show_details.php -index 1ac0dec..23b53f0 100644 ---- a/modules/tv/get_show_details.php -+++ b/modules/tv/get_show_details.php -@@ -1,8 +1,8 @@ - <?php - // Attempt to force some caching, will make secondary views so much faster. -- header('Cache-Control: max-age-'.($_REQUEST['starttime'] - time() + 604800)); -+ header('Cache-Control: max-age=7200, public'); - header('Pragma: '); -- header('Expires: '.date('D, d M Y H:i:s e', $_REQUEST['starttime'] + 604800)); -+ header('Expires: '.date('D, d M Y H:i:s e', time() + 7200)); - header('Content-Type: application/json'); - - $program = load_one_program($_REQUEST['starttime'], $_REQUEST['chanid'], false); -diff --git a/skins/clean_blue/programming.css b/skins/clean_blue/programming.css -index 14bf223..fd97019 100644 ---- a/skins/clean_blue/programming.css -+++ b/skins/clean_blue/programming.css -@@ -110,6 +110,10 @@ - .ManualOverride { color: #D03060; } - .Overlap { color: #FF0000; } - -+.type_movie { background-color: #809090; } -+.type_series { background-color: #C0C0C0; } -+.type_tvshow { } -+ - .cat_Action { background-color: #A6A38A; } - .cat_Adult { background-color: #FF0066; } - .cat_Animals { background-color: #33FF66; } -@@ -143,10 +147,6 @@ - .cat_Western { background-color: #806040; } - .cat_Unknown { background-color: #9999FF; } - --.cat_movie { background-color: #809090 !important; } --.cat_series { background-color: #C0C0C0; } --.cat_tvshow { } -- - .tv_Cine { background-color: blue; } - .tv_Classic { background-color: gray; } - .tv_Collectibles { background-color: #708090; } -diff --git a/skins/default/programming.css b/skins/default/programming.css -index 4c1789c..62cc9b3 100644 ---- a/skins/default/programming.css -+++ b/skins/default/programming.css -@@ -101,6 +101,10 @@ - .ManualOverride { color: #D03060; } - .Overlap { color: #FF0000; } - -+.type_movie { background-color: #809090; } -+.type_series { } -+.type_tvshow { } -+ - .cat_Action { background-color: #906020; } - .cat_Adult { background-color: #702020; } - .cat_Animals { background-color: #609060; } -@@ -134,10 +138,6 @@ - .cat_Western { background-color: #806040; } - .cat_Unknown { background-color: #303030; } - --.cat_movie { background-color: #809090 !important; } --.cat_series { } --.cat_tvshow { } -- - /* deprecated show categories that need to be integreted into the above list via regex, or have new categories created for them */ - .tv_Cine { background-color: blue; } - .tv_Classic { background-color: gray; } -diff --git a/skins/elkin/programming.css b/skins/elkin/programming.css -index 2b21966..6a72a1f 100644 ---- a/skins/elkin/programming.css -+++ b/skins/elkin/programming.css -@@ -105,6 +105,10 @@ - .ManualOverride { color: #D03060; } - .Overlap { color: #FF0000; } - -+.type_movie { background-color: #CCCC00; } -+.type_series { } -+.type_tvshow { } -+ - .cat_Action { background-color: #FFCC66; } - .cat_Adult { background-color: #FF9999; } - .cat_Animals { background-color: #CCFF33; } -@@ -138,10 +142,6 @@ - .cat_Western { background-color: #806040; } - .cat_Unknown { background-color: #FFFFFF; } - --.cat_movie { background-color: #CCCC00 !important; } --.cat_series { } --.cat_tvshow { } -- - /* deprecated show categories that need to be integreted into the above list via regex, or have new categories created for them */ - .tv_Cine { background-color: blue; } - .tv_Classic { background-color: gray; } -diff --git a/skins/grey/programming.css b/skins/grey/programming.css -index d15046f..401731b 100644 ---- a/skins/grey/programming.css -+++ b/skins/grey/programming.css -@@ -47,6 +47,10 @@ - .ManualOverride { color: #D03060; } - .Overlap { color: #FF0000; } - -+.type_movie { background-color: #809090; } -+.type_series { } -+.type_tvshow { } -+ - .cat_Action { background-color: #906020; } - .cat_Adult { background-color: #702020; } - .cat_Animals { background-color: #609060; } -@@ -80,10 +84,6 @@ - .cat_Western { background-color: #806040; } - .cat_Unknown { background-color: #303030; } - --.cat_movie { background-color: #809090 !important; } --.cat_series { } --.cat_tvshow { } -- - /* deprecated show categories that need to be integreted into the above list via regex, or have new categories created for them */ - .tv_Cine { background-color: blue; } - .tv_Classic { background-color: gray; } -diff --git a/skins/haze_dark/programming.css b/skins/haze_dark/programming.css -index 5c70a13..b261eca 100644 ---- a/skins/haze_dark/programming.css -+++ b/skins/haze_dark/programming.css -@@ -49,6 +49,10 @@ - .manualOverride { color: #D03060; } - .overlap { color: #FF0000; } - -+.type_movie { background-color: #A31418; } /*hsl(358,78%,36%)*/ -+.type_series { } -+.type_tvshow { } -+ - .cat_Action { background-color: #6B1E0F; } /*hsl(10,75%,24%)*/ - .cat_Adult { background-color: #A34614; } /*hsl(21,78%,36%)*/ - .cat_Animals { background-color: #6B400F; } /*hsl(32,75%,24%)*/ -@@ -82,10 +86,6 @@ - .cat_Western { background-color: #6B0F23; } /*hsl(347,75%,24%)*/ - .cat_Unknown { background-color: #303030; } /*hsl(0,0%,19%)*/ - --.cat_movie { background-color: #A31418; !important; } /*hsl(358,78%,36%)*/ --.cat_series { } --.cat_tvshow { } -- - /* deprecated show categories that need to be integreted into the above list via regex, or have new categories created for them */ - .tv_Cine { background-color: blue; } - .tv_Classic { background-color: gray; } -diff --git a/skins/haze_light/programming.css b/skins/haze_light/programming.css -index edac335..df28937 100644 ---- a/skins/haze_light/programming.css -+++ b/skins/haze_light/programming.css -@@ -49,6 +49,10 @@ - .manualOverride { color: #D03060; } - .overlap { color: #FF0000; } - -+.type_movie { background-color: #F8B3B5; } /*hsl(358,85%,84%)*/ -+.type_series { } -+.type_tvshow { } -+ - .cat_Action { background-color: #FBCEC4; } /*hsl(10,90%,88%)*/ - .cat_Adult { background-color: #F8CBB3; } /*hsl(21,85%,84%)*/ - .cat_Animals { background-color: #FBE2C4; } /*hsl(32,90%,88%)*/ -@@ -82,10 +86,6 @@ - .cat_Western { background-color: #FBC4D0; } /*hsl(347,90%,88%)*/ - .cat_Unknown { background-color: #EDEDED; } /*hsl(0,0%,93%)*/ - --.cat_movie { background-color: #F8B3B5; !important; } /*hsl(358,85%,84%)*/ --.cat_series { } --.cat_tvshow { } -- - /* deprecated show categories that need to be integreted into the above list via regex, or have new categories created for them */ - .tv_Cine { background-color: blue; } - .tv_Classic { background-color: gray; } -diff --git a/skins/wap/handheld.css b/skins/wap/handheld.css -index 12ed3a7..51d809a 100644 ---- a/skins/wap/handheld.css -+++ b/skins/wap/handheld.css -@@ -172,9 +172,9 @@ TextArea { - .cat_Western { background-color: #806040 } - .cat_Unknown { background-color: #303030 } - --.cat_movie { background-color: #809090 !important; } --.cat_series { } --.cat_tvshow { } -+.type_movie { background-color: #809090 !important; } -+.type_series { } -+.type_tvshow { } - - /* deprecated show categories that need to be integreted into the above list via regex, or have new categories created for them */ - .tv_Cine { background-color: Blue } -diff --git a/skins/wap/style.css b/skins/wap/style.css -index 95ead32..fef7df3 100644 ---- a/skins/wap/style.css -+++ b/skins/wap/style.css -@@ -172,9 +172,9 @@ TextArea { - .cat_Western { background-color: #806040 } - .cat_Unknown { background-color: #303030 } - --.cat_movie { background-color: #809090 !important; } --.cat_series { } --.cat_tvshow { } -+.type_movie { background-color: #809090 !important; } -+.type_series { } -+.type_tvshow { } - - /* deprecated show categories that need to be integreted into the above list via regex, or have new categories created for them */ - .tv_Cine { background-color: Blue } -@@ -184,4 +184,4 @@ TextArea { - .tv_Movies { background-color: Blue } - .tv_Serie { background-color: DarkOrchid } - .tv_SHOW { background-color: sienna } --.tv_Tiempo { background-color: #33ff99 } -\ No newline at end of file -+.tv_Tiempo { background-color: #33ff99 } Index: mythweb.spec =================================================================== RCS file: /cvs/free/rpms/mythweb/devel/mythweb.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- mythweb.spec 27 May 2015 14:31:53 -0000 1.15 +++ mythweb.spec 5 Nov 2015 16:30:09 -0000 1.16 @@ -1,16 +1,15 @@ -%global vers_string v0.27.4-4-g799db43 +%global vers_string v0.27.5 Name: mythweb Summary: The web interface to MythTV URL: http://www.mythtv.org/ -Version: 0.27.4 -Release: 2%{?dist} +Version: 0.27.5 +Release: 1%{?dist} License: GPLv2 and LGPLv2 and MIT -# https://github.com/MythTV/mythweb/archive/v0.27.tar.gz -Source0: %{name}-%{version}.tar.gz +Source0: https://github.com/MythTV/%{name}/archive/v%{version}.tar.gz#/%{name}-%{v... Source1: mythweb.conf Source2: ChangeLog @@ -39,7 +38,7 @@ %prep %setup -q -n %{name}-%{version} -%patch0 -p1 +#patch0 -p1 # Fix directory permissions #find ./ -type d -exec chmod 0755 {} \; @@ -105,6 +104,9 @@ %changelog +* Wed Jul 29 2015 Richard Shaw <hobbes1069(a)gmail.com&gt; - 0.27-5-1 +- Update to latest upstream release. + * Wed May 27 2015 Richard Shaw <hobbes1069(a)gmail.com&gt; - 0.27.4-2 - Update to latest fixes release. Index: sources =================================================================== RCS file: /cvs/free/rpms/mythweb/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 5 Nov 2014 03:17:48 -0000 1.9 +++ sources 5 Nov 2015 16:30:09 -0000 1.10 @@ -1 +1 @@ -6421880e22d44ea277a11d9ecb494be1 mythweb-0.27.4.tar.gz +5415eb224b4e31cae22c0efdc705ccc5 mythweb-0.27.5.tar.gz