mrunge pushed to python-django-horizon (master). "Finish off rebase to 2015.1.0rc1 (..more)"

notifications at fedoraproject.org notifications at fedoraproject.org
Thu Apr 16 10:32:10 UTC 2015


>From e478192349e6472b728c68567718dfddd341dec1 Mon Sep 17 00:00:00 2001
From: Matthias Runge <mrunge at redhat.com>
Date: Wed, 15 Apr 2015 08:33:46 +0200
Subject: Finish off rebase to 2015.1.0rc1

Change-Id: I41c00d201546eeb6d83d169819d834a8b03c7422

diff --git a/0001-disable-debug-move-web-root.patch b/0001-disable-debug-move-web-root.patch
index b2bc9a1..611bc45 100644
--- a/0001-disable-debug-move-web-root.patch
+++ b/0001-disable-debug-move-web-root.patch
@@ -1,4 +1,4 @@
-From 13eb914a2815fcce892629a3e97e6c4d5eed6284 Mon Sep 17 00:00:00 2001
+From abf30eccde4047a211c688b85650cf93730a9681 Mon Sep 17 00:00:00 2001
 From: Matthias Runge <mrunge at redhat.com>
 Date: Fri, 5 Apr 2013 10:07:53 +0200
 Subject: [PATCH] disable debug, move web root
@@ -10,7 +10,7 @@ move RBAC policy files and checks to /etc/openstack-dashboard
  2 files changed, 8 insertions(+), 6 deletions(-)
 
 diff --git a/openstack_dashboard/local/local_settings.py.example b/openstack_dashboard/local/local_settings.py.example
-index 9c2c12d..c9cbc3f 100644
+index 569cf21..6a762bf 100644
 --- a/openstack_dashboard/local/local_settings.py.example
 +++ b/openstack_dashboard/local/local_settings.py.example
 @@ -4,13 +4,13 @@ from django.utils.translation import ugettext_lazy as _
@@ -54,7 +54,7 @@ index 9c2c12d..c9cbc3f 100644
  SECRET_KEY = secret_key.generate_or_read_from_file(
      os.path.join(LOCAL_PATH, '.secret_key_store'))
  
-@@ -315,7 +315,8 @@ TIME_ZONE = "UTC"
+@@ -348,7 +348,8 @@ TIME_ZONE = "UTC"
  # target installation.
  
  # Path to directory containing policy.json files
@@ -65,7 +65,7 @@ index 9c2c12d..c9cbc3f 100644
  #POLICY_FILES = {
  #    'identity': 'keystone_policy.json',
 diff --git a/openstack_dashboard/settings.py b/openstack_dashboard/settings.py
-index 9d0a683..b762880 100644
+index 5a22e45..663f4d7 100644
 --- a/openstack_dashboard/settings.py
 +++ b/openstack_dashboard/settings.py
 @@ -32,7 +32,7 @@ warnings.formatwarning = lambda message, category, *args, **kwargs: \
@@ -77,7 +77,7 @@ index 9d0a683..b762880 100644
  
  if ROOT_PATH not in sys.path:
      sys.path.append(ROOT_PATH)
-@@ -153,6 +153,7 @@ COMPRESS_ENABLED = True
+@@ -148,6 +148,7 @@ COMPRESS_ENABLED = True
  COMPRESS_OUTPUT_DIR = 'dashboard'
  COMPRESS_CSS_HASHING_METHOD = 'hash'
  COMPRESS_PARSER = 'compressor.parser.HtmlParser'
diff --git a/0002-remove-runtime-dep-to-python-pbr.patch b/0002-remove-runtime-dep-to-python-pbr.patch
index 79ce2d3..732639e 100644
--- a/0002-remove-runtime-dep-to-python-pbr.patch
+++ b/0002-remove-runtime-dep-to-python-pbr.patch
@@ -1,4 +1,4 @@
-From b6c199c61100bbb684fd8224826cc87bf2256ae6 Mon Sep 17 00:00:00 2001
+From e97018e352142dcaef8405c0ab30847dc7d40afa Mon Sep 17 00:00:00 2001
 From: Matthias Runge <mrunge at redhat.com>
 Date: Fri, 15 Nov 2013 09:42:08 +0100
 Subject: [PATCH] remove runtime dep to python-pbr
diff --git a/0003-Add-a-customization-module-based-on-RHOS.patch b/0003-Add-a-customization-module-based-on-RHOS.patch
index 5ecebb8..d09fbbb 100644
--- a/0003-Add-a-customization-module-based-on-RHOS.patch
+++ b/0003-Add-a-customization-module-based-on-RHOS.patch
@@ -1,4 +1,4 @@
-From f95327667235acbde6d88b019d458e2a2b84aed9 Mon Sep 17 00:00:00 2001
+From 800613e16778e3ed470c082541ac107b43c5c2eb Mon Sep 17 00:00:00 2001
 From: Matthias Runge <mrunge at redhat.com>
 Date: Thu, 14 Feb 2013 12:55:54 +0100
 Subject: [PATCH] Add a customization module based on RHOS
@@ -46,10 +46,10 @@ index 0000000..272bcbe
 +# A list of applications to be added to INSTALLED_APPS.
 +ADD_INSTALLED_APPS = ['openstack_dashboard.dashboards.theme']
 diff --git a/openstack_dashboard/settings.py b/openstack_dashboard/settings.py
-index b762880..832ccb4 100644
+index 663f4d7..e3c5405 100644
 --- a/openstack_dashboard/settings.py
 +++ b/openstack_dashboard/settings.py
-@@ -126,14 +126,13 @@ TEMPLATE_CONTEXT_PROCESSORS = (
+@@ -121,14 +121,13 @@ TEMPLATE_CONTEXT_PROCESSORS = (
  )
  
  TEMPLATE_LOADERS = (
@@ -65,7 +65,7 @@ index b762880..832ccb4 100644
  
  STATICFILES_FINDERS = (
      'django.contrib.staticfiles.finders.FileSystemFinder',
-@@ -170,6 +169,15 @@ INSTALLED_APPS = [
+@@ -165,6 +164,15 @@ INSTALLED_APPS = [
      'openstack_auth',
  ]
  
diff --git a/0004-RCUE-navbar-and-login-screen.patch b/0004-RCUE-navbar-and-login-screen.patch
index 05c8eed..f5cec3a 100644
--- a/0004-RCUE-navbar-and-login-screen.patch
+++ b/0004-RCUE-navbar-and-login-screen.patch
@@ -1,4 +1,4 @@
-From eaeadbed5512b0648db276ee80ed802effadf200 Mon Sep 17 00:00:00 2001
+From 36b2981dd20cc3fa4fd86e5277022301f8413bed Mon Sep 17 00:00:00 2001
 From: Matthias Runge <mrunge at redhat.com>
 Date: Tue, 14 Oct 2014 11:33:00 +0200
 Subject: [PATCH] RCUE navbar and login screen
@@ -19085,10 +19085,10 @@ index 272bcbe..f37f848 100644
  ADD_INSTALLED_APPS = ['openstack_dashboard.dashboards.theme']
 +
 diff --git a/openstack_dashboard/settings.py b/openstack_dashboard/settings.py
-index 832ccb4..a3a387d 100644
+index e3c5405..2b00685 100644
 --- a/openstack_dashboard/settings.py
 +++ b/openstack_dashboard/settings.py
-@@ -132,7 +132,7 @@ TEMPLATE_LOADERS = (
+@@ -127,7 +127,7 @@ TEMPLATE_LOADERS = (
  
  TEMPLATE_DIRS = (
      os.path.join(ROOT_PATH, 'templates'),
@@ -19097,7 +19097,7 @@ index 832ccb4..a3a387d 100644
  
  STATICFILES_FINDERS = (
      'django.contrib.staticfiles.finders.FileSystemFinder',
-@@ -169,15 +169,6 @@ INSTALLED_APPS = [
+@@ -164,15 +164,6 @@ INSTALLED_APPS = [
      'openstack_auth',
  ]
  
diff --git a/0005-Add-Change-password-link-to-the-RCUE-theme.patch b/0005-Add-Change-password-link-to-the-RCUE-theme.patch
index 389e777..3270928 100644
--- a/0005-Add-Change-password-link-to-the-RCUE-theme.patch
+++ b/0005-Add-Change-password-link-to-the-RCUE-theme.patch
@@ -1,4 +1,4 @@
-From e96cc9c9966abc14328cfc37793550b77b8fd703 Mon Sep 17 00:00:00 2001
+From 249ad0d896cd88d08e24b9879194dec3c057e178 Mon Sep 17 00:00:00 2001
 From: Julie Pichon <jpichon at redhat.com>
 Date: Tue, 20 May 2014 16:22:31 +0100
 Subject: [PATCH] Add "Change password" link to the RCUE theme.
diff --git a/0006-.less-replaced-in-rcue.patch b/0006-.less-replaced-in-rcue.patch
index 06c3654..efe3846 100644
--- a/0006-.less-replaced-in-rcue.patch
+++ b/0006-.less-replaced-in-rcue.patch
@@ -1,4 +1,4 @@
-From adac11931bea8ecec6866b92be0dcb1d9dc4eb3f Mon Sep 17 00:00:00 2001
+From c07053dfbe220594c298cf55e3f1d7d59262f03a Mon Sep 17 00:00:00 2001
 From: Matthias Runge <mrunge at redhat.com>
 Date: Thu, 31 Jul 2014 11:17:29 +0200
 Subject: [PATCH] .less replaced in rcue
diff --git a/0007-re-add-lesscpy-to-compile-.less.patch b/0007-re-add-lesscpy-to-compile-.less.patch
index 64e86db..db23df3 100644
--- a/0007-re-add-lesscpy-to-compile-.less.patch
+++ b/0007-re-add-lesscpy-to-compile-.less.patch
@@ -1,4 +1,4 @@
-From e8d862e47690c5f1f09966042a7e94fc765f3d98 Mon Sep 17 00:00:00 2001
+From 67f7c99bedc7ef7b44bb6572ef8a7f5a28c4bb12 Mon Sep 17 00:00:00 2001
 From: Matthias Runge <mrunge at redhat.com>
 Date: Mon, 6 Oct 2014 12:54:03 +0200
 Subject: [PATCH] re-add lesscpy to compile .less
@@ -8,10 +8,10 @@ Subject: [PATCH] re-add lesscpy to compile .less
  1 file changed, 1 insertion(+)
 
 diff --git a/openstack_dashboard/settings.py b/openstack_dashboard/settings.py
-index a3a387d..9c78ec6 100644
+index 2b00685..10b0847 100644
 --- a/openstack_dashboard/settings.py
 +++ b/openstack_dashboard/settings.py
-@@ -141,6 +141,7 @@ STATICFILES_FINDERS = (
+@@ -136,6 +136,7 @@ STATICFILES_FINDERS = (
  )
  
  COMPRESS_PRECOMPILERS = (
diff --git a/0008-Migration-of-LESS-to-SCSS-and-various-fixes.patch b/0008-Migration-of-LESS-to-SCSS-and-various-fixes.patch
index 9556fb8..c87f990 100644
--- a/0008-Migration-of-LESS-to-SCSS-and-various-fixes.patch
+++ b/0008-Migration-of-LESS-to-SCSS-and-various-fixes.patch
@@ -1,4 +1,4 @@
-From 268b2b77a1ca6ebacda3cc7a3f67660c387bf1e5 Mon Sep 17 00:00:00 2001
+From ed2ef8881b5d7371c48b6a3e145b391e0964df47 Mon Sep 17 00:00:00 2001
 From: Robb Hamilton <rhamilto at localhost.localdomain>
 Date: Mon, 29 Sep 2014 11:32:19 -0400
 Subject: [PATCH] Migration of LESS to SCSS and various fixes
diff --git a/0009-Remove-the-redundant-Settings-button-on-downstream-t.patch b/0009-Remove-the-redundant-Settings-button-on-downstream-t.patch
index 0c9859a..e95ca90 100644
--- a/0009-Remove-the-redundant-Settings-button-on-downstream-t.patch
+++ b/0009-Remove-the-redundant-Settings-button-on-downstream-t.patch
@@ -1,4 +1,4 @@
-From 2c07ede2fb98ee7d1b23250a027d28eb8d218314 Mon Sep 17 00:00:00 2001
+From daf2e19db467d888bb395b66dfc5b6ef71f11b0d Mon Sep 17 00:00:00 2001
 From: Julie Pichon <jpichon at redhat.com>
 Date: Wed, 15 Oct 2014 11:06:59 +0100
 Subject: [PATCH] Remove the redundant 'Settings' button on downstream theme
diff --git a/0010-Add-dropdown-actions-to-detail-page.patch b/0010-Add-dropdown-actions-to-detail-page.patch
index 5b401d0..c497761 100644
--- a/0010-Add-dropdown-actions-to-detail-page.patch
+++ b/0010-Add-dropdown-actions-to-detail-page.patch
@@ -1,4 +1,4 @@
-From 8597d6d8f2e9eaa5f3807656e34020a7105babb4 Mon Sep 17 00:00:00 2001
+From 8ed503208dbbd6ee4503b746cf71436b8b3330f8 Mon Sep 17 00:00:00 2001
 From: Ana Krivokapic <akrivoka at redhat.com>
 Date: Tue, 26 Aug 2014 13:19:12 +0200
 Subject: [PATCH] Add dropdown actions to detail page
@@ -16,7 +16,7 @@ Change-Id: Ie21c63d86c2806d9689ae7f1a67b67c83710c108
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/openstack_dashboard/dashboards/project/volumes/volumes/views.py b/openstack_dashboard/dashboards/project/volumes/volumes/views.py
-index d87078c..0984926 100644
+index b5bd7fc..f59beac 100644
 --- a/openstack_dashboard/dashboards/project/volumes/volumes/views.py
 +++ b/openstack_dashboard/dashboards/project/volumes/volumes/views.py
 @@ -46,10 +46,10 @@ class DetailView(tabs.TabView):
diff --git a/0011-Add-dropdown-actions-to-all-details-pages.patch b/0011-Add-dropdown-actions-to-all-details-pages.patch
index 1bd3694..1c8261d 100644
--- a/0011-Add-dropdown-actions-to-all-details-pages.patch
+++ b/0011-Add-dropdown-actions-to-all-details-pages.patch
@@ -1,4 +1,4 @@
-From e730a3327159665157660688e14f02d6c0705209 Mon Sep 17 00:00:00 2001
+From 59f3666afadac38e7ff108f87f05faaaa863900e Mon Sep 17 00:00:00 2001
 From: Ana Krivokapic <akrivoka at redhat.com>
 Date: Wed, 3 Sep 2014 12:09:02 +0200
 Subject: [PATCH] Add dropdown actions to all details pages
@@ -16,7 +16,7 @@ Conflicts:
  3 files changed, 14 insertions(+), 3 deletions(-)
 
 diff --git a/openstack_dashboard/dashboards/admin/networks/tests.py b/openstack_dashboard/dashboards/admin/networks/tests.py
-index 09979ba..a05d5c9 100644
+index 764a070..e233302 100644
 --- a/openstack_dashboard/dashboards/admin/networks/tests.py
 +++ b/openstack_dashboard/dashboards/admin/networks/tests.py
 @@ -191,12 +191,19 @@ class NetworkTests(test.BaseAdminViewTests):
@@ -55,7 +55,7 @@ index dc34564..87a86a3 100644
  class ResourceView(tabs.TabView):
      tab_group_class = project_tabs.ResourceDetailTabs
 diff --git a/openstack_dashboard/dashboards/project/volumes/volumes/views.py b/openstack_dashboard/dashboards/project/volumes/volumes/views.py
-index 0984926..d87078c 100644
+index f59beac..b5bd7fc 100644
 --- a/openstack_dashboard/dashboards/project/volumes/volumes/views.py
 +++ b/openstack_dashboard/dashboards/project/volumes/volumes/views.py
 @@ -46,10 +46,10 @@ class DetailView(tabs.TabView):
diff --git a/0012-Add-support-for-row-actions-to-detail-pages.patch b/0012-Add-support-for-row-actions-to-detail-pages.patch
index 4d48ee0..94854ac 100644
--- a/0012-Add-support-for-row-actions-to-detail-pages.patch
+++ b/0012-Add-support-for-row-actions-to-detail-pages.patch
@@ -1,4 +1,4 @@
-From 8d7bbf8baf5e92d95d05585e10fc05fb1ee4bed4 Mon Sep 17 00:00:00 2001
+From d94a1deee1fb47c599e6140a4c77fd46582c686c Mon Sep 17 00:00:00 2001
 From: Ana Krivokapic <akrivoka at redhat.com>
 Date: Thu, 11 Sep 2014 13:31:45 +0200
 Subject: [PATCH] Add support for row actions to detail pages
@@ -25,7 +25,7 @@ Implements: blueprint detail-pages-ia
  10 files changed, 21 insertions(+), 12 deletions(-)
 
 diff --git a/openstack_dashboard/dashboards/admin/networks/tests.py b/openstack_dashboard/dashboards/admin/networks/tests.py
-index a05d5c9..09979ba 100644
+index e233302..764a070 100644
 --- a/openstack_dashboard/dashboards/admin/networks/tests.py
 +++ b/openstack_dashboard/dashboards/admin/networks/tests.py
 @@ -191,19 +191,12 @@ class NetworkTests(test.BaseAdminViewTests):
@@ -63,10 +63,10 @@ index 2bf34bd..5b5b36d 100644
  
      @staticmethod
 diff --git a/openstack_dashboard/dashboards/project/instances/views.py b/openstack_dashboard/dashboards/project/instances/views.py
-index 8e0ee0f..0164c9e 100644
+index 674e201..05ad37c 100644
 --- a/openstack_dashboard/dashboards/project/instances/views.py
 +++ b/openstack_dashboard/dashboards/project/instances/views.py
-@@ -295,6 +295,9 @@ class DetailView(tabs.TabView):
+@@ -300,6 +300,9 @@ class DetailView(tabs.TabView):
          table = project_tables.InstancesTable(self.request)
          context["url"] = reverse(self.redirect_url)
          context["actions"] = table.render_row_actions(instance)
@@ -106,10 +106,10 @@ index 87a86a3..dc34564 100644
  class ResourceView(tabs.TabView):
      tab_group_class = project_tabs.ResourceDetailTabs
 diff --git a/openstack_dashboard/dashboards/project/volumes/backups/views.py b/openstack_dashboard/dashboards/project/volumes/backups/views.py
-index d9eed58..5a24857 100644
+index c4f9065..09c7f47 100644
 --- a/openstack_dashboard/dashboards/project/volumes/backups/views.py
 +++ b/openstack_dashboard/dashboards/project/volumes/backups/views.py
-@@ -59,6 +59,10 @@ class BackupDetailView(tabs.TabView):
+@@ -60,6 +60,10 @@ class BackupDetailView(tabs.TabView):
          context["backup"] = backup
          context["url"] = self.get_redirect_url()
          context["actions"] = table.render_row_actions(backup)
@@ -121,10 +121,10 @@ index d9eed58..5a24857 100644
  
      @memoized.memoized_method
 diff --git a/openstack_dashboard/dashboards/project/volumes/snapshots/views.py b/openstack_dashboard/dashboards/project/volumes/snapshots/views.py
-index c03c908..5e5f5ae 100644
+index 6a37c5d..e6749f9 100644
 --- a/openstack_dashboard/dashboards/project/volumes/snapshots/views.py
 +++ b/openstack_dashboard/dashboards/project/volumes/snapshots/views.py
-@@ -76,6 +76,9 @@ class DetailView(tabs.TabView):
+@@ -77,6 +77,9 @@ class DetailView(tabs.TabView):
          context["snapshot"] = snapshot
          context["url"] = self.get_redirect_url()
          context["actions"] = table.render_row_actions(snapshot)
@@ -135,7 +135,7 @@ index c03c908..5e5f5ae 100644
  
      @memoized.memoized_method
 diff --git a/openstack_dashboard/dashboards/project/volumes/volumes/views.py b/openstack_dashboard/dashboards/project/volumes/volumes/views.py
-index d87078c..b09681b 100644
+index b5bd7fc..d52f198 100644
 --- a/openstack_dashboard/dashboards/project/volumes/volumes/views.py
 +++ b/openstack_dashboard/dashboards/project/volumes/volumes/views.py
 @@ -52,6 +52,10 @@ class DetailView(tabs.TabView):
diff --git a/0013-Restore-missing-translation-for-the-downstream-theme.patch b/0013-Restore-missing-translation-for-the-downstream-theme.patch
index bbeb0d9..3ea05c4 100644
--- a/0013-Restore-missing-translation-for-the-downstream-theme.patch
+++ b/0013-Restore-missing-translation-for-the-downstream-theme.patch
@@ -1,4 +1,4 @@
-From aa050b4eb83f810a5f851080bd13566b9970826a Mon Sep 17 00:00:00 2001
+From 3ace90ec7ea384ed7210bb98ec7995140626e542 Mon Sep 17 00:00:00 2001
 From: Julie Pichon <jpichon at redhat.com>
 Date: Fri, 10 Oct 2014 14:26:49 +0100
 Subject: [PATCH] Restore missing translation for the downstream theme.
diff --git a/0014-IE-bug-fixes-https-bugzilla.redhat.com-show_bug.cgi-.patch b/0014-IE-bug-fixes-https-bugzilla.redhat.com-show_bug.cgi-.patch
index a8dcac2..0877809 100644
--- a/0014-IE-bug-fixes-https-bugzilla.redhat.com-show_bug.cgi-.patch
+++ b/0014-IE-bug-fixes-https-bugzilla.redhat.com-show_bug.cgi-.patch
@@ -1,4 +1,4 @@
-From cedef82fbc196640a5656b127ee1e29d2be16b8a Mon Sep 17 00:00:00 2001
+From 76d56fd87bf5d5411317e52f2fb7cfd9c71e8641 Mon Sep 17 00:00:00 2001
 From: Robb Hamilton <rhamilto at redhat.com>
 Date: Thu, 30 Oct 2014 18:14:14 +0000
 Subject: [PATCH] IE bug fixes
diff --git a/0015-Change-branding.patch b/0015-Change-branding.patch
index 23ad15f..bf3bded 100644
--- a/0015-Change-branding.patch
+++ b/0015-Change-branding.patch
@@ -1,4 +1,4 @@
-From caa0d4c00a933230cc7e773762a538a780638270 Mon Sep 17 00:00:00 2001
+From b26fe273c3852d93f9e1072e5fe54e2921743d4d Mon Sep 17 00:00:00 2001
 From: Matthias Runge <mrunge at redhat.com>
 Date: Fri, 31 Oct 2014 13:46:12 +0100
 Subject: [PATCH] Change branding
diff --git a/0016-Add-missing-translation-for-the-downstream-theme-zh_.patch b/0016-Add-missing-translation-for-the-downstream-theme-zh_.patch
index 0358d1f..936814e 100644
--- a/0016-Add-missing-translation-for-the-downstream-theme-zh_.patch
+++ b/0016-Add-missing-translation-for-the-downstream-theme-zh_.patch
@@ -1,4 +1,4 @@
-From 77d90b532172050a1991ae21e899c576ece934ff Mon Sep 17 00:00:00 2001
+From 2f9e9df18d4145efb16733f61aaf1ba1314a1258 Mon Sep 17 00:00:00 2001
 From: Julie Pichon <jpichon at redhat.com>
 Date: Fri, 10 Oct 2014 14:26:49 +0100
 Subject: [PATCH] Add missing translation for the downstream theme - zh_CN
diff --git a/openstack-dashboard-httpd-2.4.conf b/openstack-dashboard-httpd-2.4.conf
index 63d1b17..820008c 100644
--- a/openstack-dashboard-httpd-2.4.conf
+++ b/openstack-dashboard-httpd-2.4.conf
@@ -3,7 +3,7 @@ WSGIProcessGroup dashboard
 WSGISocketPrefix run/wsgi
 
 WSGIScriptAlias /dashboard /usr/share/openstack-dashboard/openstack_dashboard/wsgi/django.wsgi
-Alias /static /usr/share/openstack-dashboard/static
+Alias /dashboard/static /usr/share/openstack-dashboard/static
 
 <Directory /usr/share/openstack-dashboard/openstack_dashboard/wsgi>
   Options All
diff --git a/openstack-dashboard.conf b/openstack-dashboard.conf
deleted file mode 100644
index 1bfa48f..0000000
--- a/openstack-dashboard.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-WSGIDaemonProcess dashboard
-WSGIProcessGroup dashboard
-WSGISocketPrefix run/wsgi
-
-WSGIScriptAlias /dashboard /usr/share/openstack-dashboard/openstack_dashboard/wsgi/django.wsgi
-Alias /static /usr/share/openstack-dashboard/static
-
-<Directory /usr/share/openstack-dashboard/openstack_dashboard/wsgi>
-  Order allow,deny
-  Allow from all
-</Directory>
diff --git a/python-django-horizon.spec b/python-django-horizon.spec
index a16aec9..1f41a3e 100644
--- a/python-django-horizon.spec
+++ b/python-django-horizon.spec
@@ -5,7 +5,7 @@
 
 Name:       python-django-horizon
 Version:    2015.1
-Release:    0.2.b%{milestone}%{?dist}
+Release:    0.3.%{milestone}%{?dist}
 Summary:    Django application for talking to Openstack
 
 Group:      Development/Libraries
@@ -236,7 +236,7 @@ Requires: openstack-dashboard = %{version}
 Customization module for OpenStack Dashboard to provide a branded logo.
 
 %prep
-%setup -q -n horizon-%{version}.0b%{milestone}
+%setup -q -n horizon-%{version}.0%{milestone}
 
 # remove precompiled egg-info
 rm -rf horizon.egg-info
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/python-django-horizon.git/commit/?h=master&id=e478192349e6472b728c68567718dfddd341dec1


More information about the scm-commits mailing list