rpms/Miro/F-10 Miro-2.0-fhs.patch, NONE, 1.1 Miro-2.0-libtorrent.patch, NONE, 1.1 Miro-2.0-videodir.patch, NONE, 1.1 .cvsignore, 1.14, 1.15 Miro.spec, 1.44, 1.45 sources, 1.14, 1.15
Alex Lancaster
alexlan at fedoraproject.org
Wed Feb 25 07:30:38 UTC 2009
Author: alexlan
Update of /cvs/extras/rpms/Miro/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16142
Modified Files:
.cvsignore Miro.spec sources
Added Files:
Miro-2.0-fhs.patch Miro-2.0-libtorrent.patch
Miro-2.0-videodir.patch
Log Message:
* 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
~/Videos/Miro
Miro-2.0-fhs.patch:
--- NEW FILE Miro-2.0-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-libtorrent.patch:
--- NEW FILE Miro-2.0-libtorrent.patch ---
Index: platform/gtk-x11/setup.py
===================================================================
--- platform/gtk-x11/setup.py (revision 9167)
+++ platform/gtk-x11/setup.py (working copy)
@@ -362,8 +362,8 @@
try:
ret = parse_pkg_config("pkg-config", "libtorrent-rasterbar")
import libtorrent
- if hasattr(libtorrent, "version_minor") and libtorrent.version_minor >= 14:
- libtorrent_installed = True
+ # if hasattr(libtorrent, "version_minor") and libtorrent.version_minor >= 14:
+ libtorrent_installed = True
except RuntimeError:
print "libtorrent-rasterbar not installed on this system."
except ImportError:
Index: portable/dl_daemon/download.py
===================================================================
--- portable/dl_daemon/download.py (revision 9167)
+++ portable/dl_daemon/download.py (working copy)
@@ -845,7 +845,8 @@
self.torrent.resume()
else:
self.torrent = torrentSession.session.add_torrent(torrent_info, name, None, lt.storage_mode_t.storage_mode_allocate)
- self.torrent.auto_managed(False)
+ if lt.version_minor >= 14:
+ self.torrent.auto_managed(False)
except (SystemExit, KeyboardInterrupt):
raise
except:
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')
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Miro/F-10/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore 21 Dec 2008 04:57:02 -0000 1.14
+++ .cvsignore 25 Feb 2009 07:30:07 -0000 1.15
@@ -1 +1 @@
-Miro-1.2.8.tar.gz
+Miro-2.0.tar.gz
Index: Miro.spec
===================================================================
RCS file: /cvs/extras/rpms/Miro/F-10/Miro.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- Miro.spec 4 Feb 2009 19:03:19 -0000 1.44
+++ Miro.spec 25 Feb 2009 07:30:08 -0000 1.45
@@ -4,24 +4,29 @@
%define gecko_ver 1.9.0.6
Name: Miro
-Version: 1.2.8
-Release: 2%{?dist}
+Version: 2.0
+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-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
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
+BuildRequires: rb_libtorrent-devel rb_libtorrent-python
Requires: gecko-libs = %{gecko_ver} gnome-python2-gtkmozembed
-Requires: gnome-python2-gconf dbus-python
+Requires: gnome-python2-gconf dbus-python
+Requires: rb_libtorrent-python
Provides: Democracy = %{version}-%{release}
Obsoletes: Democracy < 1.0
@@ -37,12 +42,14 @@
# Otherwise, the unpatched files get re-added into Miro
# (and '.' breaks Python imports)
%patch0 -p1
-%patch1 -p1
+%if 0%{?fedora} < 11
+%patch1 -p0
+%endif
%patch2 -p1
# Enable patch for Boost >= 1.36 (F-11 and later only)
-%if 0%{?fedora} >= 11
-%patch3 -p1
-%endif
+#if 0%{?fedora} >= 11
+#patch3 -p1
+#endif
%build
cd platform/gtk-x11 && CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
@@ -74,6 +81,7 @@
%defattr(-,root,root,-)
%{_bindir}/*
%{_libexecdir}/xine_extractor
+%exclude %{_datadir}/miro/resources/testdata
%{_datadir}/miro
%{_datadir}/pixmaps/*
%{_datadir}/applications/*.desktop
@@ -87,6 +95,11 @@
%changelog
+* 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
+ ~/Videos/Miro
+
* Wed Feb 04 2009 Christopher Aillon <caillon at redhat.com> - 1.2.8-2
- Rebuild against newer gecko
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Miro/F-10/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources 21 Dec 2008 04:57:02 -0000 1.14
+++ sources 25 Feb 2009 07:30:08 -0000 1.15
@@ -1 +1 @@
-b468a953014272095171303ba3f0745d Miro-1.2.8.tar.gz
+6caef78badb3a68d3a5a1ffe16a5eeb5 Miro-2.0.tar.gz
More information about the fedora-extras-commits
mailing list