commit 52f0ffa3a73c7e839f27e80f648b9d960f4d004b
Author: David Busby <oneiroi at fedoraproject.org>
Date: Sat Oct 22 14:57:06 2011 +0100
Specfile now complete, bulding fine locally
openstack-keystone.spec | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
---
diff --git a/openstack-keystone.spec b/openstack-keystone.spec
index da870ac..e1e0322 100644
--- a/openstack-keystone.spec
+++ b/openstack-keystone.spec
@@ -1,6 +1,4 @@
-
%global milestone d4
-%global snaptag ~%{milestone}~%{snapdate}.%{git_revno}
Name: openstack-keystone
Version: 2011.3
@@ -9,14 +7,13 @@ Summary: OpenStack Identity Service
License: ASL 2.0
URL: http://keystone.openstack.org/
-Source0: https://launchpad.net/glance/diablo/2011.3/glance-%{version}.tar.gz
+Source0: https://launchpad.net/keystone/diablo/2011.3/keystone-%{version}.tar.gz
Source1: openstack-keystone.logrotate
-Source2: openstack-keystone.service
+Source2: openstack-keystone.init
BuildArch: noarch
BuildRequires: python2-devel
BuildRequires: python-sphinx10
-BuildRequires: systemd-units
Requires: python-eventlet
Requires: python-httplib2
@@ -32,9 +29,9 @@ Requires: python-sqlite2
Requires: python-webob
Requires: python-passlib
-Requires(post): systemd-units
-Requires(preun): systemd-units
-Requires(postun): systemd-units
+Requires(post): chkconfig
+Requires(postun): initscripts
+Requires(preun): chkconfig
Requires(pre): shadow-utils
%description
@@ -57,6 +54,9 @@ sed -i 's|\(sql_connection = sqlite:///\)keystone.db|\1%{_sharedstatedir}/keysto
find . \( -name .gitignore -o -name .placeholder \) -delete
find keystone -name \*.py -exec sed -i '/\/usr\/bin\/env python/d' {} \;
+# change sphinx-build to sphinx-1.0-build in makefiles
+#sed -i 's|sphinx-build|sphinx-1\.0-build|' build/lib/doc/Makefile
+sed -i 's|sphinx-build|sphinx-1\.0-build|' doc/Makefile
%build
%{__python} setup.py build
@@ -65,9 +65,11 @@ find examples -type f -exec chmod 0664 \{\} \;
%install
%{__python} setup.py install -O1 --skip-build --root %{buildroot}
+# Install initscripts for Nova services
+install -p -D -m 755 %{SOURCE2} %{buildroot}%{_initrddir}/openstack-keystone
+
install -p -D -m 644 etc/keystone.conf %{buildroot}%{_sysconfdir}/keystone/keystone.conf
install -p -D -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/logrotate.d/openstack-keystone
-install -p -D -m 644 %{SOURCE2} %{buildroot}%{_unitdir}/openstack-keystone.service
install -d -m 755 %{buildroot}%{_sharedstatedir}/keystone
install -d -m 755 %{buildroot}%{_localstatedir}/log/keystone
@@ -116,12 +118,12 @@ fi
%doc examples
%{python_sitelib}/*
%{_bindir}/keystone*
-%{_unitdir}/openstack-keystone.service
%dir %{_sysconfdir}/keystone
%config(noreplace) %{_sysconfdir}/keystone/keystone.conf
%config(noreplace) %{_sysconfdir}/logrotate.d/openstack-keystone
%dir %attr(-, keystone, keystone) %{_sharedstatedir}/keystone
%dir %attr(-, keystone, keystone) %{_localstatedir}/log/keystone
+%{_initrddir}/openstack-keystone
%changelog
* Fri Oct 21 2011 David Busby <oneiroi at fedoraproject.com> - 2011.3-1