[python-django-horizon/el6-havana: 40/40] Merge branch 'master' into el6-havana
Matthias Runge
mrunge at fedoraproject.org
Mon Sep 9 20:31:27 UTC 2013
commit 7cffbe1a8ceb3eff86e17e822c3823fa4f00c7c5
Merge: a513d67 cd0ef98
Author: Matthias Runge <mrunge at redhat.com>
Date: Mon Sep 9 21:34:09 2013 +0200
Merge branch 'master' into el6-havana
Conflicts:
.gitignore
0001-Don-t-access-the-net-while-building-docs.patch
0002-disable-debug-move-web-root.patch
0003-change-lockfile-location-to-tmp-and-also-add-localho.patch
python-django-horizon.spec
sources
.gitignore | 6 +-
0002-disable-debug-move-web-root.patch | 35 +-
...-Add-a-customization-module-based-on-RHOS.patch | 260 +++
0005-Revert-Adding-panels-for-trove.patch | 2375 ++++++++++++++++++++
...oslo.sphinx-and-remove-local-copy-of-doc-.patch | 1348 +++++++++++
...olicy-files-and-checks-to-etc-openstack-d.patch | 32 +
0008-move-SECRET_KEY-secret_key_store-to-tmp.patch | 43 +
python-django-horizon.spec | 154 +-
rh-logo.png | Bin 0 -> 60337 bytes
rhfavicon.ico | Bin 0 -> 446 bytes
sources | 2 +-
11 files changed, 4190 insertions(+), 65 deletions(-)
---
diff --cc python-django-horizon.spec
index f5cfcdd,71409d7..c3a6232
--- a/python-django-horizon.spec
+++ b/python-django-horizon.spec
@@@ -21,13 -25,16 +25,12 @@@ Source11: rh-logo.pn
Patch0001: 0001-Don-t-access-the-net-while-building-docs.patch
Patch0002: 0002-disable-debug-move-web-root.patch
Patch0003: 0003-change-lockfile-location-to-tmp-and-also-add-localho.patch
+ Patch0004: 0004-Add-a-customization-module-based-on-RHOS.patch
+ Patch0005: 0005-Revert-Adding-panels-for-trove.patch
+ Patch0006: 0006-Revert-Use-oslo.sphinx-and-remove-local-copy-of-doc-.patch
+ Patch0007: 0007-move-RBAC-policy-files-and-checks-to-etc-openstack-d.patch
+ Patch0008: 0008-move-SECRET_KEY-secret_key_store-to-tmp.patch
- %if 0%{?rhel}>6 || 0%{?fedora} > 17
- # grizzly requires python-django14
- BuildRequires: python-django14
- Requires: python-django14
-
- %else
-# patch will be included in 2013.2.b3
-
-
-
# epel6 has a separate Django14 package
%if 0%{?rhel}==6
Requires: Django14
@@@ -37,17 -44,8 +40,17 @@@ BuildRequires: Djang
Requires: Django
%endif
- %endif
Requires: python-dateutil
+Requires: python-glanceclient
+Requires: python-keystoneclient
+Requires: python-novaclient >= 2012.1
+Requires: python-neutronclient
+Requires: python-cinderclient
+Requires: python-swiftclient
+Requires: python-heatclient
+Requires: python-ceilometerclient
++
Requires: pytz
Requires: python-lockfile
@@@ -82,18 -87,28 +92,27 @@@ Group: Applications/Syste
Requires: httpd
Requires: mod_wsgi
Requires: python-django-horizon >= %{version}
- Requires: python-django-openstack-auth
- Requires: python-django-compressor
+ Requires: python-django-openstack-auth >= 1.0.11
+ Requires: python-django-compressor >= 1.3
Requires: python-django-appconf
+ Requires: python-glanceclient
+ Requires: python-keystoneclient >= 0.3
+ Requires: python-novaclient >= 2012.1
+ Requires: python-neutronclient
+ Requires: python-cinderclient
+ Requires: python-swiftclient
+ Requires: python-heatclient
+ Requires: python-ceilometerclient
+ # Requires: python-troveclient
+ Requires: python-netaddr
+ Requires: python-lesscpy
BuildRequires: python2-devel
- BuildRequires: python-django-openstack-auth
- BuildRequires: python-django-compressor
+ BuildRequires: python-django-openstack-auth >= 1.0.11
+ BuildRequires: python-django-compressor >= 1.3
BuildRequires: python-django-appconf
- BuildRequires: nodejs
- BuildRequires: nodejs-less
+ BuildRequires: python-lesscpy
--BuildRequires: pytz
%description -n openstack-dashboard
Openstack Dashboard is a web user interface for Openstack. The package
provides a reference implementation using the Django Horizon project,
@@@ -142,18 -179,14 +183,14 @@@ cp -p %{SOURCE4}
%build
%{__python} setup.py build
- %install
- %{__python} setup.py install -O1 --skip-build --root %{buildroot}
+ # compress css, js etc.
+ cp openstack_dashboard/local/local_settings.py.example openstack_dashboard/local/local_settings.py
-%{__python} manage.py collectstatic --noinput --pythonpath=../../lib/python2.7/site-packages/
-%{__python} manage.py compress --pythonpath=../../lib/python2.7/site-packages/
++%{__python} manage.py collectstatic --noinput --pythonpath=../../lib/python2.6/site-packages/
++%{__python} manage.py compress --pythonpath=../../lib/python2.6/site-packages/
- # drop httpd-conf snippet
- %if 0%{?rhel} || 0%{?fedora} <18
- install -m 0644 -D -p %{SOURCE1} %{buildroot}%{_sysconfdir}/httpd/conf.d/openstack-dashboard.conf
- %else
- # httpd-2.4 changed the syntax
- install -m 0644 -D -p %{SOURCE2} %{buildroot}%{_sysconfdir}/httpd/conf.d/openstack-dashboard.conf
- %endif
+ cp -a static/dashboard %{_buildir}
- cp openstack_dashboard/local/local_settings.py.example openstack_dashboard/local/local_settings.py
+ # build docs
export PYTHONPATH="$( pwd ):$PYTHONPATH"
%if 0%{?rhel}==6
sphinx-1.0-build -b html doc/source html
@@@ -171,14 -214,17 +218,18 @@@ install -d -m 755 %{buildroot}%{_syscon
# Copy everything to /usr/share
mv %{buildroot}%{python_sitelib}/openstack_dashboard \
%{buildroot}%{_datadir}/openstack-dashboard
- mv manage.py %{buildroot}%{_datadir}/openstack-dashboard
+ cp manage.py %{buildroot}%{_datadir}/openstack-dashboard
rm -rf %{buildroot}%{python_sitelib}/openstack_dashboard
+ # move customization stuff to /usr/share
+ mv openstack_dashboard_theme %{buildroot}%{_datadir}/openstack-dashboard
# Move config to /etc, symlink it back to /usr/share
+rm openstack_dashboard/local/local_settings.py
mv %{buildroot}%{_datadir}/openstack-dashboard/openstack_dashboard/local/local_settings.py.example %{buildroot}%{_sysconfdir}/openstack-dashboard/local_settings
- ln -s %{_sysconfdir}/openstack-dashboard/local_settings %{buildroot}%{_datadir}/openstack-dashboard/openstack_dashboard/local/local_settings.py
+ ln -s ../../../../../%{_sysconfdir}/openstack-dashboard/local_settings %{buildroot}%{_datadir}/openstack-dashboard/openstack_dashboard/local/local_settings.py
+
+ mv %{buildroot}%{_datadir}/openstack-dashboard/openstack_dashboard/conf/*.json %{buildroot}%{_sysconfdir}/openstack-dashboard
%if 0%{?rhel} > 6 || 0%{?fedora} >= 16
%find_lang django
@@@ -207,12 -253,11 +258,8 @@@ cat djangojs.lang >> horizon.lan
mkdir -p %{buildroot}%{_datadir}/openstack-dashboard/static
cp -a openstack_dashboard/static/* %{buildroot}%{_datadir}/openstack-dashboard/static
cp -a horizon/static/* %{buildroot}%{_datadir}/openstack-dashboard/static
-
- # compress css, js etc.
- cd %{buildroot}%{_datadir}/openstack-dashboard
- %{__python} manage.py collectstatic --noinput --pythonpath=../../lib/python2.6/site-packages/
- %{__python} manage.py compress --pythonpath=../../lib/python2.6/site-packages/
+ cp -a static/* %{buildroot}%{_datadir}/openstack-dashboard/static
-%check
-./run_tests.sh -N
-
%files -f horizon.lang
%doc LICENSE README.rst openstack-dashboard-httpd-logging.conf
%dir %{python_sitelib}/horizon
More information about the scm-commits
mailing list