Code Review / openstack-build / horizon-build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: e2bdf89)
Update RPM-specs to 2013.2 version
authorDmitry Burmistrov <dburmistrov@mirantis.com>
Thu, 26 Sep 2013 07:12:23 +0000 (11:12 +0400)
committerSergey Otpuschennikov <sotpuschennikov@mirantis.com>
Mon, 7 Oct 2013 08:32:51 +0000 (12:32 +0400)
Change-Id: I263de1a612d9956e78b0346e96513e7d80e52618

rpm/SOURCES/0001-Don-t-access-the-net-while-building-docs.patch [moved from rpm/SOURCES/0002-Don-t-access-the-net-while-building-docs.patch with 87% similarity] patch | blob | history
rpm/SOURCES/0002-disable-debug-move-web-root.patch [moved from rpm/SOURCES/0001-disable-debug-move-web-root.patch with 76% similarity] patch | blob | history
rpm/SOURCES/0003-change-lockfile-location-to-tmp-and-also-add-localho.patch [new file with mode: 0644] patch | blob
rpm/SOURCES/python-django-horizon-2013.1-compressed-css.tar.gz [deleted file] patch | blob | history
rpm/SPECS/python-django-horizon.spec patch | blob | history

diff --git a/rpm/SOURCES/0002-Don-t-access-the-net-while-building-docs.patch b/rpm/SOURCES/0001-Don-t-access-the-net-while-building-docs.patch
similarity index 87%
rename from rpm/SOURCES/0002-Don-t-access-the-net-while-building-docs.patch
rename to rpm/SOURCES/0001-Don-t-access-the-net-while-building-docs.patch
index d442315c03c202e2d32cca9d2dd667fd91d2e0a2..c94b52181c831d1c74ac486bf6378895da8fefbd 100644 (file)
--- a/rpm/SOURCES/0002-Don-t-access-the-net-while-building-docs.patch
+++ b/rpm/SOURCES/0001-Don-t-access-the-net-while-building-docs.patch
@@ -1,4 +1,4 @@
-From 58b5ad25f4bd34ff9f4b27bf72f2efd039bf24bf Mon Sep 17 00:00:00 2001
+From ba1ba0020a81ca144e705a51c9f6b5dace0f30bf Mon Sep 17 00:00:00 2001
 From: Matthias Runge <mrunge@redhat.com>
 Date: Fri, 5 Apr 2013 10:16:19 +0200
 Subject: [PATCH] Don't access the net while building docs (Note this hasn't
@@ -9,7 +9,7 @@ Subject: [PATCH] Don't access the net while building docs (Note this hasn't
  1 file changed, 1 deletion(-)
 
 diff --git a/doc/source/conf.py b/doc/source/conf.py
-index 561b440..beaaef4 100644
+index 297a688..adb3d14 100644
 --- a/doc/source/conf.py
 +++ b/doc/source/conf.py
 @@ -141,7 +141,6 @@ write_autodoc_index()
diff --git a/rpm/SOURCES/0001-disable-debug-move-web-root.patch b/rpm/SOURCES/0002-disable-debug-move-web-root.patch
similarity index 76%
rename from rpm/SOURCES/0001-disable-debug-move-web-root.patch
rename to rpm/SOURCES/0002-disable-debug-move-web-root.patch
index cd133b8e9d57a17731977a0842a56c316e4b7215..9d7a8b1d6c63784c8389d9f1c5dbe0a908816748 100644 (file)
--- a/rpm/SOURCES/0001-disable-debug-move-web-root.patch
+++ b/rpm/SOURCES/0002-disable-debug-move-web-root.patch
@@ -1,4 +1,4 @@
-From 51cc8bdbbfb2d3a7fc678f40bb48d3c5129e525f Mon Sep 17 00:00:00 2001
+From 49d587ea6b374f10e7150b2d1043cf525664ca49 Mon Sep 17 00:00:00 2001
 From: Matthias Runge <mrunge@redhat.com>
 Date: Fri, 5 Apr 2013 10:07:53 +0200
 Subject: [PATCH] disable debug, move web root
@@ -9,7 +9,7 @@ Subject: [PATCH] disable debug, move web root
  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 8f79020..d6d6d7a 100644
+index 8ee9495..b743d0e 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 _
@@ -20,22 +20,22 @@ index 8f79020..d6d6d7a 100644
 +DEBUG = False
  TEMPLATE_DEBUG = DEBUG
  
- # Set SSL proxy settings:
-@@ -116,7 +116,7 @@ OPENSTACK_KEYSTONE_BACKEND = {
+ # Required for Django 1.5.
+@@ -150,7 +150,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
+ # The OPENSTACK_NEUTRON_NETWORK settings can be used to enable optional
 diff --git a/openstack_dashboard/settings.py b/openstack_dashboard/settings.py
-index d568533..bbe2870 100644
+index 254f0ce..cae6247 100644
 --- a/openstack_dashboard/settings.py
 +++ b/openstack_dashboard/settings.py
-@@ -29,7 +29,7 @@ warnings.formatwarning = lambda message, category, *args, **kwargs: \
-                                 '%s: %s' % (category.__name__, message)
+@@ -31,7 +31,7 @@ warnings.formatwarning = lambda message, category, *args, **kwargs: \
+     '%s: %s' % (category.__name__, message)
  
  ROOT_PATH = os.path.dirname(os.path.abspath(__file__))
 -BIN_DIR = os.path.abspath(os.path.join(ROOT_PATH, '..', 'bin'))
@@ -60,16 +60,16 @@ index d568533..bbe2870 100644
  
  MEDIA_ROOT = os.path.abspath(os.path.join(ROOT_PATH, '..', 'media'))
  MEDIA_URL = '/media/'
-@@ -113,7 +114,7 @@ STATICFILES_FINDERS = (
+@@ -132,6 +132,8 @@ STATICFILES_FINDERS = (
      'django.contrib.staticfiles.finders.AppDirectoriesFinder',
  )
  
--less_binary = os.path.join(BIN_DIR, 'less', 'lessc')
 +less_binary = os.path.join(BIN_DIR, 'lessc')
++
  COMPRESS_PRECOMPILERS = (
-     ('text/less', (less_binary + ' {infile} {outfile}')),
+     ('text/less', ('lesscpy {infile}')),
  )
-@@ -126,6 +127,7 @@ COMPRESS_ENABLED = True
+@@ -125,6 +126,7 @@ COMPRESS_ENABLED = True
  COMPRESS_OUTPUT_DIR = 'dashboard'
  COMPRESS_CSS_HASHING_METHOD = 'hash'
  COMPRESS_PARSER = 'compressor.parser.HtmlParser'
diff --git a/rpm/SOURCES/0003-change-lockfile-location-to-tmp-and-also-add-localho.patch b/rpm/SOURCES/0003-change-lockfile-location-to-tmp-and-also-add-localho.patch
new file mode 100644 (file)
index 0000000..eaf0186
--- /dev/null
+++ b/rpm/SOURCES/0003-change-lockfile-location-to-tmp-and-also-add-localho.patch
@@ -0,0 +1,32 @@
+From fcf8b00597925b908f565bd27b29b440f41b3e78 Mon Sep 17 00:00:00 2001
+From: Matthias Runge <mrunge@redhat.com>
+Date: Thu, 25 Jul 2013 11:32:38 +0200
+Subject: [PATCH] change lockfile location to '/tmp' and also add localhost to
+ ALLOWED_HOSTS
+
+---
+ openstack_dashboard/local/local_settings.py.example | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/openstack_dashboard/local/local_settings.py.example b/openstack_dashboard/local/local_settings.py.example
+index 3f5da3d..52f1656 100644
+--- a/openstack_dashboard/local/local_settings.py.example
++++ b/openstack_dashboard/local/local_settings.py.example
+@@ -12,7 +12,7 @@ TEMPLATE_DEBUG = DEBUG
+ # with the list of host/domain names that the application can serve.
+ # For more information see:
+ # https://docs.djangoproject.com/en/dev/ref/settings/#allowed-hosts
+-#ALLOWED_HOSTS = ['horizon.example.com', ]
++ALLOWED_HOSTS = ['horizon.example.com', 'localhost']
+ 
+ # Set SSL proxy settings:
+ # For Django 1.4+ pass this header from the proxy after terminating the SSL,
+@@ -77,7 +77,7 @@ HORIZON_CONFIG = {
+ # Turn off browser autocompletion for the login form if so desired.
+ # HORIZON_CONFIG["password_autocomplete"] = "off"
+ 
+-LOCAL_PATH = os.path.dirname(os.path.abspath(__file__))
++LOCAL_PATH = '/tmp'
+ 
+ # Set custom secret key:
+ # You can either set it to a specific value or you can let horizion generate a
diff --git a/rpm/SOURCES/python-django-horizon-2013.1-compressed-css.tar.gz b/rpm/SOURCES/python-django-horizon-2013.1-compressed-css.tar.gz
deleted file mode 100644 (file)
index 2623a16..0000000
Binary files a/rpm/SOURCES/python-django-horizon-2013.1-compressed-css.tar.gz and /dev/null differ
diff --git a/rpm/SPECS/python-django-horizon.spec b/rpm/SPECS/python-django-horizon.spec
index 5150dcd0594f9a1d2710491c5a5ee80535fff621..129299d50b1179517473d9415654ee2c2b45584d 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.1
-Release:    1%{?dist}
+Version:    2013.2
+Release:    0.5b2%{?dist}
 Summary:    Django application for talking to Openstack
 
 Group:      Development/Libraries
@@ -8,19 +8,19 @@ Group:      Development/Libraries
 License:    ASL 2.0 and BSD
 URL:        http://horizon.openstack.org/
 BuildArch:  noarch
-Source0:    horizon-%{version}.tar.gz
+Source0:     https://launchpad.net/horizon/havana/havana-2/+download/horizon-%{version}.b2.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.1
+# patches_base=2013.2.b2
 #
-Patch0001: 0001-disable-debug-move-web-root.patch
-Patch0002: 0002-Don-t-access-the-net-while-building-docs.patch
+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
 
 %if 0%{?rhel}>6 || 0%{?fedora} > 17
 # grizzly requires python-django14
@@ -43,13 +43,20 @@ Requires:   python-dateutil
 Requires:   python-glanceclient
 Requires:   python-keystoneclient 
 Requires:   python-novaclient >= 2012.1
-Requires:   python-quantumclient
+Requires:   python-neutronclient
 Requires:   python-cinderclient
 Requires:   python-swiftclient
+Requires:   python-heatclient
+Requires:   python-ceilometerclient
 Requires:   pytz
+Requires:   python-lockfile
 
 BuildRequires: python2-devel
 BuildRequires: python-setuptools
+BuildRequires: python-pbr
+BuildRequires: python-d2to1
+BuildRequires: python-lockfile
+BuildRequires: python-oslo-sphinx
 
 # for checks:
 #BuildRequires:   python-django-nose
@@ -111,9 +118,11 @@ BuildRequires: python-dateutil
 BuildRequires: python-glanceclient
 BuildRequires: python-keystoneclient
 BuildRequires: python-novaclient >= 2012.1
-BuildRequires: python-quantumclient
+BuildRequires: python-neutronclient
 BuildRequires: python-cinderclient
 BuildRequires: python-swiftclient
+BuildRequires: python-heatclient
+BuildRequires: python-ceilometerclient
 
 %description doc
 Documentation for the Django Horizon application for talking with Openstack
@@ -124,6 +133,7 @@ Documentation for the Django Horizon application for talking with Openstack
 
 %patch0001 -p1
 %patch0002 -p1
+%patch0003 -p1
 # remove unnecessary .po files
 find . -name "django*.po" -exec rm -f '{}' \;
 
@@ -144,6 +154,7 @@ install -m 0644 -D -p %{SOURCE1} %{buildroot}%{_sysconfdir}/httpd/conf.d/opensta
 install -m 0644 -D -p %{SOURCE2} %{buildroot}%{_sysconfdir}/httpd/conf.d/openstack-dashboard.conf
 %endif
 
+cp openstack_dashboard/local/local_settings.py.example openstack_dashboard/local/local_settings.py
 export PYTHONPATH="$( pwd ):$PYTHONPATH"
 %if 0%{?rhel}==6
 sphinx-1.0-build -b html doc/source html
@@ -166,6 +177,7 @@ rm -rf %{buildroot}%{python_sitelib}/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
 
@@ -199,9 +211,8 @@ 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 collectstatic --noinput --pythonpath=../../lib/python2.6/site-packages/ 
 #%{__python} manage.py compress --pythonpath=../../lib/python2.6/site-packages/
-tar -xzf %{SOURCE3}
 
 %files -f horizon.lang
 %doc LICENSE README.rst openstack-dashboard-httpd-logging.conf
@@ -220,7 +231,6 @@ tar -xzf %{SOURCE3}
 %{python_sitelib}/horizon/utils
 %{python_sitelib}/horizon/workflows
 %{python_sitelib}/*.egg-info
-%exclude %{python_sitelib}/bin
 
 %files -n openstack-dashboard -f dashboard.lang
 %dir %{_datadir}/openstack-dashboard/
@@ -235,7 +245,9 @@ tar -xzf %{SOURCE3}
 %{_datadir}/openstack-dashboard/openstack_dashboard/templates
 %{_datadir}/openstack-dashboard/openstack_dashboard/test
 %{_datadir}/openstack-dashboard/openstack_dashboard/usage
+%{_datadir}/openstack-dashboard/openstack_dashboard/utils
 %{_datadir}/openstack-dashboard/openstack_dashboard/wsgi
+%{_datadir}/openstack-dashboard/openstack_dashboard/conf
 %dir %{_datadir}/openstack-dashboard/openstack_dashboard/locale
 %dir %{_datadir}/openstack-dashboard/openstack_dashboard/locale/??
 %dir %{_datadir}/openstack-dashboard/openstack_dashboard/locale/??_??
@@ -250,6 +262,18 @@ tar -xzf %{SOURCE3}
 %doc html 
 
 %changelog
+* Wed Aug 07 2013 Matthias Runge <mrunge@redhat.com> - 2013.2-0.5b2
+- bump spec to rebuild against python-django-compressor >= 1.3
+
+* Thu Jul 25 2013 Matthias Runge <mrunge@redhat.com> - 2013.2-0.4b2
+- havana-2
+- change requirements from python-quantumclient to neutronclient
+- require python-ceilometerclient
+- add requirement python-lockfile, change lockfile location to /tmp
+
+* Mon Jun 03 2013 Matthias Runge <mrunge@redhat.com> - 2013.2-0.1b1
+- update to 2013.2.b1
+
 * 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