rpms/Miro/F-10 Miro-2.0-fhs.patch, 1.1, 1.2 Miro.spec, 1.46, 1.47 Miro-2.0-fhs-changeset_r9243.patch, 1.1, NONE

[Alex Lancaster]

Author: alexlan

Update of /cvs/extras/rpms/Miro/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11077

Modified Files:
	Miro-2.0-fhs.patch Miro.spec 
Removed Files:
	Miro-2.0-fhs-changeset_r9243.patch 
Log Message:
* Fri Feb 27 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.0-3
- Combine the fhs patches into one, and fix the path to
  /usr/libexec/xine_extractor (#487442)


Miro-2.0-fhs.patch:

Index: Miro-2.0-fhs.patch
===================================================================
RCS file: /cvs/extras/rpms/Miro/F-10/Miro-2.0-fhs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Miro-2.0-fhs.patch	25 Feb 2009 07:30:07 -0000	1.1
+++ Miro-2.0-fhs.patch	27 Feb 2009 13:39:36 -0000	1.2
@@ -9,3 +9,18 @@
       [os.path.join(platform_dir, 'xine/xine_extractor')]),
  ]
  
+--- Miro-2.0.orig/platform/gtk-x11/plat/renderers/xinerenderer.py	2009-02-09 21:34:53.000000000 -0700
++++ Miro-2.0/platform/gtk-x11/plat/renderers/xinerenderer.py	2009-02-27 06:25:18.000000000 -0700
+@@ -214,8 +214,9 @@
+         logging.warn("set_rate not implemented for xine")
+ 
+     def movie_data_program_info(self, 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.")
+-        return ((path, movie_path, thumbnail_path), None)
++            raise NotImplementedError()


Index: Miro.spec
===================================================================
RCS file: /cvs/extras/rpms/Miro/F-10/Miro.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- Miro.spec	27 Feb 2009 10:01:03 -0000	1.46
+++ Miro.spec	27 Feb 2009 13:39:36 -0000	1.47
@@ -5,7 +5,7 @@
 
 Name:           Miro
 Version:        2.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Miro - Internet TV Player
 Group:          Applications/Multimedia
 License:        GPLv2+
@@ -17,7 +17,6 @@
 # Drop this when updating to 2.0.1
 Patch1:         %{name}-2.0-libtorrent.patch
 Patch2:         %{name}-2.0-videodir.patch
-Patch3:         %{name}-2.0-fhs-changeset_r9243.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel xine-lib-devel Pyrex 
@@ -47,7 +46,6 @@
 %patch1 -p0
 %endif
 %patch2 -p1
-%patch3 -p3
 
 
 %build
@@ -94,6 +92,10 @@
 
 
 %changelog
+* Fri Feb 27 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.0-3
+- Combine the fhs patches into one, and fix the path to
+  /usr/libexec/xine_extractor (#487442)
+
 * Fri Feb 27 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.0-2
 - Add another upstream patch to fix patch on x86_64 (#487442)
 


--- Miro-2.0-fhs-changeset_r9243.patch DELETED ---