[Miro/f12/master] - Update to 3.5

[Michel Alexandre Salim]

commit 4ab2c61bab67871931d2cfc1595f2bc8ad7ee008
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Sat Nov 6 16:55:10 2010 +0100

    - Update to 3.5

 .gitignore                    |    3 +--
 Miro-2.0-videodir.patch       |   11 -----------
 Miro.spec                     |   37 +++++++++++++------------------------
 miro-3.0.3-checkdisplay.patch |   16 ----------------
 sources                       |    2 +-
 5 files changed, 15 insertions(+), 54 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4a7cdd8..187b26e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-miro-3.0.2.tar.gz
-/miro-3.0.3.tar.gz
+/miro-3.5.tar.gz
diff --git a/Miro.spec b/Miro.spec
index b289aaa..15748cc 100644
--- a/Miro.spec
+++ b/Miro.spec
@@ -2,21 +2,16 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           Miro
-Version:        3.0.3
-Release:        2%{?dist}
+Version:        3.5
+Release:        1%{?dist}
 Summary:        Internet TV Player
 
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://www.getmiro.com/
 Source0:        http://ftp.osuosl.org/pub/pculture.org/miro/src/miro-%{version}.tar.gz
-# http://bugzilla.pculture.org/show_bug.cgi?id=13312
-Patch0:         %{name}-2.0-videodir.patch
-# http://bugzilla.pculture.org/show_bug.cgi?id=14610
-Patch1:         miro-3.0.3-checkdisplay.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  python-devel Pyrex gtk2-devel pygtk2-devel
+BuildRequires:  python-devel Pyrex pygtk2-devel webkitgtk-devel
 BuildRequires:  gettext
 #if 0%{?fedora} >= 11
 #BuildRequires:  rb_libtorrent-devel rb_libtorrent-python
@@ -25,9 +20,7 @@ BuildRequires:  gettext
 Requires:       pywebkitgtk
 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
@@ -40,31 +33,24 @@ their shows with them.
 
 %prep
 %setup -q -n miro-%{version}
+# Patches
 # Intentionally not using -b .<descr> :
 # Otherwise, the unpatched files get re-added into Miro
 # (and '.' breaks Python imports)
-%patch0 -p1
-%patch1 -p1
+# /Patches
+chmod -x resources/conversions/apple.conv
 
 
 %build
-cd platform/gtk-x11 && CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
+cd linux && CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
 
 
 %install
 rm -rf %{buildroot}
-mkdir -p %{buildroot}%{_defaultdocdir}/%{name}-%{version}
-# fix EOL
-sed -ie 's|\r$||g' CREDITS
-# remove shebangs from scripts
-cd platform/gtk-x11 && \
-  find build/lib* -name '*.py' -exec sed -i "1{/^#!/d}" {} \; && \
-  %{__python} setup.py install -O1 --skip-build --root %{buildroot}
+# mkdir -p %{buildroot}%{_defaultdocdir}/%{name}-%{version}
+cd linux &&  %{__python} setup.py install -O1 --skip-build --root %{buildroot}
 %find_lang miro
 
- 
-%clean
-rm -rf %{buildroot}
 
 %post
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@@ -83,7 +69,7 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
-%files -f platform/gtk-x11/miro.lang
+%files -f linux/miro.lang
 %defattr(-,root,root,-)
 %{_bindir}/*
 %exclude %{_datadir}/miro/resources/testdata
@@ -101,6 +87,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Sat Nov  6 2010 Michel Salim <salimma at fedoraproject.org> - 3.5-1
+- Update to 3.5
+
 * Mon Sep 20 2010 Michel Salim <salimma at fedoraproject.org> - 3.0.3-2
 - Catch exception when started without a valid DISPLAY (# 633999)
 
diff --git a/sources b/sources
index 6df5c93..03223d5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-851de31dce0baf07922a22b4d29cfeac  miro-3.0.3.tar.gz
+6e15d2d6ce086b0fe943a6cbea3c363c  miro-3.5.tar.gz