[planet] Unbundle feedparser.

[Jon Ciesla]

commit c139b9a94b83685602f2c733577fddf553bb80fd
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Tue Jan 20 10:01:19 2015 -0600

    Unbundle feedparser.

 planet-1.0-no-shebang.patch |    9 ---------
 planet.spec                 |    8 ++++++--
 2 files changed, 6 insertions(+), 11 deletions(-)
---
diff --git a/planet-1.0-no-shebang.patch b/planet-1.0-no-shebang.patch
index ac0ffe7..9eaaa69 100644
--- a/planet-1.0-no-shebang.patch
+++ b/planet-1.0-no-shebang.patch
@@ -12,15 +12,6 @@ diff -pur planet-2.0.orig/planet/cache.py planet-2.0/planet/cache.py
  # -*- coding: UTF-8 -*-
  """Item cache.
  
-diff -pur planet-2.0.orig/planet/feedparser.py planet-2.0/planet/feedparser.py
---- planet-2.0.orig/planet/feedparser.py	2006-07-27 00:53:35.000000000 +0100
-+++ planet-2.0/planet/feedparser.py	2008-10-11 08:55:04.000000000 +0100
-@@ -1,4 +1,3 @@
--#!/usr/bin/env python
- """Universal feed parser
- 
- Handles RSS 0.9x, RSS 1.0, RSS 2.0, CDF, Atom 0.3, and Atom 1.0 feeds
-Only in planet-2.0/planet: feedparser.py.orig
 diff -pur planet-2.0.orig/planet/__init__.py planet-2.0/planet/__init__.py
 --- planet-2.0.orig/planet/__init__.py	2006-07-27 00:53:35.000000000 +0100
 +++ planet-2.0/planet/__init__.py	2008-10-11 08:55:04.000000000 +0100
diff --git a/planet.spec b/planet.spec
index f5d02e3..98748da 100644
--- a/planet.spec
+++ b/planet.spec
@@ -2,7 +2,7 @@
 
 Name: planet
 Version: 2.0
-Release: 20%{?dist}
+Release: 21%{?dist}
 Summary: Flexible RDF/RSS/Atom feed aggregator
 
 Group: Applications/Internet
@@ -16,7 +16,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 BuildRequires: python-devel
 BuildRequires: python-setuptools
-
+Requires: python-feedparser
 
 %description
 Planet is a flexible feed aggregator, this means that it downloads feeds
@@ -54,6 +54,7 @@ for i in $RPM_BUILD_ROOT%{_bindir}/*.py; do
   mv -v $i $(echo $i | sed -e $REGEXP)
 done
 
+rm -f $RPM_BUILD_ROOT%{python_sitelib}/planet/feedparser*
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -74,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jan 23 2015 Jon Ciesla <limburgher at gmail.com> - 2.0-21
+- Unbundle feedparser, BZ 1183676.
+
 * Mon Jan 23 2015 Jon Ciesla <limburgher at gmail.com> - 2.0-20
 - Drop timeoutsocket.py to fix BZ 498456.