[openstack-sahara/f21] Resetting dependencies to previous versions

[Ethan Gafford]

commit b6201a4a1abbb640e125268f48a75305a41351ae
Author: Ethan Gafford <egafford at redhat.com>
Date:   Mon Mar 23 12:08:15 2015 -0400

    Resetting dependencies to previous versions
    
    For compatibility with older versions of Fedora,
    resetting dependencies to previous versions.
    
    Also removing non-systemd support, as Sahara was
    never released for RHEL 6/CentOS 6.

 openstack-sahara-api.init | 103 ----------------------------------------------
 openstack-sahara.spec     |  89 +++++++++------------------------------
 2 files changed, 20 insertions(+), 172 deletions(-)
---
diff --git a/openstack-sahara.spec b/openstack-sahara.spec
index 10cf578..2bbcfa1 100644
--- a/openstack-sahara.spec
+++ b/openstack-sahara.spec
@@ -1,34 +1,19 @@
-%if 0%{?rhel} && 0%{?rhel} <= 6
-%global have_rhel6 1
-%global want_systemd 0
-%else
-%global have_rhel6 0
-%global want_systemd 1
-%endif
-
 %global sahara_user sahara
 %global sahara_group %{sahara_user}
 
-%if %{have_rhel6}
-%{!?__python2: %global __python2 /usr/bin/python2}
-%{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
-%{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
-%endif
-
 %if 0%{?rhel} && 0%{?rhel} <= 7
 %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}}
 %endif
 
 Name:          openstack-sahara
 Version:       2014.1.3
-Release:       1%{?dist}
+Release:       2%{?dist}
 Provides:      openstack-savanna = %{version}-%{release}
 Summary:       Apache Hadoop cluster management on OpenStack
 License:       ASL 2.0
 URL:           https://launchpad.net/sahara
 Source0:       http://tarballs.openstack.org/sahara/sahara-%{version}.tar.gz
 Source1:       openstack-sahara-api.service
-Source2:       openstack-sahara-api.init
 BuildArch:     noarch
 
 #
@@ -42,43 +27,33 @@ BuildRequires: python-setuptools
 BuildRequires: python-sphinx >= 1.1.2
 BuildRequires: python-oslo-sphinx
 BuildRequires: python-sphinxcontrib-httpdomain
-BuildRequires: python-pbr >= 0.6
-
-%if %{want_systemd}
-# Need systemd-units for _unitdir macro
+BuildRequires: python-pbr >= 0.5.19
 BuildRequires: systemd-units
-%endif
 
-Requires: python-alembic >= 0.4.1
+Requires: python-alembic
 #?Babel>=1.3?
-Requires: python-eventlet >= 0.13.0
-Requires: python-flask >= 0.10
-Requires: python-iso8601 >= 0.1.9
-Requires: python-jsonschema >= 2.0.0
+Requires: python-eventlet
+Requires: python-flask
+Requires: python-iso8601
+Requires: python-jsonschema >= 1.3.0
 Requires: python-oslo-config >= 1.2.0
 Requires: python-oslo-messaging
 Requires: python-paramiko >= 1.9.0
 Requires: python-requests >= 1.1
-Requires: python-cinderclient >= 1.0.6
+Requires: python-cinderclient >= 1.0.5
 Requires: python-heatclient >= 0.2.3
-Requires: python-keystoneclient >= 0.7.0
-Requires: python-novaclient >= 2.17.0
-Requires: python-swiftclient >= 1.6
-Requires: python-neutronclient >= 2.3.4
-Requires: python-six >= 1.6.0
+Requires: python-keystoneclient >= 0.6.0
+Requires: python-novaclient >= 2.15.0
+Requires: python-swiftclient
+Requires: python-neutronclient
+Requires: python-six >= 1.4.1
 Requires: python-stevedore >= 0.14
-Requires: python-webob >= 1.2.3
-Requires: python-sqlalchemy >= 0.7.8
+Requires: python-webob
+Requires: python-sqlalchemy
 
-%if %{want_systemd}
 Requires(post):   systemd
 Requires(preun):  systemd
 Requires(postun): systemd
-%else
-Requires(post):   chkconfig
-Requires(preun):  initscripts
-Requires(postun): chkconfig
-%endif
 Requires(pre):    shadow-utils
 
 
@@ -135,12 +110,7 @@ rm -rf html/.{doctrees,buildinfo}
 %install
 %{__python2} setup.py install --skip-build --root %{buildroot}
 
-%if %{want_systemd}
 install -p -D -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/openstack-sahara-api.service
-%else
-install -d -m 755 %{buildroot}%{_localstatedir}/run/sahara
-install -p -D -m 755 %{SOURCE2} %{buildroot}%{_initrddir}/openstack-sahara-api
-%endif
 
 HOME=%{_sharedstatedir}/sahara
 install -d -m 700 %{buildroot}$HOME
@@ -184,44 +154,21 @@ exit 0
 
 %post
 # TODO: if db file then sahara-db-manage update head
-%if %{want_systemd}
 %systemd_post openstack-sahara-api.service
-%else
-/sbin/chkconfig --add openstack-sahara-api
-%endif
 
 
 %preun
-%if %{want_systemd}
 %systemd_preun openstack-sahara-api.service
-%else
-if [ $1 -eq 0 ] ; then
-   /sbin/service openstack-sahara-api stop >/dev/null 2>&1
-   /sbin/chkconfig --del openstack-sahara-api
-fi
-%endif
 
 
 %postun
-%if %{want_systemd}
 %systemd_postun_with_restart openstack-sahara-api.service
-%else
-if [ $1 -ge 1 ] ; then
-   # Package upgrade, not uninstall
-   /sbin/service openstack-sahara-api condrestart > /dev/null 2>&1 || :
-fi
-%endif
 
 
 %files
 %doc README.rst LICENSE
 
-%if %{have_rhel6}
-%dir %attr(0755, %{sahara_user}, root) %{_localstatedir}/run/sahara
-%{_initrddir}/openstack-sahara-api
-%else
 %{_unitdir}/openstack-sahara-api.service
-%endif
 
 %dir %{_sysconfdir}/sahara
 # Note: this file is not readable because it holds auth credentials
@@ -231,7 +178,7 @@ fi
 %{_bindir}/sahara-db-manage
 %dir %attr(-, %{sahara_user}, %{sahara_group}) %{_sharedstatedir}/sahara
 %dir %attr(-, %{sahara_user}, %{sahara_group}) %{_localstatedir}/log/sahara
-# Note: permissions on sahara's home are intentially 0700
+# Note: permissions on sahara's home are intentionally 0700
 %dir %{_datadir}/sahara
 %{_datadir}/sahara/sahara.conf.sample
 %{python_sitelib}/sahara
@@ -243,6 +190,10 @@ fi
 
 
 %changelog
+* Mon Mar 23 2015 Ethan Gafford <egafford at redhat.com> 2014.1.3-2
+- Resetting dependencies to previous levels
+- Removing pre-systemd packaging
+
 * Fri Mar 20 2015 Ethan Gafford <egafford at redhat.com> 2014.1.3-1
 - Update to upstream 2014.1.3