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

[Alex Lancaster]

Author: alexlan

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

Modified Files:
	Miro.spec 
Added Files:
	Miro-2.0-fhs-changeset_r9243.patch 
Log Message:
* 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:

--- NEW FILE Miro-2.0-fhs-changeset_r9243.patch ---
Index: /trunk/tv/platform/gtk-x11/plat/renderers/xinerenderer.py
===================================================================
--- /trunk/tv/platform/gtk-x11/plat/renderers/xinerenderer.py (revision 9045)
+++ /trunk/tv/platform/gtk-x11/plat/renderers/xinerenderer.py (revision 9243)
@@ -215,7 +215,8 @@
 
     def movie_data_program_info(self, movie_path, thumbnail_path):
-        if os.path.exists(resources.path('../../../lib/miro/xine_extractor')):
+        if os.path.exists(resources.path('./../../lib/miro/xine_extractor')):
             path = resources.path('../../../lib/miro/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.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- Miro.spec	25 Feb 2009 07:30:08 -0000	1.45
+++ Miro.spec	27 Feb 2009 10:01:03 -0000	1.46
@@ -5,7 +5,7 @@
 
 Name:           Miro
 Version:        2.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Miro - Internet TV Player
 Group:          Applications/Multimedia
 License:        GPLv2+
@@ -17,6 +17,7 @@
 # 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 
@@ -46,10 +47,8 @@
 %patch1 -p0
 %endif
 %patch2 -p1
-# Enable patch for Boost >= 1.36 (F-11 and later only)
-#if 0%{?fedora} >= 11
-#patch3 -p1
-#endif
+%patch3 -p3
+
 
 %build
 cd platform/gtk-x11 && CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
@@ -95,6 +94,9 @@
 
 
 %changelog
+* Fri Feb 27 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.0-2
+- Add another upstream patch to fix patch on x86_64 (#487442)
+
 * Tue Feb 24 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.0-1
 - Update to upstream 2.0.
 - Add patches to use system libtorrent and fix download directory to