rpms/Miro/F-7 Miro.spec,1.10,1.11

[Alex Lancaster (alexlan)]

Author: alexlan

Update of /cvs/extras/rpms/Miro/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21676

Modified Files:
	Miro.spec 
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

Also some other minor spec file cleanups.



Index: Miro.spec
===================================================================
RCS file: /cvs/extras/rpms/Miro/F-7/Miro.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Miro.spec	18 Jan 2008 03:28:12 -0000	1.10
+++ Miro.spec	27 Jan 2008 06:22:36 -0000	1.11
@@ -5,20 +5,22 @@
 
 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
+Source0:        http://ftp.osuosl.org/pub/pculture.org/miro/src/%{name}-%{version}.tar.gz
+Patch0:         %{name}-1.1-utf8.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 = %{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
@@ -28,6 +30,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0 -p1
 
 %build
 cd platform/gtk-x11 && CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
@@ -36,7 +39,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
 
  
@@ -59,46 +67,54 @@
 %{_datadir}/applications/*.desktop
 %{_mandir}/man1/*
 %{_datadir}/mime/packages/*.xml
+%if 0%{?fedora} >= 9
+%{python_sitearch}/*egg-info
+%endif
 %{python_sitearch}/miro/
 %doc README license.txt CREDITS 
 
 
 %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
 - Add BuildRequires: openssl-devel
 
-* Mon Nov 26 2007 Alex Lancaster <alexlan at fedoraproject.org> 1.0-2
+* Mon Nov 26 2007 Alex Lancaster <alexlan[AT]fedoraproject org> 1.0-2
 - Build against gecko-libs 1.8.1.10 (firefox 2.0.0.10)
 
-* Fri Nov 16 2007 Alex Lancaster <alexlan at fedoraproject.org> 1.0-1
+* Fri Nov 16 2007 Alex Lancaster <alexlan[AT]fedoraproject org> 1.0-1
 - Update to latest upstream (1.0).
 
-* Fri Nov 09 2007 Alex Lancaster <alexlan at fedoraproject.org> 0.9.9.9-1
+* Fri Nov 09 2007 Alex Lancaster <alexlan[AT]fedoraproject org> 0.9.9.9-1
 - Update to latest upstream (0.9.9.9)
 - Build against gecko-libs 1.8.1.9 (firefox 2.0.0.9)
 - Include xine_extractor in package (thanks to Jason Farrell)
 - Drop Miro-setup.py.patch
 
-* Thu Nov 01 2007 Alex Lancaster <alexlan at fedoraproject.org> 0.9.9.1-6
+* Thu Nov 01 2007 Alex Lancaster <alexlan[AT]fedoraproject org> 0.9.9.1-6
 - Update patch with workaround suggested on:
   http://bugzilla.pculture.org/show_bug.cgi?id=8579
 
-* Wed Oct 31 2007 Alex Lancaster <alexlan at fedoraproject.org> 0.9.9.1-5
+* Wed Oct 31 2007 Alex Lancaster <alexlan[AT]fedoraproject org> 0.9.9.1-5
 - Add setup.py patch to ignore call to svn.
 
-* Tue Oct 30 2007 Alex Lancaster <alexlan at fedoraproject.org> 0.9.9.1-3
+* Tue Oct 30 2007 Alex Lancaster <alexlan[AT]fedoraproject org> 0.9.9.1-3
 - Add BuildRequires: libXv-devel
 - Drop dbus patch
 
-* Sun Oct 28 2007 Alex Lancaster <alexlan at fedoraproject.org> 0.9.9.1-1
+* Sun Oct 28 2007 Alex Lancaster <alexlan[AT]fedoraproject org> 0.9.9.1-1
 - Update to latest upstream (0.9.9.1)
 
-* Fri Oct 26 2007 Alex Lancaster <alexlan at fedoraproject.org> 0.9.8.1-8
+* Fri Oct 26 2007 Alex Lancaster <alexlan[AT]fedoraproject org> 0.9.8.1-8
 - Replace Requires and BuildRequires for firefox with gecko to 
   smooth eventual xulrunner transition 
 
-* Thu Oct 25 2007 Alex Lancaster <alexlan at fedoraproject.org> 0.9.8.1-7
+* Thu Oct 25 2007 Alex Lancaster <alexlan[AT]fedoraproject org> 0.9.8.1-7
 - Rebuild for new Firefox (2.0.0.8)
 - License: GPLv2+ to conform with Fedora licensing guidelines