[python-fedora] Rework package to provide the turbogears and django code in subpackages with full dependencies for e

[Toshio くらとみ]

commit e8b4da10c73b33137d302bc8d9a0925d7a747a53
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Wed Aug 10 11:41:51 2011 -0700

    Rework package to provide the turbogears and django code in subpackages with
    full dependencies for each of those.

 python-fedora.spec |   65 +++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 54 insertions(+), 11 deletions(-)
---
diff --git a/python-fedora.spec b/python-fedora.spec
index 3d3751c..f669a5f 100644
--- a/python-fedora.spec
+++ b/python-fedora.spec
@@ -2,7 +2,7 @@
 
 Name:           python-fedora
 Version:        0.3.24
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Python modules for talking to Fedora Infrastructure Services
 
 Group:          Development/Languages
@@ -16,7 +16,7 @@ BuildRequires:  python2-devel
 BuildRequires:  python-setuptools
 BuildRequires:  python-paver >= 1.0
 BuildRequires:  python-sphinx
-%if 0%{?fedora} >= 9 || 0%{?rhel} > 5
+%if 0%{?fedora} || 0%{?rhel} > 5
 BuildRequires:  python-cherrypy2
 %else
 BuildRequires:  python-cherrypy
@@ -26,11 +26,14 @@ BuildRequires:  TurboGears2
 BuildRequires:  python-nose
 BuildRequires:  python-kitchen
 BuildRequires:  python-bunch
+# Needed for tests and for the way we build docs
+BuildRequires: TurboGears python-repoze-who-friendlyform Django
+BuildRequires: python-pycurl
+
 Requires:       python-simplejson
 Requires:       python-bugzilla
 Requires:       python-bunch
 Requires:       python-feedparser
-Requires:       python-sqlalchemy
 Requires:       python-decorator
 Requires:       python-pycurl
 Requires:       python-kitchen
@@ -38,22 +41,48 @@ Requires:       python-kitchen
 # they aren't installed but they aren't needed for most functionality of the
 # module.
 #Requires:       koji python-iniparse yum
-Provides:       python-fedora-infrastructure = %{version}-%{release}
-Obsoletes:      python-fedora-infrastructure < %{version}-%{release}
 
 %description
-Python modules that help with building Fedora Services.  This includes a JSON
-based auth provider for authenticating against FAS2 over the network and a
-client that handles communication with the servers.  The client module can
-be used to build programs that communicate with Fedora Infrastructure's
-TurboGears Applications such as Bodhi, PackageDB, MirrorManager, and FAS2.
+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}
+Requires: TurboGears
+Requires: TurboGears2
+Requires: python-sqlalchemy
+Requires: python-repoze-who-friendlyform
+
+%description turbogears
+Python modules that help with building Fedora Services.  This package includes
+a pair of JSON based auth providers for authenticating TurboGears1 and
+TurboGears2 applications against FAS2 over the network, a csrf protected
+version of the standard TG1 auth provider, and miscellaneous other helper
+functions for TurboGears applications.
+
+%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 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}
 
 %build
 paver build
-paver html
+PYTHONPATH=%{python_sitelib}/CherryPy-2.?.?-py2.?.egg paver html
 
 %install
 rm -rf %{buildroot}
@@ -69,8 +98,22 @@ 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/
+%{python_sitelib}/fedora/wsgi/
+
+%files django
+%{python_sitelib}/fedora/django/
 
 %changelog
+* Tue Aug 9 2011 Toshio Kuratomi <toshio at fedoraproject.org> - 0.3.24-2
+- Rework package to provide the turbogears and django code in subpackages with
+  full dependencies for each of those.
+
 * Wed Jul 20 2011 Toshio Kuratomi <toshio at fedoraproject.org> - 0.3.24-1
 - Upstream 0.3.24 release bugfixing TG2 server utils and clients with
   session cookie auth.