[python-webpy: 2/2] - update to 0.36 Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-webpy

[Matthias Runge]

commit 694b9b4cf564e84f934102bf933b4065315d05c0
Merge: 764045c 8eff440
Author: Matthias Runge <mrunge at matthias-runge.de>
Date:   Wed Jan 25 14:25:06 2012 +0100

    - update to 0.36
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/python-webpy
    
    Conflicts:
    	python-webpy.spec

 python-webpy.spec |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)
---
diff --cc python-webpy.spec
index e801778,ddb4d22..5b593eb
--- a/python-webpy.spec
+++ b/python-webpy.spec
@@@ -22,9 -22,11 +22,8 @@@ License:        Public Domain and BS
  
  URL:            http://webpy.org/
  Source0:        http://webpy.org/static/%{srcname}-%{version}.tar.gz
--BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
  BuildRequires:  python-devel
  BuildArch:      noarch
 -# https://bugs.launchpad.net/webpy/+bug/396789
 -Patch0:         web.utils-tests.patch
  
  %description
  web.py is a web framework for python that is as simple as it is
@@@ -41,18 -53,18 +40,17 @@@ purpose with absolutely no restrictions
  %{__rm} -rf %{buildroot}
  %{__python} setup.py install -O1 --skip-build --root %{buildroot}
  
- #%clean
- #%{__rm} -rf %{buildroot}
- 
 -%clean
 -%{__rm} -rf %{buildroot}
 -
  %files
  %defattr(-,root,root,-)
 -%doc LICENSE.txt LICENSE.wsgiserver.txt ChangeLog.txt
 +%doc PKG-INFO
  %{python_sitelib}/*
  
  %changelog
 +* Wed Jan 25 2012 Matthias Runge <mrunge at matthias-runge.de> - 0.36-1
 +- rebase to 0.36
 +
+ * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.32-7
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
  * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.32-6
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild