rpms/Miro/devel Miro-2.0-fhs.patch, NONE, 1.1 Miro-2.0-libtorrent.patch, NONE, 1.1 .cvsignore, 1.14, 1.15 Miro.spec, 1.46, 1.47 sources, 1.14, 1.15 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
Michel Alexandre Salim
salimma at fedoraproject.org
Mon Feb 16 05:06:03 UTC 2009
Author: salimma
Update of /cvs/pkgs/rpms/Miro/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3994
Modified Files:
.cvsignore Miro.spec sources
Added Files:
Miro-2.0-fhs.patch Miro-2.0-libtorrent.patch
Removed Files:
Miro-1.1-utf8.patch Miro-1.2.6-boost.patch Miro-gcc43.patch
Miro-xulrunner.patch dbus.patch
Log Message:
* Mon Feb 16 2009 Michel Salim <salimma at fedoraproject.org> - 2.0-2
- Use system libtorrent >= 0.13
- Do not ship testdata
- Switch default download directory to ~/Videos/Miro
* Tue Feb 10 2009 Michel Salim <salimma at fedoraproject.org> - 2.0-1
- Update to 2.0
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:
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/Miro/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore 3 Dec 2008 23:34:21 -0000 1.14
+++ .cvsignore 16 Feb 2009 05:05:32 -0000 1.15
@@ -1 +1 @@
-Miro-1.2.8.tar.gz
+Miro-2.0.tar.gz
Index: Miro.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Miro/devel/Miro.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- Miro.spec 17 Jan 2009 15:10:13 -0000 1.46
+++ Miro.spec 16 Feb 2009 05:05:32 -0000 1.47
@@ -4,24 +4,30 @@
%define gecko_ver 1.9.1
Name: Miro
-Version: 1.2.8
-Release: 5%{?dist}
+Version: 2.0
+Release: 2%{?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 +43,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 +82,7 @@
%defattr(-,root,root,-)
%{_bindir}/*
%{_libexecdir}/xine_extractor
+%exclude %{_datadir}/miro/resources/testdata
%{_datadir}/miro
%{_datadir}/pixmaps/*
%{_datadir}/applications/*.desktop
@@ -87,6 +96,14 @@
%changelog
+* Mon Feb 16 2009 Michel Salim <salimma at fedoraproject.org> - 2.0-2
+- Use system libtorrent >= 0.13
+- Do not ship testdata
+- Switch default download directory to ~/Videos/Miro
+
+* Tue Feb 10 2009 Michel Salim <salimma at fedoraproject.org> - 2.0-1
+- Update to 2.0
+
* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 1.2.8-5
- rebuild with new openssl
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/Miro/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources 3 Dec 2008 23:34:21 -0000 1.14
+++ sources 16 Feb 2009 05:05:32 -0000 1.15
@@ -1 +1 @@
-b468a953014272095171303ba3f0745d Miro-1.2.8.tar.gz
+6caef78badb3a68d3a5a1ffe16a5eeb5 Miro-2.0.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 ---
More information about the fedora-extras-commits
mailing list