diff --git a/.gitignore b/.gitignore index e7ae3f9..7c5e436 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,4 @@ bodhi-0.7.14.tar.bz2 /bodhi-2.6.0.tar.gz /bodhi-2.6.1.tar.gz /bodhi-2.6.2.tar.gz +/bodhi-2.7.0.tar.gz diff --git a/bodhi.spec b/bodhi.spec index 4424a30..93196fa 100644 --- a/bodhi.spec +++ b/bodhi.spec @@ -1,5 +1,5 @@ Name: bodhi -Version: 2.6.2 +Version: 2.7.0 Release: 1%{?dist} BuildArch: noarch @@ -13,6 +13,7 @@ Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz BuildRequires: python2 BuildRequires: python2-devel BuildRequires: python2-fedmsg-atomic-composer >= 2016.3 +BuildRequires: python-alembic BuildRequires: python-flake8 BuildRequires: python-nose BuildRequires: python-webtest @@ -219,6 +220,10 @@ sed -i '/nose-cov/d' setup.py # Kill this from the egg-info deps so that bodhi-server doesn't demand it. sed -i '/click/d' setup.py +# Configure the alembic.ini config file to point to the location where we've installed the +# migrations. +sed -i 's:script_location = alembic:script_location = %{_datadir}/%{name}/alembic:' alembic.ini + # The unit tests needs a development.ini mv development.ini.example development.ini @@ -243,7 +248,10 @@ make %{?_smp_mflags} -C docs man %{__install} -m 644 apache/%{name}.conf %{buildroot}%{_sysconfdir}/httpd/conf.d/%{name}.conf %{__install} -m 640 production.ini %{buildroot}%{_sysconfdir}/%{name}/production.ini -%{__install} -m 640 alembic.ini %{buildroot}%{_datadir}/%{name}/alembic.ini +%{__install} -m 640 alembic.ini %{buildroot}%{_sysconfdir}/%{name}/alembic.ini +# The alembic.ini file used to be installed to datadir, so let's include a symlink for reverse +# compatibility. +ln -s %{_sysconfdir}/%{name}/alembic.ini %{buildroot}%{_datadir}/%{name}/alembic.ini cp -rf alembic/ %{buildroot}%{_datadir}/%{name}/alembic %{__install} apache/%{name}.wsgi %{buildroot}%{_datadir}/%{name}/%{name}.wsgi @@ -310,6 +318,7 @@ PYTHONPATH=. %{__python2} setup.py nosetests %{_bindir}/bodhi-push %{_bindir}/bodhi-untag-branched %{_bindir}/bodhi-manage-releases +%config(noreplace) %{_sysconfdir}/bodhi/alembic.ini %config(noreplace) %{_sysconfdir}/httpd/conf.d/bodhi.conf %config(noreplace) %{_sysconfdir}/fedmsg.d/* %dir %{_sysconfdir}/bodhi/ @@ -324,6 +333,11 @@ PYTHONPATH=. %{__python2} setup.py nosetests %changelog +* Mon May 15 2017 Randy Barlow - 2.7.0-1 +- Update to 2.7.0 (#1458342). +- https://github.com/fedora-infra/bodhi/releases/tag/2.7.0 +- Install alembic.ini as a config file (#1451091). + * Fri May 05 2017 Randy Barlow - 2.6.2-1 - Update to 2.6.2 (#1445294). - https://github.com/fedora-infra/bodhi/releases/tag/2.6.2 diff --git a/sources b/sources index 0f04237..d5984c9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (bodhi-2.6.2.tar.gz) = 0f849613f57e19b61bd6eecf2d920e0e180433a67e293a46d44928401f4754f590a8b94eab3968b341dd6801123a7063fcfee9b0295225e6735b5ce8b2b1bafa +SHA512 (bodhi-2.7.0.tar.gz) = f6188ca1e88fc13a6c20d11a93786bbe8de29308daa094ab3e651c4db811e4c30634fae63214cfe43c3d5cef6c87036891a6780c7c106ba8bba7785ee47a50b7