[openstack-packstack/el6-havana] Fix build issues on el7, correct bogus dates

Martin Mágr mmagr at fedoraproject.org
Wed Feb 12 12:13:11 UTC 2014


commit 88e183bbb1eb2032ccfb5769183e976b9bdc8f5d
Author: Matthias Runge <mrunge at redhat.com>
Date:   Tue Feb 4 18:19:33 2014 +0100

    Fix build issues on el7, correct bogus dates
    
    Conflicts:
    	openstack-packstack.spec

 openstack-packstack.spec |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)
---
diff --git a/openstack-packstack.spec b/openstack-packstack.spec
index 9a1788f..31fa0d4 100644
--- a/openstack-packstack.spec
+++ b/openstack-packstack.spec
@@ -19,7 +19,7 @@ BuildArch:      noarch
 
 BuildRequires:  python2-devel
 BuildRequires:  python-setuptools
-%if 0%{?rhel}
+%if 0%{?rhel} == 6
 BuildRequires:  python-sphinx10
 %else
 BuildRequires:  python-sphinx
@@ -69,7 +69,7 @@ mv packstack/puppet %{_builddir}/puppet
 %{__python} setup.py build
 
 cd docs
-%if 0%{?rhel}
+%if 0%{?rhel} == 6
 make man SPHINXBUILD=sphinx-1.0-build
 %else
 make man
@@ -104,7 +104,11 @@ install -p -D -m 644 docs/_build/man/*.1 %{buildroot}%{_mandir}/man1/
 
 
 %changelog
-* Fri Feb 7 2014 Martin Mágr <mmagr at redhat.com> - 2013.2.1-0.30.dev979
+* Wed Feb 12 2014 Matthias Runge <mrunge at redhat.com> - 2013.2.1-0.30.dev979
+- fix build related issue on el7
+- fix bogus date in changelogs
+
+* Fri Feb 07 2014 Martin Mágr <mmagr at redhat.com> - 2013.2.1-0.30.dev979
 - Update puppet-tempest module to stable/havana (rhbz#981116)
 - ML2 support (rhbz#1017144)
 - VXLAN support (rhbz#1021778)
@@ -128,7 +132,7 @@ install -p -D -m 644 docs/_build/man/*.1 %{buildroot}%{_mandir}/man1/
 - Update puppet-neutron to stable/havana which contains fixes for Puppet 3.4+ (lp#1267488)
 - Updated puppet-swift to stable/havana (rhbz#1039981)
 
-* Fri Jan 04 2014 Pádraig Brady <pbrady at redhat.com> - 2013.2.1-0.27.dev936
+* Fri Jan 03 2014 Pádraig Brady <pbrady at redhat.com> - 2013.2.1-0.27.dev936
 - Don't set libvirt_vif_driver no longer supported by nova (rhbz#1048315)
 
 * Fri Dec 20 2013 Pádraig Brady <pbrady at redhat.com> - 2013.2.1-0.25.dev936
@@ -214,7 +218,7 @@ install -p -D -m 644 docs/_build/man/*.1 %{buildroot}%{_mandir}/man1/
 - Add puppet-certmonger as a submodule
 - Exposes tempest uri/branch selection if provision-tempest is y
 
-* Tue Oct 17 2013 Martin Mágr <mmagr at redhat.com> - 2013.2.1-0.11.dev806
+* Thu Oct 17 2013 Martin Mágr <mmagr at redhat.com> - 2013.2.1-0.11.dev806
 - Improved logging (lp#1228187)
 - Adds error checking when puppet fails internally (rhbz#958587)
 - Store iptables in file when testing netns (rhbz#1016773)
@@ -318,7 +322,7 @@ install -p -D -m 644 docs/_build/man/*.1 %{buildroot}%{_mandir}/man1/
 - Fixed color usage (#971075)
 - Activate cinder-volumes VG and scan PVs after reboot (#971145)
 
-* Tue Jun 05 2013 Martin Mágr <mmagr at redhat.com> - 2013.1.1-0.9.dev605
+* Wed Jun 05 2013 Martin Mágr <mmagr at redhat.com> - 2013.1.1-0.9.dev605
 - Added whitespace filter to Nova and Quantum plugins (rhbz#970674)
 - Removed RDO repo installation procedure
 


More information about the scm-commits mailing list