[python-sqlalchemy/f17: 4/5] Revert "Update to a snapshot to fix unittest errors with python-3.3"

Toshio くらとみ toshio at fedoraproject.org
Thu Nov 1 15:21:28 UTC 2012


commit 89d0ba27473b616a9221670a31b0b9e3fe0a26c7
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Thu Nov 1 08:19:31 2012 -0700

    Revert "Update to a snapshot to fix unittest errors with python-3.3"
    
    This reverts commit 3dd4175b7e0f6c94659101bdfc98dbc220ed1d95.

 .gitignore             |    1 -
 python-sqlalchemy.spec |   24 ++++++++----------------
 sources                |    2 +-
 3 files changed, 9 insertions(+), 18 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ca503b1..e059298 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,4 +10,3 @@ SQLAlchemy-0.6.1.tar.gz
 /SQLAlchemy-0.7.6.tar.gz
 /SQLAlchemy-0.7.7.tar.gz
 /SQLAlchemy-0.7.8.tar.gz
-/SQLAlchemy-0.7.9dev.tar.gz
diff --git a/python-sqlalchemy.spec b/python-sqlalchemy.spec
index 11de189..2b33f29 100644
--- a/python-sqlalchemy.spec
+++ b/python-sqlalchemy.spec
@@ -1,4 +1,4 @@
-%if ! 0%{?rhel} > 5
+%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5)
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 %endif
 
@@ -11,26 +11,21 @@
 
 Name:           python-sqlalchemy
 Version:        0.7.8
-Release:        4.20120813hg8535%{?dist}
+Release:        3%{?dist}
 Summary:        Modular and flexible ORM library for python
 
 Group:          Development/Libraries
 License:        MIT
 URL:            http://www.sqlalchemy.org/
-# hg clone -u rel_0_7 -r 8535 http://hg.sqlalchemy.org/sqlalchemy
-# cd sqlalchemy
-# Apply Patch100
-# python setup.py sdist
-# tarball will be in the dist/ subdirectory
-# Package a snapshot of 0.7 to fix unittests on python3.3
-#Source0:        http://pypi.python.org/packages/source/S/%{srcname}/%{srcname}-%{version}.tar.gz
-Source0: SQLAlchemy-0.7.9dev.tar.gz
-# This is just necessary for setup.py sdist in the current snapshot
-Patch100: sqlalchemy-include-profiling-data-file.patch
+Source0:        http://pypi.python.org/packages/source/S/%{srcname}/%{srcname}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python2-devel
+%if 0%{?fedora} && 0%{?fedora} < 13
+BuildRequires:  python-setuptools-devel >= 0.6c3
+%else
 BuildRequires:  python-setuptools
+%endif
 BuildRequires:  python-nose
 
 %if 0%{?with_python3}
@@ -75,7 +70,7 @@ This package includes the python 3 version of the module.
 }
 
 %prep
-%setup -q -n %{srcname}-0.7.9dev
+%setup -q -n %{srcname}-%{version}
 
 %if 0%{?with_python3}
 rm -rf %{py3dir}
@@ -136,9 +131,6 @@ popd
 %endif # with_python3
 
 %changelog
-* Mon Aug 13 2012 Toshio Kuratomi <toshio at fedoraproject.org> - 0.7.8-4.20120813hg8535
-- Update to a snapshot to fix unittest errors with python-3.3
-
 * Fri Aug  3 2012 David Malcolm <dmalcolm at redhat.com> - 0.7.8-3
 - remove rhel logic from with_python3 conditional
 
diff --git a/sources b/sources
index 04af29c..889d15a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-04e477f2dc954bde99864aee49d4c2bd  SQLAlchemy-0.7.9dev.tar.gz
+b6181c6892bf2bff93285614c53d91f7  SQLAlchemy-0.7.8.tar.gz


More information about the scm-commits mailing list