[python-sqlalchemy0.5/el5: 7/7] Merge branch 'master' into el5 Add a patch for building on rhel5

[Toshio くらとみ]

commit f33cf934fcde2258d64c02241d5f9b1db3e04567
Merge: e2823c0 f92f251
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Sun Jul 17 00:06:46 2011 -0700

    Merge branch 'master' into el5
    Add a patch for building on rhel5
    
    Conflicts:
    	.gitignore
    	python-sqlalchemy0.5.spec
    	sources

 .gitignore                      |    2 +-
 python-sqlalchemy0.5-py27.patch |  242 +++++++++++++++++++++++++++++++++++++++
 python-sqlalchemy0.5.spec       |   67 ++++++++---
 sources                         |    2 +-
 sqlalchemy-empty-insert.patch   |   12 ++
 5 files changed, 306 insertions(+), 19 deletions(-)
---
diff --cc python-sqlalchemy0.5.spec
index 7d2e439,dd0d8b1..a651e58
--- a/python-sqlalchemy0.5.spec
+++ b/python-sqlalchemy0.5.spec
@@@ -1,11 -1,12 +1,12 @@@
- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
- %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
+ %if ! (0%{?fedora} > 12 || 0%{?rhel} > 5)
+ %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+ %endif
  
- %define srcname SQLAlchemy
+ %global srcname SQLAlchemy
  
  Name:           python-sqlalchemy0.5
- Version:        0.5.5
- Release:        1%{?dist}
+ Version:        0.5.8
 -Release:        7%{?dist}
++Release:        8%{?dist}
  Summary:        Modular and flexible ORM library for python
  
  Group:          Development/Libraries
@@@ -13,13 -14,16 +14,16 @@@ 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
  
++Patch0:         python-sqlalchemy0.5-py27.patch
++Patch1: sqlalchemy-empty-insert.patch
  BuildArch:      noarch
--BuildRequires:  python-devel
- BuildRequires:  python-setuptools-devel >= 0.6c3
 -%if 0%{?fedora} > 12 || 0%{?rhel} > 5
++BuildRequires:  python2-devel
+ BuildRequires: python-setuptools
 -%else
 -BuildRequires:  python-setuptools-devel >= 0.6c3
++%if 0%{?rhel} && 0%{?rhel} <= 5
 +BuildRequires:  python-sqlite2
- BuildRequires:  python-nose
- 
+ %endif
+ BuildRequires: python-nose
  
  %description
  SQLAlchemy is an Object Relational Mappper (ORM) that provides a flexible,
@@@ -32,6 -36,7 +36,11 @@@ domain
  
  %prep
  %setup -q -n %{srcname}-%{version}
 -%patch0 -p1
++%patch0 -p1 -b .py27
++
++%if 0%{?rhel} && 0%{?rhel} <= 5
++%patch1 -p1 -b .oldsqllite
++%endif
  
  %build
  CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py bdist_egg
@@@ -63,14 -69,36 +71,39 @@@ nosetest
  %{python_sitelib}/*
  
  %changelog
- * Sat Aug 15 2009 Luke Macken <lmacken at redhat.com> - 0.5.5-1
- - Switch to using nose for running the test suite
++* 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
+ 
+ * Tue Dec 07 2010 Martin Bacovsky <mbacovsk at redhat.com> - 0.5.8-6
+ - fixed another python2.7 issues in tests
+ 
+ * Fri Nov 26 2010 Martin Bacovsky <mbacovsk at redhat.com> - 0.5.8-5
+ - fixed install as egg
+ 
+ * Thu Nov 25 2010 Martin Bacovsky <mbacovsk at redhat.com> - 0.5.8-4
+ - rebuild as python-sqlalchemy0.5 
+ - fixed python2.7 issues in tests
+ 
+ * Tue Feb 2 2010 Toshio Kuratomi <toshio at fedoraproject.org> - 0.5.8-3
+ - One last cleanup
+ 
+ * Tue Feb 2 2010 Toshio Kuratomi <toshio at fedoraproject.org> - 0.5.8-2
+ - just some cleanups to older styles of building packages.
+ 
+ * Mon Feb 1 2010 Toshio Kuratomi <toshio at fedoraproject.org> - 0.5.8-1
+ - Upstream bugfix release 0.5.8
+ 
+ * Fri Aug 14 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.5.5-2
+ - Upstream bugfix release 0.5.5
  
- * Wed Aug 12 2009 Luke Macken <lmacken at redhat.com> - 0.5.3-3
- - Remove conflicting easy-install.pth file from our site-packages
+ * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.4-2.p2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
  
- * Fri Jul 10 2009 Luke Macken <lmacken at redhat.com> - 0.5.3-2
- - Remove the executable bit from *.py
+ * Fri Jun 12 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.5.4-1.p2
+ - Upstream bugfix release 0.5.4p2.
  
  * Thu Apr 16 2009 Toshio Kuratomi <toshio at fedoraproject.org> - 0.5.3-1
  - Upstream bugfix release.
diff --cc sqlalchemy-empty-insert.patch
index 0000000,0000000..66f77cc
new file mode 100644
--- /dev/null
+++ b/sqlalchemy-empty-insert.patch
@@@ -1,0 -1,0 +1,12 @@@
++Index: SQLAlchemy-0.5.8/test/orm/inheritance/test_concrete.py
++===================================================================
++--- SQLAlchemy-0.5.8.orig/test/orm/inheritance/test_concrete.py
+++++ SQLAlchemy-0.5.8/test/orm/inheritance/test_concrete.py
++@@ -497,6 +497,7 @@ class ManyToManyTest(_base.MappedTest):
++             pass
++ 
++     @testing.resolve_artifact_names
+++    @testing.exclude('sqlite', '<', (3, 3, 8), 'no empty insert support')
++     def test_selective_relations(self):
++         mapper(Base, base, properties={
++             'related':relation(Related, secondary=base_mtom, backref='bases', order_by=related.c.id)