rpms/Miro/F-11 Miro-2.5.2-fhs.patch, NONE, 1.1 .cvsignore, 1.19, 1.20 Miro.spec, 1.58, 1.59 sources, 1.19, 1.20 Miro-2.0.2-fhs.patch, 1.1, NONE Miro-2.0.3-disable-xine-hack.patch, 1.1, NONE
alexlan
alexlan at fedoraproject.org
Wed Aug 19 07:26:03 UTC 2009
Author: alexlan
Update of /cvs/extras/rpms/Miro/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30806
Modified Files:
.cvsignore Miro.spec sources
Added Files:
Miro-2.5.2-fhs.patch
Removed Files:
Miro-2.0.2-fhs.patch Miro-2.0.3-disable-xine-hack.patch
Log Message:
- Update to latest upstream (2.5.2)
- Drop xine hack patch, now upstream
- Rebase remaining patches to 2.5.2 where necessary
- Include new icons in files list
Miro-2.5.2-fhs.patch:
plat/renderers/xinerenderer.py | 4 ++--
setup.py | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
--- NEW FILE Miro-2.5.2-fhs.patch ---
diff -up Miro-2.5.2/platform/gtk-x11/plat/renderers/xinerenderer.py.orig Miro-2.5.2/platform/gtk-x11/plat/renderers/xinerenderer.py
--- Miro-2.5.2/platform/gtk-x11/plat/renderers/xinerenderer.py.orig 2009-08-04 01:32:18.000000000 -0400
+++ Miro-2.5.2/platform/gtk-x11/plat/renderers/xinerenderer.py 2009-08-04 01:36:20.000000000 -0400
@@ -247,8 +247,8 @@ class AudioRenderer(Renderer):
Renderer.on_eos(self)
def movie_data_program_info(movie_path, thumbnail_path):
- if os.path.exists(resources.path('../../../lib/miro/xine_extractor')):
- path = resources.path('../../../lib/miro/xine_extractor')
+ if os.path.exists(resources.path('/usr/libexec/xine_extractor')):
+ path = resources.path('/usr/libexec/xine_extractor')
return ((path, movie_path, thumbnail_path), None)
else:
logging.error("xine_extractor cannot be found.")
diff -up Miro-2.5.2/platform/gtk-x11/setup.py.orig Miro-2.5.2/platform/gtk-x11/setup.py
--- Miro-2.5.2/platform/gtk-x11/setup.py.orig 2009-08-04 01:32:05.000000000 -0400
+++ Miro-2.5.2/platform/gtk-x11/setup.py 2009-08-04 01:35:39.000000000 -0400
@@ -673,7 +673,7 @@ data_files += [
[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')]),
]
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Miro/F-11/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore 1 Jul 2009 21:33:08 -0000 1.19
+++ .cvsignore 19 Aug 2009 07:26:02 -0000 1.20
@@ -1 +1 @@
-Miro-2.0.5.tar.gz
+Miro-2.5.2.tar.gz
Index: Miro.spec
===================================================================
RCS file: /cvs/extras/rpms/Miro/F-11/Miro.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- Miro.spec 3 Aug 2009 23:04:53 -0000 1.58
+++ Miro.spec 19 Aug 2009 07:26:02 -0000 1.59
@@ -4,7 +4,7 @@
%define gecko_ver 1.9.1.2
Name: Miro
-Version: 2.0.5
+Version: 2.5.2
Release: 3%{?dist}
Summary: Miro - Internet TV Player
@@ -12,9 +12,8 @@ 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}-2.0.2-fhs.patch
+Patch0: %{name}-2.5.2-fhs.patch
Patch1: %{name}-2.0-videodir.patch
-Patch2: %{name}-2.0.3-disable-xine-hack.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python-devel xine-lib-devel Pyrex
@@ -48,7 +47,6 @@ releasing bug fixes on a regular basis.
# (and '.' breaks Python imports)
%patch0 -p1
%patch1 -p1
-%patch2 -p0
%build
@@ -83,6 +81,7 @@ update-desktop-database %{_datadir}/appl
%{_libexecdir}/xine_extractor
%exclude %{_datadir}/miro/resources/testdata
%{_datadir}/miro
+%{_datadir}/icons/hicolor/*/apps/*
%{_datadir}/pixmaps/*
%{_datadir}/applications/*.desktop
%{_mandir}/man1/*
@@ -95,10 +94,22 @@ update-desktop-database %{_datadir}/appl
%changelog
-* Mon Aug 03 2009 Christopher Aillon <caillon at redhat.com> - 2.0.5-3
+* Thu Aug 06 2009 Jan Horak <jhorak at redhat.com> - 2.5.2-3
- Rebuild against newer gecko
-* Fri Jul 17 2009 Jan Horak <jhorak at redhat.com> - 2.0.5-2
+* Tue Aug 04 2009 Jan Horak <jhorak at redhat.com> - 2.5.2-2
+- Rebuild against newer gecko
+
+* Tue Aug 4 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.5.2-1
+- Update to latest upstream (2.5.2)
+- Drop xine hack patch, now upstream
+- Rebase remaining patches to 2.5.2 where necessary
+- Include new icons in files list
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.5-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Sun Jul 19 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.0.5-2
- Rebuild against newer gecko
* Wed Jul 1 2009 Alex Lancaster <alexlan[AT]fedoraproject org> - 2.0.5-1
@@ -145,7 +156,7 @@ update-desktop-database %{_datadir}/appl
- rebuild with new openssl
* Tue Dec 23 2008 Caolán McNamara <caolanm at redhat.com> - 1.2.8-4
-- Rebuild against newer gecko 1.9.1.2
+- Rebuild against newer gecko 1.9.1
* Thu Dec 18 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 1.2.8-3
- Enable patch for new boost 1.37 for F-11+
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Miro/F-11/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources 1 Jul 2009 21:33:08 -0000 1.19
+++ sources 19 Aug 2009 07:26:02 -0000 1.20
@@ -1 +1 @@
-bb589058844b441c8f0bd0b79532ca87 Miro-2.0.5.tar.gz
+e4e6a6979949c001ab06e813db7da06f Miro-2.5.2.tar.gz
--- Miro-2.0.2-fhs.patch DELETED ---
--- Miro-2.0.3-disable-xine-hack.patch DELETED ---
More information about the scm-commits
mailing list