[python-sqlalchemy0.5/el5: 4/4] Merge branch 'master' into el5

[Toshio くらとみ]

commit d76837a449f991a88a33d7e7dba7dba457434b37
Merge: f33cf93 5657ee2
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Wed Mar 7 14:51:38 2012 -0800

    Merge branch 'master' into el5
    
    Conflicts:
    	python-sqlalchemy0.5.spec

 SQLAlchemy-0.5.5-coerce-limit-offset-to-int.patch |   82 +++++++++++++++++++++
 python-sqlalchemy0.5.spec                         |   21 +++--
 2 files changed, 94 insertions(+), 9 deletions(-)
---
diff --cc python-sqlalchemy0.5.spec
index a651e58,7b3eab3..2e99753
--- a/python-sqlalchemy0.5.spec
+++ b/python-sqlalchemy0.5.spec
@@@ -14,9 -14,10 +14,11 @@@ License:        MI
  URL:            http://www.sqlalchemy.org/
  Source0:        http://pypi.python.org/packages/source/S/%{srcname}/%{srcname}-%{version}.tar.gz
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
- 
  Patch0:         python-sqlalchemy0.5-py27.patch
- Patch1: sqlalchemy-empty-insert.patch
+ # Fix https://rhn.redhat.com/errata/RHSA-2012-0369.html
+ Patch1: SQLAlchemy-0.5.5-coerce-limit-offset-to-int.patch
+ 
++Patch2: sqlalchemy-empty-insert.patch
  BuildArch:      noarch
  BuildRequires:  python2-devel
  BuildRequires: python-setuptools
@@@ -36,11 -34,8 +38,9 @@@ domain
  
  %prep
  %setup -q -n %{srcname}-%{version}
- %patch0 -p1 -b .py27
- 
- %if 0%{?rhel} && 0%{?rhel} <= 5
- %patch1 -p1 -b .oldsqllite
- %endif
+ %patch0 -p1
+ %patch1 -p1
++%patch2 -p1
  
  %build
  CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py bdist_egg
@@@ -71,8 -68,11 +71,11 @@@ nosetest
  %{python_sitelib}/*
  
  %changelog
+ * Wed Mar 7 2012 Toshio Kuratomi <toshio at fedoraproject.org> - 0.5.8-9
+ - Patch to fix https://rhn.redhat.com/errata/RHSA-2012-0369.html
+ 
 -* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.8-8
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 +* Sat Jul 16 2011 Toshio Kuratomi <toshio at fedoraproject.org> - 0.5.8-8
 +- Add a patch for building on rhel5
  
  * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.8-7
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild