rpms/TurboGears/F-11 feedkid.diff, NONE, 1.1 TurboGears.spec, 1.44, 1.45

[Toshio くらとみ]

Author: toshio

Update of /cvs/pkgs/rpms/TurboGears/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8726/F-11

Modified Files:
	TurboGears.spec 
Added Files:
	feedkid.diff 
Log Message:

* Tue Aug 11 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.8-6
- Add patch to make FeedController work when the default template engine is
  not kid.


feedkid.diff:
 feed.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE feedkid.diff ---
Index: turbogears/feed/feed.py
===================================================================
--- turbogears/feed/feed.py	(revision 6599)
+++ turbogears/feed/feed.py	(working copy)
@@ -52,7 +52,7 @@
         feed["href"] = turbogears.url("/") + "atom1.0"
         self.depr_entrys(feed)
         return feed
-    atom1_0 = turbogears.expose(template="turbogears.feed.atom1_0",
+    atom1_0 = turbogears.expose(template="kid:turbogears.feed.atom1_0",
                     format="xml", content_type="application/atom+xml")(atom1_0)
 
     def atom0_3(self, **kwargs):
@@ -61,7 +61,7 @@
         feed["href"] = turbogears.url("/") + "atom0.3"
         self.depr_entrys(feed)
         return feed
-    atom0_3 = turbogears.expose(template="turbogears.feed.atom0_3",
+    atom0_3 = turbogears.expose(template="kid:turbogears.feed.atom0_3",
                     format="xml", content_type="application/atom+xml")(atom0_3)
 
     def rss2_0(self, **kwargs):
@@ -69,5 +69,5 @@
         self.format_dates(feed, 822)
         self.depr_entrys(feed)
         return feed
-    rss2_0 = turbogears.expose(template="turbogears.feed.rss2_0",
+    rss2_0 = turbogears.expose(template="kid:turbogears.feed.rss2_0",
                     format="xml", content_type="application/rss+xml")(rss2_0)


Index: TurboGears.spec
===================================================================
RCS file: /cvs/pkgs/rpms/TurboGears/F-11/TurboGears.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- TurboGears.spec	2 May 2009 17:35:45 -0000	1.44
+++ TurboGears.spec	17 Aug 2009 20:48:07 -0000	1.45
@@ -3,7 +3,7 @@
 
 Name:           TurboGears
 Version:        1.0.8
-Release:        3%{?dist}
+Release:        6%{?dist}
 Summary:        Back-to-front web development in Python
 
 Group:          Development/Languages
@@ -14,6 +14,9 @@ Patch0:         %{name}-%{version}-cherr
 Patch1:         %{name}-%{version}-setup.patch
 # From upstream changeset r6575
 Patch2:         %{name}-%{version}-paginate.patch
+# From upstream bug report: http://trac.turbogears.org/ticket/2348
+# Going into TG-1.1 but not TG-1.0.x
+Patch3: feedkid.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -24,19 +27,20 @@ BuildRequires: python-decoratortools pyt
 BuildRequires: python-formencode python-turbokid python-turbocheetah
 BuildRequires: python-paste-script python-sqlobject python-sqlalchemy
 
-%if 0%{?fedora} >= 9
+%if 0%{?fedora} || 0%{?rhel} > 5
 Requires:       python-cherrypy2
 BuildRequires:	python-cherrypy2
 %else
-Requires:       python-cherrypy
+BuildRequires:  python-elementtree >= 1.2.6
 BuildRequires:	python-cherrypy
+Requires:       python-elementtree >= 1.2.6
+Requires:       python-cherrypy
 %endif
 
 Requires:       python-sqlalchemy
 Requires:       python-kid >= 0.8
 Requires:       python-sqlobject >= 0.8
 Requires:       python-formencode >= 0.7.1
-Requires:       python-json >= 3.3
 Requires:       python-setuptools >= 0.6c2
 Requires:       python-turbocheetah >= 1.0
 Requires:       python-turbojson >= 1.1.2
@@ -71,7 +75,7 @@ TurboGears is easy to use for a wide ran
 %patch0 -b .cherrypyreq
 %patch1 -b .setup
 %patch2 -p3 -b .paginate
-
+%patch3 -p0 -b .feedkid
 
 %build
 %{__python} setup.py build
@@ -94,6 +98,16 @@ rm -rf %{buildroot}
 %{python_sitelib}/turbogears/
 
 %changelog
+* Tue Aug 11 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.8-6
+- Add patch to make FeedController work when the default template engine is
+  not kid.
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.8-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Jun 01 2009 Luke Macken <lmacken at redhat.com> - 1.0.8-4
+- Remove python-json as a requirement
+
 * Sat May 2 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 1.0.8-3
 - Fix from upstream for pagination problem.