rpms/mythweb/devel mythweb-0.27-fixes.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 ChangeLog, 1.6, 1.7 mythweb.spec, 1.10, 1.11 sources, 1.5, 1.6 mythweb-0.26-fixes.patch, 1.3, NONE mythweb-notrans.patch, 1.1, NONE

[Richard Shaw]

Author: hobbes1069

Update of /cvs/free/rpms/mythweb/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv2429

Modified Files:
	.cvsignore ChangeLog mythweb.spec sources 
Added Files:
	mythweb-0.27-fixes.patch 
Removed Files:
	mythweb-0.26-fixes.patch mythweb-notrans.patch 
Log Message:
* Mon Oct 28 2013 Richard Shaw <hobbes1069 at gmail.com> - 0.27-1
- Update to 0.27 at latest fixes release.
- Make mythweb write to a more appropriate directory.


mythweb-0.27-fixes.patch:
 Channel.php |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE mythweb-0.27-fixes.patch ---
 modules/tv/classes/Channel.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/tv/classes/Channel.php b/modules/tv/classes/Channel.php
index ec8b368..ea9e6b7 100644
--- a/modules/tv/classes/Channel.php
+++ b/modules/tv/classes/Channel.php
@@ -121,7 +121,7 @@ class Channel extends MythBase {
         // Otherwise, grab it from the backend
             else {
             // Make the request and store the result
-                $data = MythBackend::find()->httpRequest('Guide/GetChannelIcon', array('ChanID' => $this->chanid));
+                $data = MythBackend::find()->httpRequest('Guide/GetChannelIcon', array('ChanId' => $this->chanid));
                 if ($data)
                     file_put_contents($this->icon, $data);
                 unset($data);


Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/mythweb/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	23 Aug 2013 18:22:18 -0000	1.5
+++ .cvsignore	6 Nov 2013 16:27:06 -0000	1.6
@@ -1 +1 @@
-mythweb-0.26.1.tar.gz
+mythweb-0.27.tar.gz


Index: ChangeLog
===================================================================
RCS file: /cvs/free/rpms/mythweb/devel/ChangeLog,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ChangeLog	2 Sep 2013 14:14:29 -0000	1.6
+++ ChangeLog	6 Nov 2013 16:27:06 -0000	1.7
@@ -1,21 +1,5 @@
-commit 7326d7ef70fb86037d9c30ca7e0762d0cb01b7ff
-Author: Scott Shawcroft <scott.shawcroft at gmail.com>
-Date:   Tue Aug 27 22:34:55 2013 -0400
+commit 6d10afe73e1fb5f21688d4b6d6919cab618e6e88
+Author: Stuart Morgan <smorgan at mythtv.org>
+Date:   Thu Oct 17 21:37:02 2013 +0100
 
-    Fix the problem of MythWeb failing to load translations
-    
-    Refs #11513
-    
-    Signed-off-by: Nicolas Riendeau <nriendeau at mythtv.org>
-
-commit 5d8ffe109286269ada87390a2b74e142ec36e364
-Author: Karl Dietz <dekarl at mythtv.org>
-Date:   Mon Aug 26 22:39:35 2013 +0200
-
-    fix merge in schedule templates added in f97529656
-    
-    if (!$this->$name) ends up as if(!0)...
-    
-    Fixes #11775
-    
-    (cherry picked from commit 08b94cea6346ebeb94edf98ecb5d7b7dd8555560)
+    Fix channel icons in mythweb. There was a typo which meant the services API call failed.


Index: mythweb.spec
===================================================================
RCS file: /cvs/free/rpms/mythweb/devel/mythweb.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mythweb.spec	30 Sep 2013 08:41:06 -0000	1.10
+++ mythweb.spec	6 Nov 2013 16:27:07 -0000	1.11
@@ -1,24 +1,23 @@
-%global gitrev v0.26.1-2-g7326d7e
+%global ver_string v0.27-1-g6d10afe
 
 Name:           mythweb
 Summary:        The web interface to MythTV
 URL:            http://www.mythtv.org/
 Group:          Applications/Multimedia
 
-Version:        0.26.1
-Release:        3%{?dist}
+Version:        0.27
+Release:        1%{?dist}
 
 License:        GPLv2 and LGPLv2 and MIT
 
-# https://github.com/MythTV/mythweb/tarball/v0.25
+# https://github.com/MythTV/mythweb/archive/v0.27.tar.gz
 Source0:        %{name}-%{version}.tar.gz
 Source1:        mythweb.conf
 Source2:        ChangeLog
 
 # Patch generated from mythweb fixes branch. From mythweb git directory:
 # git diff -p --stat %{version} > mythweb-fixes.patch
-Patch0:         mythweb-0.26-fixes.patch
-Patch1:         mythweb-notrans.patch
+Patch0:         mythweb-0.27-fixes.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.
@@ -40,9 +39,8 @@
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}
 %patch0 -p1
-%patch1 -p1
 
 # Fix directory permissions
 #find ./ -type d -exec chmod 0755 {} \;
@@ -61,6 +59,14 @@
 %install
 mkdir -p %{buildroot}%{_datadir}/mythweb/{image_cache,php_sessions}
 cp -a * %{buildroot}%{_datadir}/mythweb/
+
+# data dir needs to be a directory suitable for writing
+mkdir -p %{buildroot}%{_sharedstatedir}/%{name}
+mv %{buildroot}%{_datadir}/%{name}/data %{buildroot}%{_sharedstatedir}/%{name}/
+pushd %{buildroot}%{_datadir}/%{name}
+ln -s ../../..%{_sharedstatedir}/%{name}/data
+
+# Install httpd config
 mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d
 cp %{SOURCE1} %{buildroot}%{_sysconfdir}/httpd/conf.d/
 
@@ -68,14 +74,42 @@
 rm %{buildroot}%{_datadir}/mythweb/{LICENSE,README,INSTALL,ChangeLog}
 
 
+%pretrans
+# If this is an upgrade
+if [ $1 -eq 0 ] ; then
+    # If data exists and is a directory then we need move it out of the way.
+    if [ -d "%{_datadir}/%{name}/data" ] ; then
+        mv %{_datadir}/%{name}/data %{_datadir}/%{name}/_tmp_data
+    fi
+fi
+
+%posttrans
+# If this is an upgrade
+if [ $1 -eq 0 ] ; then
+    # If there is data to migrate, let's do it
+    if [ -e "%{_datadir}/%{name}/_tmp_data" ] ; then
+        cp -p %{_datadir}/%{name}/_tmp_data/cache/* \
+              %{_sharedstatedir}/%{name}/data/cache/ &> /dev/null || :
+        cp -p %{_datadir}/%{name}/_tmp_data/tv_icons/* \
+              %{_sharedstatedir}/%{name}/data/tv_icons/ &> /dev/null || :
+        rm -rf %{_datadir}/%{name}/_tmp_data
+    fi
+fi
+
+
 %files
 %doc README LICENSE ChangeLog
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/mythweb.conf
+%{_datadir}/%{name}/
 %defattr(-,apache,apache,0755)
-%{_datadir}/mythweb/
+%{_sharedstatedir}/%{name}/
 
 
 %changelog
+* Mon Oct 28 2013 Richard Shaw <hobbes1069 at gmail.com> - 0.27-1
+- Update to 0.27 at latest fixes release.
+- Make mythweb write to a more appropriate directory.
+
 * Mon Sep 30 2013 Nicolas Chauvet <kwizart at gmail.com> - 0.26.1-3
 - Rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/free/rpms/mythweb/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	23 Aug 2013 18:22:18 -0000	1.5
+++ sources	6 Nov 2013 16:27:07 -0000	1.6
@@ -1 +1 @@
-f833230e664d8465c9c3333099395513  mythweb-0.26.1.tar.gz
+6582f7d589ceb563f97cbc85a5f54e90  mythweb-0.27.tar.gz


--- mythweb-0.26-fixes.patch DELETED ---


--- mythweb-notrans.patch DELETED ---