[python-fedora/f14] Remove split packages as we said we wouldn't make split subpackages for F14

[Toshio くらとみ]

commit 7ddcb3150715d2ca65d6055bb87e10d772814dd3
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Wed Nov 2 09:59:06 2011 -0700

    Remove split packages as we said we wouldn't make split subpackages for
    F14

 python-fedora.spec |   82 ++++++++++++++-------------------------------------
 1 files changed, 23 insertions(+), 59 deletions(-)
---
diff --git a/python-fedora.spec b/python-fedora.spec
index 77304f2..12a39a0 100644
--- a/python-fedora.spec
+++ b/python-fedora.spec
@@ -4,7 +4,7 @@
 
 Name:           python-fedora
 Version:        0.3.25.1
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 Summary:        Python modules for talking to Fedora Infrastructure Services
 
 Group:          Development/Languages
@@ -36,40 +36,13 @@ Requires:       python-simplejson
 Requires:       python-bunch
 Requires:       python-pycurl
 Requires:       python-kitchen
-# These are now optional dependencies.  Some bodhi methods will not work if
-# they aren't installed but they aren't needed for most functionality of the
-# module.
-#Requires:       koji python-iniparse yum
-
-%description
-Python modules that help with building Fedora Services.  The client module
-included here can be used to build programs that communicate with Fedora
-Infrastructure's TurboGears Applications such as Bodhi, PackageDB,
-MirrorManager, and FAS2.
-
-%package turbogears
-Summary: Python modules for TurboGears applications in Fedora Infrastructure
-Group:          Development/Languages
-License:        LGPLv2+
-Requires: %{name} = %{version}-%{release}
+# TG package deps
 Requires: TurboGears
 Requires: python-sqlalchemy
 Requires: python-decorator
 Requires: python-bugzilla
 Requires: python-feedparser
-
-%description turbogears
-Python modules that help with building Fedora Services.  This package includes
-a JSON based auth provider for authenticating TurboGears1 applications against
-FAS2 over the network, a csrf protected version of the standard TG1 auth
-provider, templates to help build CSRF-protected login forms, and miscellaneous
-other helper functions for TurboGears applications.
-
-%package turbogears2
-Summary: Python modules for TurboGears applications in Fedora Infrastructure
-Group:          Development/Languages
-License:        LGPLv2+
-Requires: %{name} = %{version}-%{release}
+# TG2 package deps
 Requires: TurboGears2
 Requires: python-sqlalchemy
 %if 0%{?fedora}
@@ -78,25 +51,26 @@ Requires: python-mako >= 0.3.6
 Requires: python-mako0.4 >= 0.3.6
 %endif
 Requires: python-repoze-who-friendlyform
+# Django deps
+Requires: Django
 
-%description turbogears2
-Python modules that help with building Fedora Services.  This package includes
-middleware for protecting against CSRF attacks, repoze.who authenticators for
-logging in to TurboGears2 services based on account information lp build
-CSRF-protected login forms, and miscellaneous other helper functions for
-TurboGears2 applications.
+# These are now optional dependencies.  Some bodhi methods will not work if
+# they aren't installed but they aren't needed for most functionality of the
+# module.
+#Requires:       koji python-iniparse yum
 
-%package django
-Summary: Python modules for django applications authing to Fedora Account System
-Group:          Development/Languages
-License:        LGPLv2+
-Requires: %{name} = %{version}-%{release}
-Requires: Django
+%description
+Python modules that help with building Fedora Services.  The client module
+included here can be used to build programs that communicate with Fedora
+Infrastructure's TurboGears Applications such as Bodhi, PackageDB,
+MirrorManager, and FAS2.
+
+There are also modules to help with building Fedora Services.  A JSON based
+auth provider for authenticating TurboGears1 applications against FAS2 over the
+network, a csrf protected version of the standard TG1 auth provider, templates
+to help build CSRF-protected login forms, wsgi middleware for protecting TG2 apps from CSRF attacks, and miscellaneous other helper
+functions for TurboGears applications.
 
-%description django
-Python modules that help with building Fedora Services.  This package includes
-an auth provider to let django applications authenticate against the Fedora
-Account System.
 
 %prep
 %setup -q -n %{name}-%{version}%{?prerel}
@@ -129,21 +103,11 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %doc NEWS README COPYING AUTHORS ChangeLog doc
 %{python_sitelib}/*
-%exclude %{python_sitelib}/fedora/tg/
-%exclude %{python_sitelib}/fedora/wsgi/
-%exclude %{python_sitelib}/fedora/django/
-
-%files turbogears
-%{python_sitelib}/fedora/tg/
-
-%files turbogears2
-%{python_sitelib}/fedora/wsgi/
-%{python_sitelib}/fedora/tg2/
-
-%files django
-%{python_sitelib}/fedora/django/
 
 %changelog
+* Wed Nov 2 2011 Toshio Kuratomi <toshio at fedoraproject.org> - 0.3.25.1-1.1
+- Build that's not split into subpackages for F14
+
 * Thu Oct 6 2011 Toshio Kuratomi <toshio at fedoraproject.org> - 0.3.25.1-1
 - Minor update to bugzilla email aliases