rpms/Miro/F-9 Miro-1.2.6-boost.patch, NONE, 1.1 sources, 1.11, 1.12 Miro.spec, 1.34, 1.35 .cvsignore, 1.11, 1.12

[Alex Lancaster]

Author: alexlan

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

Modified Files:
	sources Miro.spec .cvsignore 
Added Files:
	Miro-1.2.6-boost.patch 
Log Message:
- Update to 1.2.7
- Sync .spec file with rawhide branch.


Miro-1.2.6-boost.patch:

--- NEW FILE Miro-1.2.6-boost.patch ---
--- Miro-1.2.6/portable/libtorrent/include/libtorrent/disk_io_thread.hpp.boost	2008-08-15 00:50:40.000000000 -0400
+++ Miro-1.2.6/portable/libtorrent/include/libtorrent/disk_io_thread.hpp	2008-08-22 18:52:56.000000000 -0400
@@ -37,6 +37,7 @@
 #include "libtorrent/storage.hpp"
 #include <boost/thread/thread.hpp>
 #include <boost/function.hpp>
+#include <boost/thread/condition.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/bind.hpp>
 #include <boost/pool/pool.hpp>
--- Miro-1.2.6/portable/libtorrent/src/torrent_info.cpp.boost	2008-08-15 00:50:41.000000000 -0400
+++ Miro-1.2.6/portable/libtorrent/src/torrent_info.cpp	2008-08-22 18:06:31.000000000 -0400
@@ -352,7 +352,7 @@
 		fs::path tmp = m_name;
 		if (tmp.is_complete()) throw std::runtime_error("torrent contains "
 			"a file with an absolute path: '" + m_name + "'");
-		if (tmp.has_branch_path()) throw std::runtime_error(
+		if (tmp.has_parent_path()) throw std::runtime_error(
 			"torrent contains name with directories: '" + m_name + "'");
 	
 		// extract file list
@@ -556,7 +556,7 @@
 	{
 //		TORRENT_ASSERT(file.begin() != file.end());
 
-		if (!file.has_branch_path())
+		if (!file.has_parent_path())
 		{
 			// you have already added at least one file with a
 			// path to the file (branch_path), which means that
@@ -644,7 +644,7 @@
 					fs::path const* file_path;
 					if (i->orig_path) file_path = &(*i->orig_path);
 					else file_path = &i->path;
-					TORRENT_ASSERT(file_path->has_branch_path());
+					TORRENT_ASSERT(file_path->has_parent_path());
 					TORRENT_ASSERT(*file_path->begin() == m_name);
 
 					for (fs::path::iterator j = boost::next(file_path->begin());


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Miro/F-9/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	18 Jun 2008 04:27:45 -0000	1.11
+++ sources	29 Sep 2008 05:51:06 -0000	1.12
@@ -1 +1 @@
-0bb345164b1b6f79ed60f5aab891385f  Miro-1.2.4.tar.gz
+b213dda4a347c9b648a28ea26c60f851  Miro-1.2.7.tar.gz


Index: Miro.spec
===================================================================
RCS file: /cvs/extras/rpms/Miro/F-9/Miro.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- Miro.spec	24 Sep 2008 06:17:19 -0000	1.34
+++ Miro.spec	29 Sep 2008 05:51:06 -0000	1.35
@@ -1,11 +1,11 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-%define gecko_ver 1.9
+%define gecko_ver 1.9.0.2
 
 Name:           Miro
-Version:        1.2.4
-Release:        3%{?dist}
+Version:        1.2.7
+Release:        1%{?dist}
 Summary:        Miro - Internet TV Player
 Group:          Applications/Multimedia
 License:        GPLv2+
@@ -14,12 +14,13 @@
 Patch0:         %{name}-1.1-utf8.patch
 Patch1:		%{name}-xulrunner.patch
 Patch2:		%{name}-gcc43.patch
+Patch3:         %{name}-1.2.6-boost.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:  gecko-devel-unstable = %{gecko_ver} gettext gtk2-devel
 
-Requires:       gecko-libs >= %{gecko_ver} gnome-python2-gtkmozembed 
+Requires:       gecko-libs = %{gecko_ver} gnome-python2-gtkmozembed 
 Requires:       gnome-python2-gconf dbus-python 
 Provides:       Democracy = %{version}-%{release}
 Obsoletes:      Democracy < 1.0
@@ -32,9 +33,14 @@
 
 %prep
 %setup -q -n %{name}-%{version}
+# Intentionally not using -b .<descr> :
+# Otherwise, the unpatched files get re-added into Miro
+# (and '.' breaks Python imports)
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+# Enable this once Boost 1.36 enters, post-F10
+#patch3 -p1
 
 %build
 cd platform/gtk-x11 && CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
@@ -79,11 +85,31 @@
 
 
 %changelog
-* Wed Sep 24 2008 Christopher Aillon <caillon at redhat.com> - 1.2.4-3
-- Rebuild against newer gecko
+* Sun Sep 28 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.2.7-1
+- Update to 1.2.7
+- Rebuild against gecko-libs 1.9.0.2 (#464205)
+
+* Fri Aug 22 2008 Michel Alexandre Salim <salimma at fedoraproject.org> - 1.2.6-3
+- Do not create backup files when patching; the backup files get re-added during the build process
+
+* Fri Aug 22 2008 Michel Salim <salimma at fedoraproject.org> - 1.2.6-2
+- Unapply boost patch; boost-1.36 has been backed out for F10
+
+* Fri Aug 22 2008 Michel Salim <salimma at fedoraproject.org> - 1.2.6-1
+- Update to 1.2.6
+- Patch for boost API change
+
+* Tue Aug 12 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.2.4-4
+- Rebuild for new boost (fixes broken deps).
+
+* Sat Jul 19 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.2.4-3
+- Rebuild for xulrunner-1.9.0.1
+- Unfortunately we probably need to make this an exact match because
+  Miro uses the unstable API, so a rebuild may need to be done on every
+  package update to be sure that it will work with new xulrunner updates
 
-* Fri Jul 18 2008 Paul W. Frields <stickster at gmail.com> - 1.2.4-2
-- Rebuild against xulrunner and fix dependencies
+* Wed Jun 18 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.2.4-2
+- Rebuild for xulrunner-1.9 final.
 
 * Sun Jun 15 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.2.4-1
 - Update to latest upstream (1.2.4)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Miro/F-9/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	18 Jun 2008 04:27:45 -0000	1.11
+++ .cvsignore	29 Sep 2008 05:51:06 -0000	1.12
@@ -1 +1 @@
-Miro-1.2.4.tar.gz
+Miro-1.2.7.tar.gz