[gpodder: 1/2] New upstream release, remove upstreamed patches

Ville-Pekka Vainio vpv at fedoraproject.org
Wed Feb 23 14:25:41 UTC 2011


commit e423e64c0c9f55b424f766d645a5d333553f99ed
Author: Ville-Pekka Vainio <vpivaini at cs.helsinki.fi>
Date:   Wed Feb 23 16:22:56 2011 +0200

    New upstream release, remove upstreamed patches

 .gitignore                                         |    1 +
 ...-68aa84c11c2e1f3cca2bf32b2465c644cfd4cc15.patch |   41 --------------------
 ...-75d24ee16d4a9e65fa04a872ddf66117ff5ebdb5.patch |   26 ------------
 ...-b13123d7a105c5f201e9b50e0293a176821dfb8e.patch |   30 --------------
 gpodder.spec                                       |   16 ++-----
 sources                                            |    2 +-
 6 files changed, 7 insertions(+), 109 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e519c8b..bd3d290 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 gpodder-2.7.tar.gz
 /gpodder-2.8.tar.gz
 /gpodder-2.12.tar.gz
+/gpodder-2.13.tar.gz
diff --git a/gpodder.spec b/gpodder.spec
index 1ece17d..6771ae3 100644
--- a/gpodder.spec
+++ b/gpodder.spec
@@ -2,8 +2,8 @@
 
 
 Name:           gpodder
-Version:        2.12
-Release:        2%{?dist}
+Version:        2.13
+Release:        1%{?dist}
 Summary:        Podcast receiver/catcher written in Python
 
 Group:          Applications/Multimedia
@@ -11,12 +11,6 @@ License:        GPLv3
 URL:            http://gpodder.berlios.de/
 Source0:        http://download.berlios.de/%{name}/%{name}-%{version}.tar.gz
 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
-# minidb: Fix encoding issue (bug 1088)
-Patch3:         gpodder.git-b13123d7a105c5f201e9b50e0293a176821dfb8e.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  python-devel, python-feedparser, python-mygpoclient >= 1.4
@@ -38,9 +32,6 @@ It also optionally supports syncing with ipods.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
 # Remove bundled pymtp
 rm src/gpodder/gpopymtp.py
 
@@ -92,6 +83,9 @@ fi
 %{python_sitelib}/%{name}*.egg-info
 
 %changelog
+* Wed Feb 23 2011 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 2.13-1
+- New upstream release, remove upstreamed patches
+
 * Thu Feb 03 2011 Ville-Pekka Vainio <vpivaini AT cs.helsinki.fi> - 2.12-2
 - Add patch to fix encoding issues in minidb (rhbz #674758, gPodder #1088)
 
diff --git a/sources b/sources
index cec49d5..3e6681d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e4f7784bf1797e02d172491b62cfe0af  gpodder-2.12.tar.gz
+e9f92d5057f7bd97d7c8a7bd471739cd  gpodder-2.13.tar.gz


More information about the scm-commits mailing list