rpms/mythweb/devel ChangeLog,1.2,1.3 mythweb.spec,1.4,1.5

[Richard Shaw]

Author: hobbes1069

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

Modified Files:
	ChangeLog mythweb.spec 
Log Message:
* Sat Dec 08 2012 Richard Shaw <hobbes1069 at gmail.com> - 0.26.0-2
- Update to latest upstream release.



Index: ChangeLog
===================================================================
RCS file: /cvs/free/rpms/mythweb/devel/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ChangeLog	30 Jul 2012 21:14:03 -0000	1.2
+++ ChangeLog	24 Dec 2012 19:21:49 -0000	1.3
@@ -0,0 +1,21 @@
+commit f82ca9521775edbbc53caf0f40f7bc183732dcc2
+Author: Karl Dietz <dekarl at 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 at mythtv.org>
+    (cherry picked from commit f9f5a1f43f2ddfeaa038054226f6ac0aa0b973e6)
+
+commit 4fd9d5e05065c31e574e69251f872b1f53b7b027
+Author: R.D. Vaughan <r.d.vaughan at 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 at mythtv.org>
+    (cherry picked from commit ce2368132f823284588b02f8a1f66e0576d8c107)


Index: mythweb.spec
===================================================================
RCS file: /cvs/free/rpms/mythweb/devel/mythweb.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mythweb.spec	29 Oct 2012 20:40:49 -0000	1.4
+++ mythweb.spec	24 Dec 2012 19:21:49 -0000	1.5
@@ -9,7 +9,7 @@
 Group:          Applications/Multimedia
 
 Version:        0.26.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 License:        GPLv2 and LGPLv2 and MIT
 
@@ -18,6 +18,8 @@
 Source1:        mythweb.conf
 Source2:        ChangeLog
 
+Patch0:         mythweb-0.26-fixes.patch
+
 # Patch generated from mythweb fixes branch. From mythweb git directory:
 # git diff -p --stat %{version} > mythweb-fixes.patch
 #Patch0:         mythweb-fixes.patch
@@ -43,7 +45,7 @@
 
 %prep
 %setup -q -n MythTV-mythweb-%{githash2}
-#patch1 -p1 -b .php54
+%patch0 -p1
 
 # Fix directory permissions
 #find ./ -type d -exec chmod 0755 {} \;
@@ -64,8 +66,9 @@
 cp -a * %{buildroot}%{_datadir}/mythweb/
 mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d
 cp %{SOURCE1} %{buildroot}%{_sysconfdir}/httpd/conf.d/
-# drop .htaccess file, settings handled in the above
-rm -f %{buildroot}%{_datadir}/mythweb/data/.htaccess
+
+# Remove stuff covered by %%doc
+rm %{buildroot}%{_datadir}/mythweb/{LICENSE,README,INSTALL,ChangeLog}
 
 
 %files
@@ -76,8 +79,11 @@
 
 
 %changelog
+* Sat Dec 08 2012 Richard Shaw <hobbes1069 at gmail.com> - 0.26.0-2
+- Update to latest upstream release.
+
 * Sun Oct 28 2012 Richard Shaw <hobbes1069 at gmail.com> - 0.26.0-1
-* Update to latest upstream release.
+- Update to latest upstream release.
 
 * Mon Jul 30 2012 Richard Shaw <hobbes1069 at gmail.com> - 0.25.2-1
 - Update to latests release.