[gpodder] Update to 2.12, see changelog in gpodder.spec
Ville-Pekka Vainio
vpv at fedoraproject.org
Sat Jan 15 22:26:11 UTC 2011
commit e20f23c4633ee82f7e3fcec7a8d8fdb088ef1c22
Author: Ville-Pekka Vainio <vpivaini at cs.helsinki.fi>
Date: Sun Jan 16 00:25:46 2011 +0200
Update to 2.12, see changelog in gpodder.spec
.gitignore | 1 +
gpodder-use-system-pymtp.patch | 16 ++++++++
...-68aa84c11c2e1f3cca2bf32b2465c644cfd4cc15.patch | 41 ++++++++++++++++++++
...-75d24ee16d4a9e65fa04a872ddf66117ff5ebdb5.patch | 26 ++++++++++++
...-b407353260c7b7dc12b8f68c97f96f2c3eb8738b.patch | 25 ------------
gpodder.spec | 35 ++++++++++++++--
sources | 2 +-
7 files changed, 115 insertions(+), 31 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6f19b25..e519c8b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
gpodder-2.7.tar.gz
/gpodder-2.8.tar.gz
+/gpodder-2.12.tar.gz
diff --git a/gpodder-use-system-pymtp.patch b/gpodder-use-system-pymtp.patch
new file mode 100644
index 0000000..eac5ee9
--- /dev/null
+++ b/gpodder-use-system-pymtp.patch
@@ -0,0 +1,16 @@
+diff -Naur gpodder-2.9.orig/src/gpodder/sync.py gpodder-2.9/src/gpodder/sync.py
+--- gpodder-2.9.orig/src/gpodder/sync.py 2010-09-27 01:27:53.000000000 +0300
++++ gpodder-2.9/src/gpodder/sync.py 2010-10-14 14:26:41.136458094 +0300
+@@ -45,10 +45,10 @@
+
+ pymtp_available = True
+ try:
+- import gpodder.gpopymtp as pymtp
++ import pymtp
+ except:
+ pymtp_available = False
+- log('(gpodder.sync) Could not load gpopymtp (libmtp not installed?).')
++ log('(gpodder.sync) Could not load pymtp (libmtp not installed?).')
+
+ try:
+ import eyeD3
diff --git a/gpodder.git-68aa84c11c2e1f3cca2bf32b2465c644cfd4cc15.patch b/gpodder.git-68aa84c11c2e1f3cca2bf32b2465c644cfd4cc15.patch
new file mode 100644
index 0000000..d30fbb2
--- /dev/null
+++ b/gpodder.git-68aa84c11c2e1f3cca2bf32b2465c644cfd4cc15.patch
@@ -0,0 +1,41 @@
+From 68aa84c11c2e1f3cca2bf32b2465c644cfd4cc15 Mon Sep 17 00:00:00 2001
+From: Thomas Perl <m at thp.io>
+Date: Wed, 12 Jan 2011 13:23:23 +0100
+Subject: [PATCH] Handle failed feed updates in "gpo" (bug 1264)
+
+Thanks to Ville-Pekka Vainio for reporting this bug.
+---
+ bin/gpo | 14 ++++++++++----
+ 1 files changed, 10 insertions(+), 4 deletions(-)
+
+diff --git a/bin/gpo b/bin/gpo
+index d0b7599..96faf5f 100755
+--- a/bin/gpo
++++ b/bin/gpo
+@@ -213,13 +213,19 @@ class gPodderCli(object):
+ for podcast in self.client.get_podcasts():
+ if url is None and podcast.update_enabled():
+ self._start_action('Updating %s', podcast.title)
+- podcast.update()
+- self._finish_action()
++ try:
++ podcast.update()
++ self._finish_action()
++ except Exception, e:
++ self._finish_action(False)
+ elif podcast.url == url:
+ # Don't need to check for update_enabled()
+ self._start_action('Updating %s', podcast.title)
+- podcast.update()
+- self._finish_action()
++ try:
++ podcast.update()
++ self._finish_action()
++ except Exception, e:
++ self._finish_action(False)
+
+ return True
+
+--
+1.6.5.GIT
+
diff --git a/gpodder.git-75d24ee16d4a9e65fa04a872ddf66117ff5ebdb5.patch b/gpodder.git-75d24ee16d4a9e65fa04a872ddf66117ff5ebdb5.patch
new file mode 100644
index 0000000..3220e1f
--- /dev/null
+++ b/gpodder.git-75d24ee16d4a9e65fa04a872ddf66117ff5ebdb5.patch
@@ -0,0 +1,26 @@
+From 75d24ee16d4a9e65fa04a872ddf66117ff5ebdb5 Mon Sep 17 00:00:00 2001
+From: Thomas Perl <m at thp.io>
+Date: Wed, 12 Jan 2011 13:19:26 +0100
+Subject: [PATCH] Fix broken YouTube search (Maemo bug 11756)
+
+Thanks to Stuart Howarth for reporting the bug.
+---
+ src/gpodder/youtube.py | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/gpodder/youtube.py b/src/gpodder/youtube.py
+index deb7fc8..ba65529 100644
+--- a/src/gpodder/youtube.py
++++ b/src/gpodder/youtube.py
+@@ -175,7 +175,7 @@ def find_youtube_channels(string):
+ r = re.compile('>\s+<')
+ data = r.sub('><', util.urlopen(url).read())
+
+- r1 = re.compile('<a href="/user/([^"]+)"[^>]*>([^<]+)</a>')
++ r1 = re.compile('<a href="/user/([^"?]+)[^"]+"[^>]*>([^<]+)</a>')
+ m1 = r1.findall(data)
+
+ r2 = re.compile('\s+')
+--
+1.6.5.GIT
+
diff --git a/gpodder.spec b/gpodder.spec
index 5d73d81..b08ee98 100644
--- a/gpodder.spec
+++ b/gpodder.spec
@@ -2,16 +2,19 @@
Name: gpodder
-Version: 2.8
-Release: 2%{?dist}
+Version: 2.12
+Release: 1%{?dist}
Summary: Podcast receiver/catcher written in Python
Group: Applications/Multimedia
License: GPLv3
URL: http://gpodder.berlios.de/
Source0: http://download.berlios.de/%{name}/%{name}-%{version}.tar.gz
-# rhbz #638107
-Patch0: gpodder.git-b407353260c7b7dc12b8f68c97f96f2c3eb8738b.patch
+Patch0: gpodder-use-system-pymtp.patch
+# Handle failed feed updates in "gpo" (gPodder bug 1264)
+Patch1: gpodder.git-68aa84c11c2e1f3cca2bf32b2465c644cfd4cc15.patch
+# Fix broken YouTube search (Maemo bug 11756)
+Patch2: gpodder.git-75d24ee16d4a9e65fa04a872ddf66117ff5ebdb5.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: python-devel, python-feedparser, python-mygpoclient >= 1.4
@@ -23,7 +26,7 @@ Requires: pygtk2 pygtk2-libglade
Requires: python-gpod, python-eyed3, python-feedparser
Requires: python-imaging
Requires: python-mygpoclient >= 1.4, dbus-python
-Requires: pywebkitgtk, gstreamer-python
+Requires: pywebkitgtk, gstreamer-python, python-pymtp
%description
gPodder is a Podcast receiver/catcher written in Python, using GTK.
It manages podcast feeds for you and automatically downloads all
@@ -33,6 +36,10 @@ It also optionally supports syncing with ipods.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+# Remove bundled pymtp
+rm src/gpodder/gpopymtp.py
%build
make messages
@@ -82,6 +89,24 @@ fi
%{python_sitelib}/%{name}*.egg-info
%changelog
+* Sat Jan 15 2011 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 2.12-1
+- New upstream release
+- Add patch to fix exception handling in the 'gpo' command line utility
+ (rhbz #668284, gPodder #1264)
+- Add patch to fix youtube search (Maemo #11756)
+- Require python-pymtp for MTP support
+
+* Mon Dec 20 2010 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 2.11-1
+- New upstream release
+
+* Sat Dec 18 2010 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 2.10-1
+- New upstream release
+
+* Tue Oct 12 2010 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 2.9-1
+- New upstream release
+- Remove unneeded patch
+- Add patch to use systemwide pymtp and remove bundled pymtp
+
* Sun Oct 03 2010 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 2.8-2
- Add a patch to fix the 'gpo update' command, rhbz #638107, Maemo #11217
diff --git a/sources b/sources
index 9b65de4..cec49d5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f289c618f5fb05833cc5709554ebafe3 gpodder-2.8.tar.gz
+e4f7784bf1797e02d172491b62cfe0af gpodder-2.12.tar.gz
More information about the scm-commits
mailing list