[python-migrate/f15] cherrypick the Require python-tempita fix
Toshio くらとみ
toshio at fedoraproject.org
Thu Nov 17 02:46:31 UTC 2011
commit 277463a30e5102dd229c0af611e6808569b2fe00
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date: Wed Nov 16 18:46:14 2011 -0800
cherrypick the Require python-tempita fix
Conflicts:
python-migrate.spec
python-migrate.spec | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
---
diff --git a/python-migrate.spec b/python-migrate.spec
index 3b39bd1..add997c 100644
--- a/python-migrate.spec
+++ b/python-migrate.spec
@@ -6,7 +6,7 @@
Name: python-migrate
Version: 0.6
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Schema migration tools for SQLAlchemy
Group: Development/Languages
@@ -23,26 +23,30 @@ Patch100: python-migrate-sqlalchemy-migrate.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
-BuildRequires: python-devel
+BuildRequires: python2-devel
BuildRequires: python-sqlalchemy
-BuildRequires: python-setuptools-devel
+BuildRequires: python-setuptools
BuildRequires: python-nose
BuildRequires: python-sphinx
BuildRequires: python-decorator
+BuildRequires: python-tempita
# for testsuite
BuildRequires: python-scripttest
-BuildRequires: python-tempita
Requires: python-sqlalchemy
Requires: python-setuptools
Requires: python-decorator
+Requires: python-tempita
%if 0%{?rhel} && 0%{?rhel} < 6
BuildRequires: python-sqlite2
Requires: python-sqlite2
%endif
+%if 0%{?rhel}
+BuildRequires: python-unittest2
+%endif
%description
Schema migration tools for SQLAlchemy designed to support an agile approach
@@ -57,9 +61,11 @@ atabase change sets and database repository versioning.
%patch100 -p0 -b .rename
# use real unittest in python 2.7 and up
+%if 0%{?fedora} || 0%{?rhel} > 6
sed -i "s/import unittest2/import unittest as unittest2/g" \
migrate/tests/fixture/__init__.py \
migrate/tests/fixture/base.py
+%endif
%build
%{__python} setup.py build
@@ -90,6 +96,9 @@ nosetests
%{python_sitelib}/*
%changelog
+* Wed Nov 16 2011 Toshio Kuratomi <toshio at fedoraproject.org> - 0.6-5
+- Require python-tempita
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
More information about the scm-commits
mailing list