rpms/Miro/devel Miro-2.0-fhs-changeset_r9243.patch, NONE, 1.1 Miro.spec, 1.48, 1.49
Alex Lancaster
alexlan at fedoraproject.org
Fri Feb 27 09:30:39 UTC 2009
Author: alexlan
Update of /cvs/extras/rpms/Miro/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26571
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-4
- 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/devel/Miro.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- Miro.spec 23 Feb 2009 22:01:58 -0000 1.48
+++ Miro.spec 27 Feb 2009 09:30:09 -0000 1.49
@@ -5,7 +5,7 @@
Name: Miro
Version: 2.0
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Miro - Internet TV Player
Group: Applications/Multimedia
@@ -18,6 +18,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
@@ -47,10 +48,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
@@ -96,6 +95,9 @@
%changelog
+* Fri Feb 27 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.0-4
+- Add another upstream patch to fix patch on x86_64 (#487442)
+
* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
More information about the fedora-extras-commits
mailing list