[python-django-horizon/f17] - Update to rc1 snapshot - Drop no longer needed packages - Change default URL to http://localhost/d
Cole Robinson
crobinso at fedoraproject.org
Sun Mar 4 15:25:43 UTC 2012
commit f23db94d53aeb066abeff21930759606139dc400
Author: Cole Robinson <crobinso at redhat.com>
Date: Sun Mar 4 10:25:30 2012 -0500
- Update to rc1 snapshot
- Drop no longer needed packages
- Change default URL to http://localhost/dashboard
- Add dep on newly packaged python-django-nose
- Fix static content viewing (patch from Jan van Eldik) (bz 788567)
.gitignore | 1 +
openstack-dashboard.conf | 5 +-
python-django-horizon-db-var-path.patch | 13 -
python-django-horizon-drop-openstackx.patch | 995 --------------------------
python-django-horizon-no-dashboard-app.patch | 11 +
python-django-horizon-remove-test-dep.patch | 21 -
python-django-horizon.spec | 55 +-
sources | 2 +-
8 files changed, 42 insertions(+), 1061 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c930b59..37d6012 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/horizon-2012.1~e3.tar.gz
+/horizon-2012.1~rc1~20120304.1447.tar.gz
diff --git a/openstack-dashboard.conf b/openstack-dashboard.conf
index aa76fd5..0278612 100644
--- a/openstack-dashboard.conf
+++ b/openstack-dashboard.conf
@@ -2,9 +2,10 @@ WSGIDaemonProcess dashboard
WSGIProcessGroup dashboard
WSGISocketPrefix run/wsgi
-WSGIScriptAlias / /usr/share/openstack-dashboard/dashboard/wsgi/django.wsgi
+WSGIScriptAlias /dashboard /usr/share/openstack-dashboard/openstack_dashboard/wsgi/django.wsgi
+Alias /static /usr/share/openstack-dashboard/openstack_dashboard/static
-<Directory /usr/share/openstack-dashboard/dashboard/wsgi>
+<Directory /usr/share/openstack-dashboard/openstack_dashboard/wsgi>
Order allow,deny
Allow from all
</Directory>
diff --git a/python-django-horizon-no-dashboard-app.patch b/python-django-horizon-no-dashboard-app.patch
new file mode 100644
index 0000000..ffab78a
--- /dev/null
+++ b/python-django-horizon-no-dashboard-app.patch
@@ -0,0 +1,11 @@
+diff -rup horizon-2012.1/openstack_dashboard/settings.py foo/openstack_dashboard/settings.py
+--- horizon-2012.1/openstack_dashboard/settings.py 2012-03-03 20:00:59.000000000 -0500
++++ foo/openstack_dashboard/settings.py 2012-03-03 21:09:23.344952394 -0500
+@@ -89,7 +89,6 @@ STATICFILES_DIRS = (
+ )
+
+ INSTALLED_APPS = (
+- 'openstack_dashboard',
+ 'django.contrib.sessions',
+ 'django.contrib.messages',
+ 'django.contrib.staticfiles',
diff --git a/python-django-horizon.spec b/python-django-horizon.spec
index d1ac81b..8c830ce 100644
--- a/python-django-horizon.spec
+++ b/python-django-horizon.spec
@@ -2,8 +2,12 @@
# This is 2012.1 essex-3 milestone
#
%global release_name essex
-%global release_letter e
-%global milestone 3
+%global release_letter rc
+%global milestone 1
+%global snapdate 20120304
+%global git_revno 1447
+%global snaptag ~%{release_letter}%{milestone}~%{snapdate}.%{git_revno}
+
Name: python-django-horizon
Version: 2012.1
@@ -16,15 +20,12 @@ License: ASL 2.0 and BSD
URL: http://horizon.openstack.org
BuildArch: noarch
-Source0: http://launchpad.net/horizon/%{release_name}/%{release_name}-%{milestone}/+download/horizon-%{version}~%{release_letter}%{milestone}.tar.gz
+#Source0: http://launchpad.net/horizon/%{release_name}/%{release_name}-%{milestone}/+download/horizon-%{version}~%{release_letter}%{milestone}.tar.gz
+Source0: http://horizon.openstack.org/tarballs/horizon-%{version}%{snaptag}.tar.gz
Source1: openstack-dashboard.conf
-# This was supposed to be in essex-3 but came 2 patches too late
-Patch1: %{name}-drop-openstackx.patch
-# Dep is for testing only, so not required for a first run
-Patch2: %{name}-remove-test-dep.patch
-# Place sqlite DB in /var/lib/openstack-dashboard
-Patch3: %{name}-db-var-path.patch
+# We don't install dashboard in python sitelib, handle the fallout
+Patch1: %{name}-no-dashboard-app.patch
Requires: Django >= 1.3.0
Requires: openstack-glance >= 2012.1
@@ -33,6 +34,7 @@ Requires: python-dateutil
Requires: python-keystoneclient >= 2012.1
Requires: python-novaclient >= 2012.1
Requires: python-quantumclient >= 2012.1
+Requires: python-django-nose
BuildRequires: python2-devel
BuildRequires: python-setuptools
@@ -78,7 +80,7 @@ BuildRequires: python-dateutil
BuildRequires: python-keystoneclient
BuildRequires: python-novaclient >= 2012.1
BuildRequires: python-quantumclient
-
+BuildRequires: python-django-nose
%description doc
Documentation for the Django Horizon application for talking with Openstack
@@ -87,43 +89,32 @@ Documentation for the Django Horizon application for talking with Openstack
%prep
%setup -q -n horizon-%{version}
%patch1 -p1
-%patch2 -p1
-%patch3 -p1
%build
-pushd horizon
%{__python} setup.py build
-popd
%install
-pushd horizon
%{__python} setup.py install -O1 --skip-build --root %{buildroot}
-popd
install -m 0644 -D -p %{SOURCE1} %{buildroot}%{_sysconfdir}/httpd/conf.d/openstack-dashboard.conf
-# This is needed for docs building
-cp openstack-dashboard/local/local_settings.py.example \
- openstack-dashboard/local/local_settings.py
-
export PYTHONPATH="$( pwd ):$PYTHONPATH"
sphinx-build -b html docs/source html
# Fix hidden-file-or-dir warnings
rm -fr html/.doctrees html/.buildinfo
-install -d -m 755 %{buildroot}%{_localstatedir}/openstack-dashboard
install -d -m 755 %{buildroot}%{_sysconfdir}/openstack-dashboard
-rm openstack-dashboard/local/local_settings.py
-cp openstack-dashboard/local/local_settings.py.example \
+install -d -m 755 %{buildroot}%{_datadir}/openstack-dashboard
+
+cp openstack_dashboard/local/local_settings.py.example \
%{buildroot}%{_sysconfdir}/openstack-dashboard/local_settings
ln -s %{_sysconfdir}/openstack-dashboard/local_settings \
- openstack-dashboard/local/local_settings.py
-
-install -d -m 755 %{buildroot}%{_datadir}/openstack-dashboard
-cp -r openstack-dashboard/dashboard %{buildroot}%{_datadir}/openstack-dashboard
-cp -r openstack-dashboard/local %{buildroot}%{_datadir}/openstack-dashboard
+ %{buildroot}%{python_sitelib}/openstack_dashboard/local/local_settings.py
+mv %{buildroot}%{python_sitelib}/openstack_dashboard \
+ %{buildroot}%{_datadir}/openstack-dashboard
+rm -rf %{buildroot}%{python_sitelib}/openstack_dashboard
%files
%{python_sitelib}/horizon
@@ -132,7 +123,6 @@ cp -r openstack-dashboard/local %{buildroot}%{_datadir}/openstack-dashboard
%files -n openstack-dashboard
%{_datadir}/openstack-dashboard/
-%{_localstatedir}/openstack-dashboard/
%config(noreplace) %{_sysconfdir}/httpd/conf.d/openstack-dashboard.conf
%config(noreplace) %{_sysconfdir}/openstack-dashboard/local_settings
@@ -140,5 +130,12 @@ cp -r openstack-dashboard/local %{buildroot}%{_datadir}/openstack-dashboard
%doc html
%changelog
+* Sat Mar 03 2012 Cole Robinson <crobinso at redhat.com> - 2012.1-0.1.rc1
+- Update to rc1 snapshot
+- Drop no longer needed packages
+- Change default URL to http://localhost/dashboard
+- Add dep on newly packaged python-django-nose
+- Fix static content viewing (patch from Jan van Eldik) (bz 788567)
+
* Mon Jan 30 2012 Cole Robinson <crobinso at redhat.com> - 2012.1-0.1.e3
- Initial package
diff --git a/sources b/sources
index cd4547e..c1bb498 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-189c537031386cc7f140784bc124a50a horizon-2012.1~e3.tar.gz
+afcfadc5a5e9a5282f44d51e25e6da96 horizon-2012.1~rc1~20120304.1447.tar.gz
More information about the scm-commits
mailing list