rpms/Miro/devel Miro-2.5.2-fhs.patch, NONE, 1.1 .cvsignore, 1.19, 1.20 Miro.spec, 1.58, 1.59 sources, 1.19, 1.20 Miro-2.0.2-fhs.patch, 1.1, NONE Miro-2.0.3-disable-xine-hack.patch, 1.1, NONE

[alexlan]

Author: alexlan

Update of /cvs/extras/rpms/Miro/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4611

Modified Files:
	.cvsignore Miro.spec sources 
Added Files:
	Miro-2.5.2-fhs.patch 
Removed Files:
	Miro-2.0.2-fhs.patch Miro-2.0.3-disable-xine-hack.patch 
Log Message:
* Tue Aug  4 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.5.2-1
- Update to latest upstream (2.5.2)
- Drop xine hack patch, now upstream
- Rebase remaining patches to 2.5.2 where necessary


Miro-2.5.2-fhs.patch:
 plat/renderers/xinerenderer.py |    4 ++--
 setup.py                       |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE Miro-2.5.2-fhs.patch ---
diff -up Miro-2.5.2/platform/gtk-x11/plat/renderers/xinerenderer.py.orig Miro-2.5.2/platform/gtk-x11/plat/renderers/xinerenderer.py
--- Miro-2.5.2/platform/gtk-x11/plat/renderers/xinerenderer.py.orig	2009-08-04 01:32:18.000000000 -0400
+++ Miro-2.5.2/platform/gtk-x11/plat/renderers/xinerenderer.py	2009-08-04 01:36:20.000000000 -0400
@@ -247,8 +247,8 @@ class AudioRenderer(Renderer):
         Renderer.on_eos(self)
 
 def movie_data_program_info(movie_path, thumbnail_path):
-    if os.path.exists(resources.path('../../../lib/miro/xine_extractor')):
-        path = resources.path('../../../lib/miro/xine_extractor')
+    if os.path.exists(resources.path('/usr/libexec/xine_extractor')):
+        path = resources.path('/usr/libexec/xine_extractor')
         return ((path, movie_path, thumbnail_path), None)
     else:
         logging.error("xine_extractor cannot be found.")
diff -up Miro-2.5.2/platform/gtk-x11/setup.py.orig Miro-2.5.2/platform/gtk-x11/setup.py
--- Miro-2.5.2/platform/gtk-x11/setup.py.orig	2009-08-04 01:32:05.000000000 -0400
+++ Miro-2.5.2/platform/gtk-x11/setup.py	2009-08-04 01:35:39.000000000 -0400
@@ -673,7 +673,7 @@ data_files += [
      [os.path.join(platform_dir, 'miro.1.gz')]),
     ('/usr/share/man/man1',
      [os.path.join(platform_dir, 'miro.real.1.gz')]),
-    ('/usr/lib/miro/',
+    ('/usr/libexec//',
      [os.path.join(platform_dir, 'xine/xine_extractor')]),
 ]
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Miro/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	1 Jul 2009 21:20:37 -0000	1.19
+++ .cvsignore	4 Aug 2009 05:55:02 -0000	1.20
@@ -1 +1 @@
-Miro-2.0.5.tar.gz
+Miro-2.5.2.tar.gz


Index: Miro.spec
===================================================================
RCS file: /cvs/extras/rpms/Miro/devel/Miro.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- Miro.spec	24 Jul 2009 15:38:26 -0000	1.58
+++ Miro.spec	4 Aug 2009 05:55:03 -0000	1.59
@@ -4,17 +4,16 @@
 %define gecko_ver 1.9.1.1
 
 Name:           Miro
-Version:        2.0.5
-Release:        3%{?dist}
+Version:        2.5.2
+Release:        1%{?dist}
 Summary:        Miro - Internet TV Player
 
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://www.getmiro.com/
 Source0:        http://ftp.osuosl.org/pub/pculture.org/miro/src/%{name}-%{version}.tar.gz
-Patch0:         %{name}-2.0.2-fhs.patch
+Patch0:         %{name}-2.5.2-fhs.patch
 Patch1:         %{name}-2.0-videodir.patch
-Patch2:         %{name}-2.0.3-disable-xine-hack.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel xine-lib-devel Pyrex 
@@ -48,7 +47,6 @@ releasing bug fixes on a regular basis.
 # (and '.' breaks Python imports)
 %patch0 -p1
 %patch1 -p1
-%patch2 -p0
 
 
 %build
@@ -95,6 +93,11 @@ update-desktop-database %{_datadir}/appl
 
 
 %changelog
+* Tue Aug  4 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.5.2-1
+- Update to latest upstream (2.5.2)
+- Drop xine hack patch, now upstream
+- Rebase remaining patches to 2.5.2 where necessary
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Miro/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	1 Jul 2009 21:20:37 -0000	1.19
+++ sources	4 Aug 2009 05:55:03 -0000	1.20
@@ -1 +1 @@
-bb589058844b441c8f0bd0b79532ca87  Miro-2.0.5.tar.gz
+e4e6a6979949c001ab06e813db7da06f  Miro-2.5.2.tar.gz


--- Miro-2.0.2-fhs.patch DELETED ---


--- Miro-2.0.3-disable-xine-hack.patch DELETED ---