rpms/Miro/devel Miro-2.0.2-fhs.patch, NONE, 1.1 .cvsignore, 1.15, 1.16 Miro.spec, 1.50, 1.51 sources, 1.15, 1.16 Miro-2.0-fhs.patch, 1.2, NONE

[Alex Lancaster]

Author: alexlan

Update of /cvs/extras/rpms/Miro/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13126

Modified Files:
	.cvsignore Miro.spec sources 
Added Files:
	Miro-2.0.2-fhs.patch 
Removed Files:
	Miro-2.0-fhs.patch 
Log Message:
* 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)
- Drop patch for libtorrent 0.13, applied upstream


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~


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Miro/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	16 Feb 2009 05:05:32 -0000	1.15
+++ .cvsignore	9 Mar 2009 09:47:17 -0000	1.16
@@ -1 +1 @@
-Miro-2.0.tar.gz
+Miro-2.0.2.tar.gz


Index: Miro.spec
===================================================================
RCS file: /cvs/extras/rpms/Miro/devel/Miro.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- Miro.spec	27 Feb 2009 14:06:07 -0000	1.50
+++ Miro.spec	9 Mar 2009 09:47:17 -0000	1.51
@@ -4,20 +4,16 @@
 %define gecko_ver 1.9.1
 
 Name:           Miro
-Version:        2.0
-Release:        5%{?dist}
+Version:        2.0.2
+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}-2.0-fhs.patch
-# Patch to allow use of libtorrent 0.13
-# http://bugzilla.pculture.org/show_bug.cgi?id=11385
-# Drop this when updating to 2.0.1
-Patch1:         %{name}-2.0-libtorrent.patch
-Patch2:         %{name}-2.0-videodir.patch
+Patch0:         %{name}-2.0.2-fhs.patch
+Patch1:         %{name}-2.0-videodir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel xine-lib-devel Pyrex 
@@ -25,9 +21,12 @@
 BuildRequires:  gecko-devel-unstable = %{gecko_ver} gettext gtk2-devel
 BuildRequires:  rb_libtorrent-devel rb_libtorrent-python
 
-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
 Requires:       rb_libtorrent-python
+Requires:       gstreamer-python
 Provides:       Democracy = %{version}-%{release}
 Obsoletes:      Democracy < 1.0
 
@@ -43,10 +42,7 @@
 # Otherwise, the unpatched files get re-added into Miro
 # (and '.' breaks Python imports)
 %patch0 -p1
-%if 0%{?fedora} < 11
-%patch1 -p0
-%endif
-%patch2 -p1
+%patch1 -p1
 
 
 %build
@@ -93,6 +89,11 @@
 
 
 %changelog
+* 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)
+- Drop patch for libtorrent 0.13, applied upstream
+
 * Fri Feb 27 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.0-5
 - Combine the fhs patches into one, and fix the path to
   /usr/libexec/xine_extractor (#487442)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Miro/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	16 Feb 2009 05:05:32 -0000	1.15
+++ sources	9 Mar 2009 09:47:17 -0000	1.16
@@ -1 +1 @@
-6caef78badb3a68d3a5a1ffe16a5eeb5  Miro-2.0.tar.gz
+ac72878d2faa0f62f96aca2e6d229cb9  Miro-2.0.2.tar.gz


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