rpms/Miro/devel Miro-1.1-utf8.patch,NONE,1.1 Miro.spec,1.17,1.18

Sat Jan 26 10:17:35 UTC 2008

Author: alexlan

Update of /cvs/extras/rpms/Miro/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3703

Modified Files:
	Miro.spec 
Added Files:
	Miro-1.1-utf8.patch 
Log Message:
* Fri Jan 25 2008 Michel Salim <michel.sylvan at gmail.com> - 1.1-2
- Fix charset mismatch in download window
- Remove shebangs from scripts
- Sanitize end-of-line markers


Miro-1.1-utf8.patch:

--- NEW FILE Miro-1.1-utf8.patch ---
--- Miro-1.1/resources/templates/download.orig	2008-01-10 14:56:08.000000000 -0500
+++ Miro-1.1/resources/templates/download	2008-01-25 20:52:41.000000000 -0500
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml"
       eventCookie="@@@eventCookie@@@" dtvPlatform="@@@dtvPlatform@@@">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 
 <link href="resource:css/main.css" rel="stylesheet" type="text/css" />
 <link href="resource:css/download.css" rel="stylesheet" type="text/css" />


Index: Miro.spec
===================================================================
RCS file: /cvs/extras/rpms/Miro/devel/Miro.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Miro.spec	18 Jan 2008 02:47:09 -0000	1.17
+++ Miro.spec	26 Jan 2008 10:17:00 -0000	1.18
@@ -5,21 +5,23 @@
 
 Name:           Miro
 Version:        1.1
-Release:        1%{?dist}
+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:		Miro-xulrunner.patch
+Patch0:         %{name}-1.1-utf8.patch
+Patch1:		Miro-xulrunner.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  python-devel xine-lib-devel Pyrex 
 BuildRequires:  boost-devel qt-devel pygtk2-devel libXcursor-devel libXv-devel openssl-devel
 BuildRequires:  gecko-devel-unstable = %{gecko_ver} gettext libXfixes-devel gtk2-devel
 
-Requires:	gecko-libs = %{gecko_ver} xine-lib gnome-python2-gtkmozembed 
-Requires:	gnome-python2-gconf dbus-python 
-Obsoletes:	Democracy
+Requires:       gecko-libs = %{gecko_ver} xine-lib gnome-python2-gtkmozembed 
+Requires:       gnome-python2-gconf dbus-python 
+Provides:       Democracy = %{version}-%{release}
+Obsoletes:      Democracy < 1.0
 
 %description
 Miro is a free application that turns your computer into an
@@ -30,6 +32,7 @@
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 cd platform/gtk-x11 && CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
@@ -38,7 +41,12 @@
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}%{_defaultdocdir}/%{name}-%{version}
-cd platform/gtk-x11 && %{__python} setup.py install -O1 --skip-build --root %{buildroot}
+# 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}
 %find_lang miro
 
  
@@ -69,6 +77,11 @@
 
 
 %changelog
+* Fri Jan 25 2008 Michel Salim <michel.sylvan at gmail.com> - 1.1-2
+- Fix charset mismatch in download window
+- Remove shebangs from scripts
+- Sanitize end-of-line markers
+
 * Thu Jan 17 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.1-1
 - Update to upstream 1.1 release
 - BuildRequires: gecko-devel-unstable, openssl-devel


