rpms/Miro/F-9 Miro-2.0-videodir.patch, NONE, 1.1 Miro-2.0.2-fhs.patch, NONE, 1.1 Miro-2.0.3-disable-xine-hack.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 Miro.spec, 1.40, 1.41 sources, 1.12, 1.13 Miro-1.1-utf8.patch, 1.1, NONE Miro-1.2.6-boost.patch, 1.1, NONE Miro-gcc43.patch, 1.3, NONE Miro-xulrunner.patch, 1.4, NONE dbus.patch, 1.1, NONE

[Alex Lancaster]

Author: alexlan

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

Modified Files:
	.cvsignore Miro.spec sources 
Added Files:
	Miro-2.0-videodir.patch Miro-2.0.2-fhs.patch 
	Miro-2.0.3-disable-xine-hack.patch 
Removed Files:
	Miro-1.1-utf8.patch Miro-1.2.6-boost.patch Miro-gcc43.patch 
	Miro-xulrunner.patch dbus.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-videodir.patch:

--- NEW FILE Miro-2.0-videodir.patch ---
--- Miro-2.0/platform/gtk-x11/plat/config.py.videodir	2009-02-09 23:34:54.000000000 -0500
+++ Miro-2.0/platform/gtk-x11/plat/config.py	2009-02-15 23:27:14.803946070 -0500
@@ -112,7 +112,7 @@
     value = descriptor.default
 
     if descriptor == prefs.MOVIES_DIRECTORY:
-        value = os.path.expanduser('~/Movies/Miro')
+        value = os.path.expanduser('~/Videos/Miro')
 
     elif descriptor == prefs.NON_VIDEO_DIRECTORY:
         value = os.path.expanduser('~/Desktop')

Miro-2.0.2-fhs.patch:

--- NEW FILE Miro-2.0.2-fhs.patch ---
--- Miro-2.0/platform/gtk-x11/setup.py.fhs	2009-02-09 23:34:54.000000000 -0500
--- Miro-2.0/platform/gtk-x11/setup.py	2009-02-10 22:15:58.126123836 -0500
@@ -660,7 +660,7 @@
      [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')]),
 ]
 
--- Miro-2.0.2/platform/gtk-x11/plat/renderers/xinerenderer.py	2009-03-07 12:21:24.000000000 -0700
+++ Miro-2.0.2.modified/platform/gtk-x11/plat/renderers/xinerenderer.py	2009-03-09 02:06:25.000000000 -0700
@@ -214,8 +214,8 @@
         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.")
Only in Miro-2.0.2.modified/platform/gtk-x11/plat/renderers: xinerenderer.py~

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-9/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	29 Sep 2008 05:51:06 -0000	1.12
+++ .cvsignore	16 Mar 2009 09:42:52 -0000	1.13
@@ -1 +1 @@
-Miro-1.2.7.tar.gz
+Miro-2.0.3.tar.gz


Index: Miro.spec
===================================================================
RCS file: /cvs/extras/rpms/Miro/F-9/Miro.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- Miro.spec	6 Mar 2009 10:49:32 -0000	1.40
+++ Miro.spec	16 Mar 2009 09:42:52 -0000	1.41
@@ -4,24 +4,33 @@
 %define gecko_ver 1.9.0.7
 
 Name:           Miro
-Version:        1.2.7
-Release:        5%{?dist}
+Version:        2.0.3
+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}-1.1-utf8.patch
-Patch1:		%{name}-xulrunner.patch
-Patch2:		%{name}-gcc43.patch
-Patch3:         %{name}-1.2.6-boost.patch
+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} gnome-python2-gtkmozembed 
-Requires:       gnome-python2-gconf dbus-python 
+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
 
@@ -38,9 +47,8 @@
 # (and '.' breaks Python imports)
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-# Enable this once Boost 1.36 enters, post-F10
-#patch3 -p1
+%patch2 -p0
+
 
 %build
 cd platform/gtk-x11 && CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
@@ -72,6 +80,7 @@
 %defattr(-,root,root,-)
 %{_bindir}/*
 %{_libexecdir}/xine_extractor
+%exclude %{_datadir}/miro/resources/testdata
 %{_datadir}/miro
 %{_datadir}/pixmaps/*
 %{_datadir}/applications/*.desktop
@@ -85,6 +94,13 @@
 
 
 %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)
+- Add Requires: gstreamer-python (#489134)
+- Drop a lot of obsolete patches
+
 * Fri Mar 06 2009 Jan Horak <jhorak at redhat.com> - 1.2.7-5
 - Rebuild against newer gecko
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Miro/F-9/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	29 Sep 2008 05:51:06 -0000	1.12
+++ sources	16 Mar 2009 09:42:52 -0000	1.13
@@ -1 +1 @@
-b213dda4a347c9b648a28ea26c60f851  Miro-1.2.7.tar.gz
+d2defd8a689f9ea2d8852127f92201ca  Miro-2.0.3.tar.gz


--- Miro-1.1-utf8.patch DELETED ---


--- Miro-1.2.6-boost.patch DELETED ---


--- Miro-gcc43.patch DELETED ---


--- Miro-xulrunner.patch DELETED ---


--- dbus.patch DELETED ---