rpms/Miro/F-10 Miro-2.0.3-disable-xine-hack.patch, NONE, 1.1 .cvsignore, 1.16, 1.17 Miro.spec, 1.49, 1.50 sources, 1.16, 1.17

[Alex Lancaster]

Author: alexlan

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

Modified Files:
	.cvsignore Miro.spec sources 
Added Files:
	Miro-2.0.3-disable-xine-hack.patch 
Log Message:
F-9 branch:
- Update to upstream 2.0.3
- Add patch to disable xine-hack, hopefully fixes #480527
- Use internal 0.14 version of rb_libtorrent for < F-11 (#489755)
- Add Requires: gstreamer-python (#489134)
- Drop a lot of obsolete patches

F-10 and devel branch:
- Update to upstream 2.0.3
- Add patch to disable xine-hack, hopefully fixes #480527
- Use internal 0.14 version of rb_libtorrent for < F-11 (#489755)


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

--- NEW FILE Miro-2.0.3-disable-xine-hack.patch ---
--- platform/gtk-x11/setup.py.orig	2009-03-16 01:39:02.000000000 -0700
+++ platform/gtk-x11/setup.py	2009-03-16 01:39:27.000000000 -0700
@@ -38,7 +38,7 @@
 # It's probably best to leave this as True allowing the hack to be compiled
 # in, and tell users to enable/disable at the command line with the xine-xvhack
 # setting.
-USE_XINE_HACK = True
+USE_XINE_HACK = False
 
 
 # The following properties allow you to explicitly set xulrunner paths and


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Miro/F-10/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	9 Mar 2009 10:07:00 -0000	1.16
+++ .cvsignore	16 Mar 2009 09:42:51 -0000	1.17
@@ -1 +1 @@
-Miro-2.0.2.tar.gz
+Miro-2.0.3.tar.gz


Index: Miro.spec
===================================================================
RCS file: /cvs/extras/rpms/Miro/F-10/Miro.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- Miro.spec	9 Mar 2009 10:07:01 -0000	1.49
+++ Miro.spec	16 Mar 2009 09:42:52 -0000	1.50
@@ -4,7 +4,7 @@
 %define gecko_ver 1.9.0.7
 
 Name:           Miro
-Version:        2.0.2
+Version:        2.0.3
 Release:        1%{?dist}
 Summary:        Miro - Internet TV Player
 
@@ -14,18 +14,23 @@
 Source0:        http://ftp.osuosl.org/pub/pculture.org/miro/src/%{name}-%{version}.tar.gz
 Patch0:         %{name}-2.0.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 
 BuildRequires:  boost-devel pygtk2-devel libXv-devel openssl-devel
 BuildRequires:  gecko-devel-unstable = %{gecko_ver} gettext gtk2-devel
+%if 0%{?fedora} >= 11
 BuildRequires:  rb_libtorrent-devel rb_libtorrent-python
+%endif
 
 Requires:       gecko-libs = %{gecko_ver} 
 Requires:       gnome-python2-gtkmozembed 
 Requires:       gnome-python2-gconf
 Requires:       dbus-python
+%if 0%{?fedora} >= 11
 Requires:       rb_libtorrent-python
+%endif
 Requires:       gstreamer-python
 Provides:       Democracy = %{version}-%{release}
 Obsoletes:      Democracy < 1.0
@@ -43,6 +48,7 @@
 # (and '.' breaks Python imports)
 %patch0 -p1
 %patch1 -p1
+%patch2 -p0
 
 
 %build
@@ -89,6 +95,11 @@
 
 
 %changelog
+* Mon Mar 16 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.0.3-1
+- Update to upstream 2.0.3
+- Add patch to disable xine-hack, hopefully fixes #480527
+- Use internal 0.14 version of rb_libtorrent for < F-11 (#489755)
+
 * Mon Mar  9 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.0.2-1
 - Update to upstream 2.0.2
 - Add Requires: gstreamer-python (#489134)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Miro/F-10/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	9 Mar 2009 10:07:01 -0000	1.16
+++ sources	16 Mar 2009 09:42:52 -0000	1.17
@@ -1 +1 @@
-ac72878d2faa0f62f96aca2e6d229cb9  Miro-2.0.2.tar.gz
+d2defd8a689f9ea2d8852127f92201ca  Miro-2.0.3.tar.gz