Update RPM-specs to 2013.1.2 version

Change-Id: I2e491d22446063ce78e42b1f9fbc09f44f858971

diff --git a/rpm/SOURCES/0001-disable-debug.patch b/rpm/SOURCES/0001-disable-debug-move-web-root.patch
similarity index 75%
rename from rpm/SOURCES/0001-disable-debug.patch
rename to rpm/SOURCES/0001-disable-debug-move-web-root.patch
index fa5d2061d9bb8f0a41b97c5c3786ea895f71529a..cd133b8e9d57a17731977a0842a56c316e4b7215 100644 (file)
--- a/rpm/SOURCES/0001-disable-debug.patch
+++ b/rpm/SOURCES/0001-disable-debug-move-web-root.patch
@@ -1,16 +1,15 @@
-From 8cf09673312cf401c89e01f7293b2332a9dc33f2 Mon Sep 17 00:00:00 2001
+From 51cc8bdbbfb2d3a7fc678f40bb48d3c5129e525f Mon Sep 17 00:00:00 2001
 From: Matthias Runge <mrunge@redhat.com>
-Date: Tue, 27 Nov 2012 14:08:00 +0100
-Subject: [PATCH] - disable debug - make url movable (currently moved to
- /dashboard - enable offline compression
+Date: Fri, 5 Apr 2013 10:07:53 +0200
+Subject: [PATCH] disable debug, move web root
 
 ---
- openstack_dashboard/local/local_settings.py.example |  2 +-
+ openstack_dashboard/local/local_settings.py.example |  4 ++--
  openstack_dashboard/settings.py                     | 12 +++++++-----
- 2 files changed, 8 insertions(+), 6 deletions(-)
+ 2 files changed, 9 insertions(+), 7 deletions(-)
 
 diff --git a/openstack_dashboard/local/local_settings.py.example b/openstack_dashboard/local/local_settings.py.example
-index b85fa80..6ee1988 100644
+index 8f79020..d6d6d7a 100644
 --- a/openstack_dashboard/local/local_settings.py.example
 +++ b/openstack_dashboard/local/local_settings.py.example
 @@ -4,7 +4,7 @@ from django.utils.translation import ugettext_lazy as _
@@ -22,8 +21,17 @@ index b85fa80..6ee1988 100644
  TEMPLATE_DEBUG = DEBUG
  
  # Set SSL proxy settings:
+@@ -116,7 +116,7 @@ OPENSTACK_KEYSTONE_BACKEND = {
+ }
+ 
+ OPENSTACK_HYPERVISOR_FEATURES = {
+-    'can_set_mount_point': True,
++    'can_set_mount_point': False,
+ 
+     # NOTE: as of Grizzly this is not yet supported in Nova so enabling this
+     # setting will not do anything useful
 diff --git a/openstack_dashboard/settings.py b/openstack_dashboard/settings.py
-index da89944..9e7cec9 100644
+index d568533..bbe2870 100644
 --- a/openstack_dashboard/settings.py
 +++ b/openstack_dashboard/settings.py
 @@ -29,7 +29,7 @@ warnings.formatwarning = lambda message, category, *args, **kwargs: \
@@ -52,7 +60,7 @@ index da89944..9e7cec9 100644
  
  MEDIA_ROOT = os.path.abspath(os.path.join(ROOT_PATH, '..', 'media'))
  MEDIA_URL = '/media/'
-@@ -108,7 +109,7 @@ STATICFILES_FINDERS = (
+@@ -113,7 +114,7 @@ STATICFILES_FINDERS = (
      'django.contrib.staticfiles.finders.AppDirectoriesFinder',
  )
  
@@ -61,7 +69,7 @@ index da89944..9e7cec9 100644
  COMPRESS_PRECOMPILERS = (
      ('text/less', (less_binary + ' {infile} {outfile}')),
  )
-@@ -121,6 +122,7 @@ COMPRESS_ENABLED = True
+@@ -126,6 +127,7 @@ COMPRESS_ENABLED = True
  COMPRESS_OUTPUT_DIR = 'dashboard'
  COMPRESS_CSS_HASHING_METHOD = 'hash'
  COMPRESS_PARSER = 'compressor.parser.HtmlParser'

diff --git a/rpm/SOURCES/0002-Don-t-access-the-net-while-building-docs.patch b/rpm/SOURCES/0002-Don-t-access-the-net-while-building-docs.patch
index 5f4dde0b4e4c4d391dc9d459eb494b9efb326a04..d442315c03c202e2d32cca9d2dd667fd91d2e0a2 100644 (file)
--- a/rpm/SOURCES/0002-Don-t-access-the-net-while-building-docs.patch
+++ b/rpm/SOURCES/0002-Don-t-access-the-net-while-building-docs.patch
@@ -1,9 +1,9 @@
-From 9ec313da0a17efe80ac38f8a037ff967da2aaac0 Mon Sep 17 00:00:00 2001
+From 58b5ad25f4bd34ff9f4b27bf72f2efd039bf24bf Mon Sep 17 00:00:00 2001
 From: Matthias Runge <mrunge@redhat.com>
-Date: Wed, 28 Nov 2012 11:37:48 +0100
-Subject: [PATCH] Don't access the net while building docs
+Date: Fri, 5 Apr 2013 10:16:19 +0200
+Subject: [PATCH] Don't access the net while building docs (Note this hasn't
+ been submitted upstream)
 
-(Note this hasn't been submitted upstream)
 ---
  doc/source/conf.py | 1 -
  1 file changed, 1 deletion(-)

diff --git a/rpm/SOURCES/0003-take-variables-out-of-compressed-output.patch b/rpm/SOURCES/0003-take-variables-out-of-compressed-output.patch
deleted file mode 100644 (file)
index eb3a815..0000000
--- a/rpm/SOURCES/0003-take-variables-out-of-compressed-output.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 75baecee3b897505492e28f005042247790dc756 Mon Sep 17 00:00:00 2001
-From: Matthias Runge <mrunge@redhat.com>
-Date: Thu, 29 Nov 2012 11:14:29 +0100
-Subject: [PATCH] take variables out of compressed output
-
----
- horizon/templates/horizon/_conf.html | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/horizon/templates/horizon/_conf.html b/horizon/templates/horizon/_conf.html
-index 2dc70fa..2ed6382 100644
---- a/horizon/templates/horizon/_conf.html
-+++ b/horizon/templates/horizon/_conf.html
-@@ -3,6 +3,7 @@
- {% compress js %}
- <script src='{{ STATIC_URL }}horizon/js/horizon.js' type='text/javascript' charset='utf-8'></script>
- <script src='{{ STATIC_URL }}horizon/js/horizon.conf.js' type='text/javascript' charset='utf-8'></script>
-+{% endcompress %}
- <script type='text/javascript' charset='utf-8'>
- /* Storage for backend configuration variables which the frontend
-  * should be aware of.
-@@ -13,4 +14,3 @@ horizon.conf.ajax = {
-   types: {{ HORIZON_CONFIG.auto_fade_alerts.types|default:"[]"|safe }}
- };
- </script>
--{% endcompress %}

diff --git a/rpm/SOURCES/0004-disable-to-set-mount-point-as-it-s-unsupported-here.patch b/rpm/SOURCES/0004-disable-to-set-mount-point-as-it-s-unsupported-here.patch
deleted file mode 100644 (file)
index c0106d0..0000000
--- a/rpm/SOURCES/0004-disable-to-set-mount-point-as-it-s-unsupported-here.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From d691a94942328f6924077f985f4290f93a9a7bb6 Mon Sep 17 00:00:00 2001
-From: Matthias Runge <mrunge@redhat.com>
-Date: Thu, 17 Jan 2013 10:06:25 +0100
-Subject: [PATCH] disable to set mount point, as it's unsupported here
-
----
- openstack_dashboard/local/local_settings.py.example | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/openstack_dashboard/local/local_settings.py.example b/openstack_dashboard/local/local_settings.py.example
-index 6ee1988..268d65d 100644
---- a/openstack_dashboard/local/local_settings.py.example
-+++ b/openstack_dashboard/local/local_settings.py.example
-@@ -97,11 +97,10 @@ OPENSTACK_KEYSTONE_BACKEND = {
- }
- 
- OPENSTACK_HYPERVISOR_FEATURES = {
--    'can_set_mount_point': True,
--
-     # NOTE: as of Grizzly this is not yet supported in Nova so enabling this
-     # setting will not do anything useful
-     'can_encrypt_volumes': False
-+    'can_set_mount_point': False
- }
- 
- # OPENSTACK_ENDPOINT_TYPE specifies the endpoint type to use for the endpoints

diff --git a/rpm/SPECS/python-django-horizon.spec b/rpm/SPECS/python-django-horizon.spec
index bf6261d50e3811d687975a9d7df3794032d4a2e1..0b4676d146b27eeb8a34a1270b5a1f71099db60f 100644 (file)
--- a/rpm/SPECS/python-django-horizon.spec
+++ b/rpm/SPECS/python-django-horizon.spec
@@ -1,6 +1,6 @@
 Name:       python-django-horizon
-Version:    2013.1
-Release:    0.7.g3%{?dist}
+Version:    2013.1.1
+Release:    1%{?dist}
 Summary:    Django application for talking to Openstack
 
 Group:      Development/Libraries
@@ -12,21 +12,21 @@ Source0:    horizon-%{version}.tar.gz
 Source1:    openstack-dashboard.conf
 Source2:    openstack-dashboard-httpd-2.4.conf
 
-Source3:    python-django-horizon-2013.1-compressed-css.tar.gz
 # demo config for separate logging
 Source4:    openstack-dashboard-httpd-logging.conf
 
 #
-# patches_base=2013.1.g3
+# patches_base=2013.1.1
 #
-Patch0001: 0001-disable-debug.patch
+Patch0001: 0001-disable-debug-move-web-root.patch
 Patch0002: 0002-Don-t-access-the-net-while-building-docs.patch
-Patch0003: 0003-take-variables-out-of-compressed-output.patch
-Patch0004: 0004-disable-to-set-mount-point-as-it-s-unsupported-here.patch
 
+%if 0%{?rhel}>6 || 0%{?fedora} > 17
+# grizzly requires python-django14
+BuildRequires:   python-django14
+Requires:   python-django14
 
-%if 0%{?rhel}<7 || 0%{?fedora} < 18
-
+%else
 # epel6 has a separate Django14 package
 %if 0%{?rhel}==6
 Requires:   Django14
@@ -36,9 +36,6 @@ BuildRequires:   Django
 Requires:   Django
 %endif
 
-%else
-BuildRequires:   python-django
-Requires:   python-django
 %endif
 
 Requires:   python-dateutil
@@ -81,12 +78,13 @@ Requires:   python-django-horizon >= %{version}
 Requires:   python-django-openstack-auth
 Requires:   python-django-compressor
 Requires:   python-django-appconf
-Requires: nodejs nodejs-less
 
 BuildRequires: python2-devel
 BuildRequires: python-django-openstack-auth
 BuildRequires: python-django-compressor
 BuildRequires: python-django-appconf
+BuildRequires: nodejs
+BuildRequires: nodejs-less
 
 BuildRequires:   pytz 
 %description -n openstack-dashboard
@@ -125,8 +123,6 @@ Documentation for the Django Horizon application for talking with Openstack
 
 %patch0001 -p1
 %patch0002 -p1
-%patch0003 -p1
-#%patch0004 -p1
 # remove unnecessary .po files
 find . -name "django*.po" -exec rm -f '{}' \;
 
@@ -202,7 +198,8 @@ cp -a horizon/static/* %{buildroot}%{_datadir}/openstack-dashboard/static
 
 # compress css, js etc.
 cd %{buildroot}%{_datadir}/openstack-dashboard
-tar xzf %{SOURCE3}
+%{__python} manage.py collectstatic --noinput --pythonpath=../../lib/python2.6/site-packages/ 
+%{__python} manage.py compress --pythonpath=../../lib/python2.6/site-packages/
 
 %files -f horizon.lang
 %doc LICENSE README.rst openstack-dashboard-httpd-logging.conf
@@ -251,6 +248,13 @@ tar xzf %{SOURCE3}
 %doc html 
 
 %changelog
+* Mon May 13 2013 Matthias Runge <mrunge@redhat.com> - 2013.1.1-1
+- update to 2013.1.1 stable release
+- move to compression using node.js/less
+
+* Mon Apr 08 2013 Matthias Runge <mrunge@redhat.com> - 2013.1-1
+- update to grizzly final
+
 * Thu Mar 14 2013 Matthias Runge <mrunge@redhat.com> - 2013.1-0.7.g3
 - fix compressed css (rhbz#921036)
 - enable compression in httpd file