From 7787378420b7f0a2fc72d6714fbb20695fb00ee2 Mon Sep 17 00:00:00 2001 From: Randy Barlow Date: Oct 05 2016 17:16:01 +0000 Subject: Update to 2.2.4 and improve the EL 7 bootstrap symlinking code. --- diff --git a/.gitignore b/.gitignore index 40ae3e9..e26b7e7 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ bodhi-0.7.14.tar.bz2 /2.2.1.tar.gz /2.2.2.tar.gz /2.2.3.tar.gz +/2.2.4.tar.gz diff --git a/bodhi.spec b/bodhi.spec index 2a295dd..13b0b68 100644 --- a/bodhi.spec +++ b/bodhi.spec @@ -2,7 +2,7 @@ %{!?pyver: %global pyver %(%{__python} -c "import sys ; print sys.version[:3]")} Name: bodhi -Version: 2.2.3 +Version: 2.2.4 Release: 1%{?dist} Summary: A modular framework that facilitates publishing software updates Group: Applications/Internet @@ -247,11 +247,11 @@ cp -rf alembic/ %{buildroot}%{_datadir}/%{name}/alembic install -d %{buildroot}%{_mandir}/man1 install -pm0644 docs/_build/man/bodhi.1 %{buildroot}%{_mandir}/man1/ -%if 0%{?rhel} <= 7 -# setuptools on EL 7 does not install bootstrap, so we need to symlink it -ln -s ./bootstrap-3.1.1-fedora \ - %{buildroot}%{python2_sitelib}/%{name}/server/static/bootstrap -%endif +if [ ! -e %{buildroot}%{python2_sitelib}/%{name}/server/static/bootstrap ]; then + # setuptools on EL 7 does not install bootstrap, so we need to symlink it + ln -s ./bootstrap-3.1.1-fedora \ + %{buildroot}%{python2_sitelib}/%{name}/server/static/bootstrap +fi; %check @@ -312,6 +312,10 @@ PYTHONPATH=. %{__python} setup.py test %changelog +* Tue Oct 04 2016 Randy Barlow - 2.2.4-1 +- Update to 2.2.4. +- Test for presence of bootstrap rather than testing the EL version. + * Tue Sep 27 2016 Randy Barlow - 2.2.3-1 - Update to 2.2.3. diff --git a/sources b/sources index 8e1963a..425a1d3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a5806f2083f592a0530c2b1be9426dee 2.2.3.tar.gz +2f634667f66f952fdaaea25b7c3f16a4 2.2.4.tar.gz