6:22 p.m.
Author: hobbes1069
Update of /cvs/free/rpms/mythweb/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv23383
Modified Files:
.cvsignore ChangeLog mythweb.spec sources
Added Files:
mythweb-phperror.patch
Log Message:
* Fri Aug 23 2013 Richard Shaw <hobbes1069(a)gmail.com> - 0.26.1-1
- Update to latest upstream version.
mythweb-phperror.patch:
errors.php | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- NEW FILE mythweb-phperror.patch ---
MythWeb fails to load translations with php5.5
Patch source:
http://code.mythtv.org/trac/ticket/11513
--- a/includes/errors.php 2012-08-28 10:22:44.000000000 -0700
+++ b//includes/errors.php 2013-06-21 14:45:28.580966423 -0700
@@ -103,6 +103,9 @@
/**/
function error_handler($errno, $errstr, $errfile, $errline, $vars) {
global $db;
+ // Leave early if we haven't requested reports from this kind of error
+ if (!($errno & error_reporting()))
+ return;
if (class_exists('Translate'))
$errstr = Translate::find()->string($errstr);
// Try to auto-repair damaged SQL tables
@@ -113,9 +116,6 @@
add_error('Regular Expression Error: '.$match[1]);
return;
}
- // Leave early if we haven't requested reports from this kind of error
- if (!($errno & error_reporting()))
- return;
// Fatal errors should report considerably more detail
if (in_array($errno, array(E_USER_ERROR, E_ERROR))) {
// What type of error?
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/mythweb/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 29 Oct 2012 20:40:49 -0000 1.4
+++ .cvsignore 23 Aug 2013 18:22:18 -0000 1.5
@@ -1 +1 @@
-MythTV-mythweb-v0.26.0-0-g4dcd253.tar.gz
+mythweb-0.26.1.tar.gz
Index: ChangeLog
===================================================================
RCS file: /cvs/free/rpms/mythweb/devel/ChangeLog,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ChangeLog 13 Aug 2013 16:00:22 -0000 1.4
+++ ChangeLog 23 Aug 2013 18:22:18 -0000 1.5
@@ -1,75 +0,0 @@
-commit 8aa49039796ca347503553b048b5bd7a750df7c1
-Author: Paul Gardiner <mythtv(a)glidos.net>
-Date: Tue Jun 18 19:41:27 2013 -0400
-
- Use Default recording rule template in MythWeb
-
- when creating new recording rules. This patch only uses values from the
- Default recording rule template, but it's still better/more capable than
- the old approach that pulled values for a few parameters from settings.
-
- Patch by Paul Gardiner (thanks!) with minor changes by me.
- Fixes #11512.
-
- Signed-off-by: Michael T. Dean <mdean(a)mythtv.org>
-
- Backporting to 0.26 since users who upgraded from previous versions of
- MythTV (and, therefore, had set the no-longer-existing settings) were
- relying on their effect. This provides a functional replacement that
- uses the proper approach for current MythTV.
- (cherry picked from commit f97529656ca2e7e4aa7806eb493873d72b2b7cef)
-
-commit 570f1375b0cefc5808653a57f861723dcc77db84
-Author: Michael T. Dean <mdean(a)mythtv.org>
-Date: Tue Jun 18 19:33:33 2013 -0400
-
- Remove use of deprecated default rec rule settings
-
- from MythWeb. These values should all be set from the recording rule
- templates. Fixes #11138. Refs #11512.
-
- Backporting to 0.26 since there is no way to set the values being used
- by MythWeb in 0.26.
- (cherry picked from commit 71ee4dd6692a6ae9d99f9626459868f9863e30dc)
-
-commit e39afca283ecf06c5a0493854c500eba4c3a7da0
-Author: Karl Dietz <dekarl(a)mythtv.org>
-Date: Sat Jun 8 13:47:53 2013 +0200
-
- fix search at TheMovieDB on detail page
-
- Patch by OP, thank you
-
- Fixes #11566
-
- (cherry picked from commit 373cbde7552d65b10f33f27072a82136d5f9f812)
-
-commit e6747e6480294b0fc067d6d72d00a71937d3f7f8
-Author: bas-t <bas-t(a)gmail.com>
-Date: Mon Mar 25 13:33:32 2013 -0700
-
- Fixes an issue when the subtitle has a newline.
-
- Signed-off-by: Rob Smith <kormoc(a)mythtv.org>
-
-commit f82ca9521775edbbc53caf0f40f7bc183732dcc2
-Author: Karl Dietz <dekarl(a)users.sourceforge.net>
-Date: Fri Aug 3 23:26:30 2012 +0200
-
- Use PATH_SEPARATOR rather than ':' in mythweb.php.
-
- Fixes #10791
-
- Signed-off-by: Raymond Wagner <rwagner(a)mythtv.org>
- (cherry picked from commit f9f5a1f43f2ddfeaa038054226f6ac0aa0b973e6)
-
-commit 4fd9d5e05065c31e574e69251f872b1f53b7b027
-Author: R.D. Vaughan <r.d.vaughan(a)rogers.com>
-Date: Tue Oct 16 06:00:31 2012 -0400
-
- Add recognition of mkv containers to MythWeb for raw streaming.
-
- Fixes #11180
-
- Signed-off-by: Raymond Wagner <rwagner(a)mythtv.org>
- (cherry picked from commit ce2368132f823284588b02f8a1f66e0576d8c107)
Index: mythweb.spec
===================================================================
RCS file: /cvs/free/rpms/mythweb/devel/mythweb.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mythweb.spec 13 Aug 2013 16:00:22 -0000 1.7
+++ mythweb.spec 23 Aug 2013 18:22:18 -0000 1.8
@@ -1,7 +1,3 @@
-# Mythweb from github.com
-# git hash for archive
-%global githash1 g4dcd253
-%global githash2 4e9fd7a
%global gitrev v0.26.0-220-g92dbb43
Name: mythweb
@@ -9,13 +5,13 @@
URL: http://www.mythtv.org/
Group: Applications/Multimedia
-Version: 0.26.0
-Release: 5%{?dist}
+Version: 0.26.1
+Release: 1%{?dist}
License: GPLv2 and LGPLv2 and MIT
# https://github.com/MythTV/mythweb/tarball/v0.25
-Source0: MythTV-mythweb-v%{version}-0-%{githash1}.tar.gz
+Source0: %{name}-%{version}.tar.gz
Source1: mythweb.conf
Source2: ChangeLog
@@ -23,6 +19,7 @@
# git diff -p --stat %{version} > mythweb-fixes.patch
Patch0: mythweb-0.26-fixes.patch
Patch1: mythweb-notrans.patch
+Patch2: mythweb-phperror.patch
# The following are required only in mythweb is running on the same computer
# as the backend. They will be pulled in by the mythtv meta package anyway.
@@ -44,9 +41,10 @@
%prep
-%setup -q -n MythTV-mythweb-%{githash2}
-%patch0 -p1
+%setup -q
+#patch0 -p1
%patch1 -p1
+%patch2 -p1
# Fix directory permissions
#find ./ -type d -exec chmod 0755 {} \;
@@ -80,6 +78,9 @@
%changelog
+* Fri Aug 23 2013 Richard Shaw <hobbes1069(a)gmail.com> - 0.26.1-1
+- Update to latest upstream version.
+
* Mon Aug 13 2013 Richard Shaw <hobbes1069(a)gmail.com> - 0.26.0-5
- Update to latest fixes.
- Patch for NoTrans issue with php in Fedora 19 and up. (Fixes #2856)
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mythweb/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 29 Oct 2012 20:40:49 -0000 1.4
+++ sources 23 Aug 2013 18:22:18 -0000 1.5
@@ -1 +1 @@
-806f8a2187cfad356da541303120f048 MythTV-mythweb-v0.26.0-0-g4dcd253.tar.gz
+f833230e664d8465c9c3333099395513 mythweb-0.26.1.tar.gz