Merge branch 'epel7'

Conflicts:
	python-alembic.spec
This commit is contained in:
Ralph Bean 2015-03-16 15:35:08 -04:00
commit f0d69a4878

View File

@ -12,7 +12,7 @@
Name: python-alembic
Version: 0.7.4
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Database migration tool for SQLAlchemy
Group: Development/Libraries
@ -28,6 +28,7 @@ BuildRequires: python2-devel
BuildRequires: python-mako
BuildRequires: python-setuptools
BuildRequires: python-mock
Requires: python-mako
Requires: python-setuptools
@ -148,7 +149,7 @@ install -d -m 0755 %{buildroot}%{_mandir}/man1
%if 0%{?with_python3}
pushd %{py3dir}
%{__python3} setup.py install -O1 --skip-build --root=%{buildroot}
%{__python3} setup.py install --skip-build --root=%{buildroot}
mv %{buildroot}/%{_bindir}/%{modname} %{buildroot}/%{_bindir}/python3-%{modname}
install -m 0644 python3-alembic.1 %{buildroot}%{_mandir}/man1/python3-alembic.1
popd
@ -156,6 +157,13 @@ popd
%{__python2} setup.py install -O1 --skip-build --root=%{buildroot}
%if 0%{?rhel} && 0%{?rhel} <= 6
# Modify /usr/bin/alembic to require SQLAlchemy>=0.6
# Hacky but setuptools only creates this file after setup.py install is run :-(
# Root cause is that setuptools doesn't recurse the requirements when it processes
# the __requires__. It waits until pkg_resources.require('MODULE') is called.
# Since that isn't done in the entrypoints script, we need to specify the dependency
# on a specific SQLAlchemy version explicitly.
sed -i -e "s|__requires__ = 'alembic==0.4.2'|__requires__ = ['alembic==0.4.2', 'SQLAlchemy>=0.6']|" %{buildroot}%{_bindir}/%{modname}
%else
install -m 0644 alembic.1 %{buildroot}%{_mandir}/man1/alembic.1
%endif
@ -192,8 +200,9 @@ popd
%changelog
* Sat Feb 21 2015 Ralph Bean <rbean@redhat.com> - 0.7.4-1
- new version
* Mon Mar 16 2015 Ralph Bean <rbean@redhat.com> - 0.7.4-2
- Merge in epel7 compat changes to the spec file.
- Drop patch for epel7, no longer needed with modern upstream.
* Sat Feb 21 2015 Ralph Bean <rbean@redhat.com> - 0.7.4-1
- new version
@ -229,13 +238,17 @@ popd
- Add forgotten dependency on python-setuptools.
https://bugzilla.redhat.com/show_bug.cgi?id=989016
* Wed May 29 2013 Toshio Kuratomi <toshio@fedoraproject.org> - 0.4.2-2
- Workaround setuptools to load the correct SQLAlchemy version for
the alembic script. https://bugzilla.redhat.com/show_bug.cgi?id=968404
* Wed Apr 10 2013 Ralph Bean <rbean@redhat.com> - 0.5.0-1
- Update to 0.5.0
* Thu Mar 14 2013 Pádraig Brady <pbrady@redhat.com> - 0.4.2-1
- Update to 0.4.2
* Fri Feb 22 2013 Ralph Bean <rbean@redhat.com> - 0.3.4-10
* Fri Feb 22 2013 Ralph Bean <rbean@redhat.com> - 0.3.4-11
- Rebuilt again for good measure.
- Disabled python3 tests.. they started failing in rawhide.