Hello community,
here is the log from the commit of package openstack-dashboard for openSUSE:Factory checked in at 2013-06-20 21:24:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openstack-dashboard (Old)
and /work/SRC/openSUSE:Factory/.openstack-dashboard.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openstack-dashboard"
Changes:
--------
--- /work/SRC/openSUSE:Factory/openstack-dashboard/openstack-dashboard.changes 2013-02-08 07:12:40.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.openstack-dashboard.new/openstack-dashboard.changes 2013-06-20 21:24:47.000000000 +0200
@@ -2 +2 @@
-Wed Feb 6 06:57:07 UTC 2013 - cloud-devel@suse.de
+Tue Jun 18 23:57:20 UTC 2013 - opensuse-cloud@opensuse.org
@@ -4,3 +4,8 @@
-- Update to version 2012.2.4+git.1360133827.f421145:
- + Final versioning for 2012.2.3
- + Bump version to 2012.2.4
+- Update to version 2013.1.3.a5.g21a4b20:
+ + Increase socket timeout for selenium tests
+ + Mark additional strings as translatable
+
+-------------------------------------------------------------------
+Wed Jun 12 11:47:46 UTC 2013 - dmueller@suse.com
+
+- fix build against Django 1.5
@@ -9 +14 @@
-Fri Jan 25 11:04:28 UTC 2013 - bwiedemann@suse.de
+Sat Jun 8 00:18:15 UTC 2013 - opensuse-cloud@opensuse.org
@@ -11,9 +16,289 @@
-- Update to version 2012.2.2+git.1359111868.20fa0fc:
- + Pin docutils to 0.9.1, fix pep8 errors
- + Fix bug 1055929 - Can not display usage data for Quota Summary.
- + Revert "Temp fix for api/keystone.py"
- + Specify floating ips table action column's width
- + Allow setting nova quotas to unlimited
- + Add a check for unlimited quotas
- + Avoid cinder calls, when cinder is unavailable
- + Don't inherit from base.html in 500 error page
+- Update to version 2013.1.3.a1.g70e403b:
+ + Bump stable/grizzly next version to 2013.1.3
+
+-------------------------------------------------------------------
+Mon Jun 3 11:41:28 UTC 2013 - speilicke@suse.com
+
+- Move HTML templates and static assets to new branding sub-packages:
+ + python-horizon-branding-upstream
+ + openstack-dashboard-branding-upstream
+
+--------------------------------------------------------------------
+Sat Jun 1 06:26:05 UTC 2013 - opensuse-cloud@opensuse.org
+
+- Update to version 2013.1.2.a4.g7310ef2:
+ + Updated translations from Transifex
+
+-------------------------------------------------------------------
+Wed May 29 10:42:05 UTC 2013 - dmueller@suse.com
+
+- update requires/test-requires
+- remove setBadness call from rpmlintrc
+
+-------------------------------------------------------------------
+Wed May 29 07:57:10 UTC 2013 - dmueller@suse.com
+
+- build without nodejs by default again
+
+-------------------------------------------------------------------
+Mon May 27 14:46:45 UTC 2013 - dmueller@suse.com
+
+- rename production bcond to nodejs and invert the default
+
+--------------------------------------------------------------------
+Thu May 16 13:30:31 UTC 2013 - opensuse-cloud@opensuse.org
+
+- Update to version 2013.1.2.a2.g0769c3c:
+ + Remove the term 'syspanel' from docs
+
+--------------------------------------------------------------------
+Fri May 10 23:44:11 UTC 2013 - opensuse-cloud@opensuse.org
+
+- Update to version 2013.1.2.a1.gb5ac1ea:
+ + Bump stable/grizzly next version to 2013.1.2
+
+--------------------------------------------------------------------
+Fri May 3 23:43:29 UTC 2013 - opensuse-cloud@opensuse.org
+
+- Update to version 2013.1.1.a7.ge68b7a8:
+ + Fix translation error for missing default role
+
+--------------------------------------------------------------------
+Thu May 2 23:43:12 UTC 2013 - opensuse-cloud@opensuse.org
+
+- Update to version 2013.1.1.a6.g5825d8d:
+ + Fix some not-consistent titles for virtual routers management
+ + Fix regression on running manage command.
+
+-------------------------------------------------------------------
+Thu Apr 4 16:29:41 UTC 2013 - dmueller@suse.com
+
+- update to grizzly branch
+
+--------------------------------------------------------------------
+Tue Apr 2 08:24:47 UTC 2013 - speilicke@suse.com
+
+- Update to version 2013.1.rc2:
+ + Adds docs for settings/configuration.
+ + Reduce duplicate definitions about quota sets
+ + Disable LB panel by default; allow UUID for Sec Group ID.
+ + Pin the cinderclient version.
+ + Check if volume service is enabled in quota update
+ + Handle None protocol in security group rule table
+ + Improve UX around "unauthorized" API exceptions.
+ + Implement configurable auto-fade for alerts messages.
+ + Updated translations from transifex for Grizzly RC.
+ + Adds Grizzly release notes.
+ + Remove note on theming from release notes.
+ + Allow admin to edit project quotas for fixed IPs
+ + Fix adding security groups to an existing instance
+ + Add flavor name regex validation to match nova.
+ + Release notes on Quantum Brocade plugin incompatibility.
+
+--------------------------------------------------------------------
+Mon Mar 18 10:39:18 UTC 2013 - speilicke@suse.com
+
+- Update to version 2013.1.a68.ga53d649:
+ + Correct the related tenant_id when getting quotas
+ + Adding extensibility to workflow template file.
+ + rm invalid args when updating quotas with nova api
+- Drop +git.$TIMESTAMP.$COMMITHASH version suffix
+
+--------------------------------------------------------------------
+Sun Mar 17 00:11:27 UTC 2013 - cloud-devel@suse.de
+
+- Update to version 2013.1.a62.gf044be3+git.1363479087.f044be3:
+ + Fixes error message formatting in Load Balancers panel
+ + Pass-in the initial value when performing a POST on Workflow Action. This fixes the call to self.changed_data, it allows django forms to be able to compare initial value with current value.
+ + Remove router actions from Admin panel
+ + Fix device name for example. Fixes bug 1152975
+ + Display port link between router and extra network
+ + Fix circular dependencies in dashboard settings
+
+--------------------------------------------------------------------
+Wed Mar 13 00:14:42 UTC 2013 - cloud-devel@suse.de
+
+- Update to version 2013.1.a50.g7fdb6a4+git.1363133682.7fdb6a4:
+ + Don't change dashboard on admin tenant switch
+ + Fixes uncaught exception on Add Monitor when unable to retrieve pools
+ + Updating .po files for translation.
+ + Update CACHE_ to CACHES settings
+ + Fixes uncaught exception on Add Pool when unable to retrieve networks
+ + Update to Quantum Client 2.2.0
+ + Add some more customization help and examples
+ + Increase maxlength of Snapshot Name to 255.
+
+--------------------------------------------------------------------
+Mon Mar 11 09:57:12 UTC 2013 - cloud-devel@suse.de
+
+- Update to version 2013.1.a35.gff270d1+git.1362995832.ff270d1:
+ + Bump python-quantumclient version to 2.1.2
+ + Allow non-admin users to clear router gateway properly
+ + Support multiple role selection in projects
+ + blueprint quantum-lbaas
+ + Improve style of network topology
+ + Prevents flavors to be deleted when reusing a name
+
+-------------------------------------------------------------------
+Thu Mar 7 12:29:36 UTC 2013 - vuntz@suse.com
+
+- Remove SITE_BRANDING key from local_settings.py: this was set to
+ "SUSE Cloud", but the package in OBS is not for the SUSE Cloud
+ product.
+
+--------------------------------------------------------------------
+Tue Mar 5 17:18:09 UTC 2013 - cloud-devel@suse.de
+
+- Update to version 2013.1.a24.gf754398+git.1362503889.f754398:
+ + Fix hogan js templates in IE8
+ + Ensure "Add Interface" form in Admin Panel works
+ + Escape the region name before passing as value in URL.
+ + Allow for terminating paused/suspended instances
+ + Fix errant XHR request happening on every page
+
+--------------------------------------------------------------------
+Thu Feb 28 09:50:17 UTC 2013 - saschpe@suse.de
+
+- Update to version 2013.1.a15.g26b6a4b+git.1362045017.26b6a4b:
+ + pin django to 1.4.x stream
+ + Fix footer count update for multi-table pages
+ + Fix images/snapshots table pagination
+ + Correctly mock keystoneclient.Client.auto_token property with Mox
+ + Fix uninitialized variable in launch instance
+ + Allow admin to edit project quotas for security groups and rules
+ + Fix a TypeError when working in a Folsom env.
+ + Fix row striping when datatables are filtered
+- Drop horizon-mox-auth_token-property.patch: Merged upstream
+
+-------------------------------------------------------------------
+Tue Feb 26 15:08:07 UTC 2013 - saschpe@suse.de
+
+- Add horizon-mox-auth_token-property.patch: Correctly mock
+ keystoneclient.Client.auto_token property with Mox
+
+-------------------------------------------------------------------
+Mon Feb 25 12:08:39 UTC 2013 - saschpe@suse.de
+
+- Drop horizon-minimumpwlen.patch (merged upstream)
+- Drop horizon-user-email.patch (dubious)
+- Only package tests in test sub-package
+- Use openstack_test_package_install again (and thus install only
++++ 237 more lines (skipped)
++++ between /work/SRC/openSUSE:Factory/openstack-dashboard/openstack-dashboard.changes
++++ and /work/SRC/openSUSE:Factory/.openstack-dashboard.new/openstack-dashboard.changes
Old:
----
horizon-minimumpwlen.patch
horizon-stable-folsom.tar.gz
horizon-user-email.patch
New:
----
horizon-stable-grizzly.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openstack-dashboard.spec ++++++
--- /var/tmp/diff_new_pack.uhUJPz/_old 2013-06-20 21:24:47.000000000 +0200
+++ /var/tmp/diff_new_pack.uhUJPz/_new 2013-06-20 21:24:47.000000000 +0200
@@ -18,23 +18,21 @@
%define component horizon
+%bcond_with nodejs
+
Name: openstack-dashboard
-Version: 2012.2.4+git.1360133827.f421145
-Release: 1
-License: Apache-2.0
+Version: 2013.1.3.a5.g21a4b20
+Release: 0
Summary: OpenStack Dashboard (Horizon)
-Url: http://wiki.openstack.org/OpenStackDashboard
+License: Apache-2.0
Group: Development/Languages/Python
-Source: horizon-stable-folsom.tar.gz
+Url: http://wiki.openstack.org/OpenStackDashboard
+Source: horizon-stable-grizzly.tar.gz
# Apache2 example configuration:
Source2: openstack-dashboard.conf.sample
-# PATCH-FIX-OPENSUSE saschpe@suse.de -- TODO/FIXME: Check the user email patch is still necessary
-Patch1: horizon-user-email.patch
-# backport https://review.openstack.org/#/c/5204/7/horizon/tests/testsettings.py,unifie...
-Patch2: horizon-minimumpwlen.patch
BuildRequires: apache2
BuildRequires: fdupes
-BuildRequires: openstack-macros
+BuildRequires: openstack-suse-macros
BuildRequires: python-devel
BuildRequires: python-distribute
# Avoid nodejs at runtime:
@@ -47,10 +45,11 @@
BuildRequires: python-django_openstack_auth
BuildRequires: python-glanceclient
BuildRequires: python-novaclient
-BuildRequires: python-prettytable
BuildRequires: python-quantumclient
+BuildRequires: python-six
BuildRequires: python-swiftclient
# End: Avoid nodejs at runtime:
+Requires: %{name}-branding = %{version}
Requires: apache2
Requires: apache2-mod_wsgi
Requires: python >= 2.6.8
@@ -63,9 +62,11 @@
Requires(post): apache2-utils
Requires(post): openssl
Requires(post): sysconfig
+%if %{with nodejs}
+Requires: nodejs
+%endif
Provides: openstack-dashboard-config = %{version}
-#TODO: Change back to '<' after next version update:
-Obsoletes: openstack-dashboard-config <= %{version}
+Obsoletes: openstack-dashboard-config < %{version}
%if 0%{?suse_version} && 0%{?suse_version} <= 1110
%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%else
@@ -83,25 +84,54 @@
Developers can automate access or build tools to manage their resources
using the native OpenStack API or the EC2 compatibility API.
+%package branding-upstream
+Summary: OpenStack Dashboard (Horizon) - Upstream Branding
+Group: Development/Languages/Python
+Provides: %{name}-branding = %{version}
+Conflicts: otherproviders(%{name}-branding)
+Supplements: packageand(%{name}:branding-upstream)
+%if 0%{?suse_version} && 0%{?suse_version} > 1110
+BuildArch: noarch
+%endif
+
+%description branding-upstream
+This package provides the upstream look and feel for OpenStack Dashboard.
+
%package -n python-horizon
-Summary: OpenStack Dashboard (Horizon) - Python module
+Summary: OpenStack Dashboard (Horizon) - Python Module
Group: Development/Languages/Python
-Requires: python-cinderclient
+Requires: python-cinderclient >= 1.0.2
Requires: python-django >= 1.4
Requires: python-django_compressor
-Requires: python-django_openstack_auth
+Requires: python-django_openstack_auth >= 1.0.7
Requires: python-glanceclient
+Requires: python-horizon-branding = %{version}
Requires: python-keystoneclient
Requires: python-lockfile
-Requires: python-novaclient
+Requires: python-netaddr
+Requires: python-novaclient >= 2.12.0
Requires: python-pytz
-Requires: python-quantumclient
+Requires: python-quantumclient >= 2.2.0
+Requires: python-six
Requires: python-swiftclient
%description -n python-horizon
The Python module horizon is the core component of the OpenStack
dashboard.
+%package -n python-horizon-branding-upstream
+Summary: OpenStack Dashboard (Horizon) - Python Module Upstream Branding
+Group: Development/Languages/Python
+Provides: python-horizon-branding = %{version}
+Conflicts: otherproviders(python-horizon-branding)
+Supplements: packageand(python-horizon:branding-upstream)
+%if 0%{?suse_version} && 0%{?suse_version} > 1110
+BuildArch: noarch
+%endif
+
+%description -n python-horizon-branding-upstream
+This package provides the upstream look and feel for OpenStack Dashboard Python module.
+
%package test
Summary: OpenStack Dashboard (Horizon) - Testsuite
Group: Development/Languages/Python
@@ -113,8 +143,8 @@
Requires: python-netaddr
Requires: python-nose
Requires: python-nose-exclude
-Requires: python-nosexcover
Requires: python-nosehtmloutput
+Requires: python-nosexcover
Requires: python-openstack.nose_plugin
%if 0%{?with_selenium}
Requires: python-selenium
@@ -128,47 +158,55 @@
functionality of the OpenStack dashboard and its components.
%prep
-%setup -q -n horizon-2012.2.4
-#patch1 -p1
-%patch2 -p1
+%setup -q -n horizon-2013.1.3.a5.g21a4b20
%openstack_cleanup_prep
+### Collect and pre-compile static assets:
+echo "SECRET_KEY='openSUSE'" > openstack_dashboard/local/local_settings.py
+python manage.py validate
+python manage.py collectstatic --noinput
+python manage.py compress --force
+# Cleanup *.pyc files afterwards:
+rm openstack_dashboard/local/local_settings.py
+find . -type f -name "*.pyc" -delete -print
+%if %{without nodejs}
+# Drop all *.less files, we won't need them at runtime:
+rm -r static/{bootstrap,dashboard}/less/
+# Drop static files from where it isn't used anyway, this is due to the
+# usage of setuptools_git...
+rm -r horizon/static openstack_dashboard/static
+%else
+echo "NON PRODUCTION SETUP"
+%endif
+# CSS/JS should be non-executable:
+find static/ -type f | xargs chmod a-x
+
%build
python setup.py build
-#TODO/FIXME: Is this really needed despite COMPRESS_OFFLINE that we set in %%install?
+%if %{without nodejs}
#Drop COMPRESS_PRECOMPILERS from settings (we needed it before, thus no patch):
lineno=$(grep -n less_binary openstack_dashboard/settings.py | cut -d":" -f1 | head -n1)
sed -i "$lineno,$(( $lineno + 4))d" openstack_dashboard/settings.py
+%endif
%install
python setup.py install --prefix=%{_prefix} --root=%{buildroot}
-# Do not package LESS
-rm -r %{buildroot}%{python_sitelib}/bin/
-
# Remove po files
find %{buildroot}%{python_sitelib}/horizon/locale %{buildroot}%{python_sitelib}/openstack_dashboard/locale -name "*.po" -delete -print
-# test subpackage
-install -d -m 755 %{buildroot}%{_localstatedir}/lib/openstack-dashboard-test
-cp -a .pylintrc * %{buildroot}%{_localstatedir}/lib/openstack-dashboard-test
-find %{buildroot}%{_localstatedir}/lib/openstack-dashboard-test -name ".gitignore" | xargs rm -f
-rm -rf %{buildroot}%{_localstatedir}/lib/openstack-dashboard-test/horizon
-rm -rf %{buildroot}%{_localstatedir}/lib/openstack-dashboard-test/openstack_dashboard
-ln -s %{python_sitelib}/horizon %{buildroot}%{_localstatedir}/lib/openstack-dashboard-test/horizon
-ln -s %{_localstatedir}/lib/openstack-dashboard/openstack_dashboard %{buildroot}%{_localstatedir}/lib/openstack-dashboard-test/openstack_dashboard
-
# Move openstack_dashboard files
-install -d -m 755 %{buildroot}%{_localstatedir}/lib/openstack-dashboard
-mv %{buildroot}%{python_sitelib}/openstack_dashboard/ %{buildroot}%{_localstatedir}/lib/openstack-dashboard/
-cp -a manage.py %{buildroot}%{_localstatedir}/lib/openstack-dashboard/
-
-## Create a local_settings.py
-mv %{buildroot}%{_localstatedir}/lib/openstack-dashboard/openstack_dashboard/local/local_settings.py.example %{buildroot}%{_localstatedir}/lib/openstack-dashboard/openstack_dashboard/local/local_settings.py
-
-cat <<EOF >> %{buildroot}%{_localstatedir}/lib/openstack-dashboard/openstack_dashboard/local/local_settings.py
+install -d -m 755 %{buildroot}%{_datadir}/openstack-dashboard
+mv %{buildroot}%{python_sitelib}/openstack_dashboard/ %{buildroot}%{_datadir}/openstack-dashboard/
+cp -a manage.py %{buildroot}%{_datadir}/openstack-dashboard/
+
+### Create a local_settings.py
+mv %{buildroot}%{_datadir}/openstack-dashboard/openstack_dashboard/local/local_settings.py{.example,}
+cat <<EOF >> %{buildroot}%{_datadir}/openstack-dashboard/openstack_dashboard/local/local_settings.py
+%if %{without nodejs}
COMPRESS_OFFLINE = True
+%endif
SESSION_ENGINE = 'django.contrib.sessions.backends.cached_db'
DATABASES = {
'default': {
@@ -177,94 +215,123 @@
'TEST_NAME': os.path.join(LOCAL_PATH, 'test.sqlite3'),
},
}
-# Use HttpOnly CSRF cookie:
-CSRF_COOKIE_HTTPONLY = True
-# SUSE Branding (currently only used in HTML <title> tags):
-SITE_BRANDING = 'SUSE Cloud'
EOF
-
# Use secure SECRET_KEY generation for local_settings.py (bnc#755607):
sed -i -e "s|\# \(from horizon\.utils import secret_key\)|\1|" \
- -e "s|\# \(SECRET_KEY = .*\)|\1|" %{buildroot}%{_localstatedir}/lib/openstack-dashboard/openstack_dashboard/local/local_settings.py
-
-### Pre-compile LESS files to CSS:
-# http://django_compressor.readthedocs.org/en/latest/usage/#pre-compression:
-
-# Copy static files, to have them all in one places and so we can compress as needed
-mkdir -p %{buildroot}%{_localstatedir}/lib/openstack-dashboard/static
-cp -a openstack_dashboard/static/* %{buildroot}%{_localstatedir}/lib/openstack-dashboard/static
-cp -a horizon/static/* %{buildroot}%{_localstatedir}/lib/openstack-dashboard/static
-
-pushd %{buildroot}%{_localstatedir}/lib/openstack-dashboard/
-export PYTHONPATH="$( pwd ):%{buildroot}/%{python_sitelib}:$PYTHONPATH"
-python manage.py collectstatic --noinput
-python manage.py compress --force
-# Cleanup pyc files
-find . -type f -name "*.pyc" -delete -print
-popd
-
-# CSS/JS should be non-executable
-find %{buildroot}%{_localstatedir}/lib/openstack-dashboard/static/ -type f | xargs chmod a-x
+ -e "s|\# \(SECRET_KEY = .*\)|\1|" %{buildroot}%{_datadir}/openstack-dashboard/openstack_dashboard/local/local_settings.py
-## Some final stuff
+### Install collected / compressed static assets:
+mv static/ %{buildroot}%{_datadir}/openstack-dashboard/
+%if %{without nodejs}
+# But do not package 'less' binary, we use pre-compiled assets:
+rm -r %{buildroot}%{python_sitelib}/bin/
+%else
+# Bend over path to your bin/less/lessc in python_sitelib (Ugly as hell):
+sed -i -e "s|less_binary = .*|less_binary = \"%{python_sitelib}/bin/less/lessc\"|" %{buildroot}%{_datadir}/openstack-dashboard/openstack_dashboard/settings.py
+%endif
# Remove duplicate files
%if 0%{?suse_version}
%fdupes %{buildroot}%{python_sitelib}
-%fdupes %{buildroot}%{_localstatedir}/lib/openstack-dashboard
-%fdupes %{buildroot}%{_localstatedir}/lib/openstack-dashboard-test
+%fdupes %{buildroot}%{_datadir}/openstack-dashboard
+%fdupes %{buildroot}%{_datadir}/openstack-dashboard-test
%endif
-# Apache2 SSL certificate stubs (generated in %%post)
+# Apache2 SSL certificate stubs (generated in %%post):
%openstack_apache_ssl_cert_install
-
-# Apache2 sample configuration
+# Apache2 sample configuration:
install -d %{buildroot}%{_sysconfdir}/apache2/conf.d
install -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/apache2/conf.d/openstack-dashboard.conf.sample
+### test subpackage
+%openstack_test_package_install
+
%post
%openstack_apache_ssl_cert_post
%files
%defattr(-,root,root)
-%dir %{_localstatedir}/lib/openstack-dashboard
-%{_localstatedir}/lib/openstack-dashboard/manage.py
-%dir %{_localstatedir}/lib/openstack-dashboard/openstack_dashboard
-%dir %attr(0750, wwwrun, www) %{_localstatedir}/lib/openstack-dashboard/openstack_dashboard/local
-%attr(0640, wwwrun, www) %{_localstatedir}/lib/openstack-dashboard/openstack_dashboard/local/__init__.py
-%config(noreplace) %attr(0640, wwwrun, www) %{_localstatedir}/lib/openstack-dashboard/openstack_dashboard/local/local_settings.py
-%{_localstatedir}/lib/openstack-dashboard/openstack_dashboard/static/
-%{_localstatedir}/lib/openstack-dashboard/openstack_dashboard/templates/
-%{_localstatedir}/lib/openstack-dashboard/openstack_dashboard/test/
-%{_localstatedir}/lib/openstack-dashboard/openstack_dashboard/wsgi/
-%{_localstatedir}/lib/openstack-dashboard/openstack_dashboard/*.py
-%{_localstatedir}/lib/openstack-dashboard/static/
+%dir %{_datadir}/openstack-dashboard
+%{_datadir}/openstack-dashboard/manage.py
+%dir %{_datadir}/openstack-dashboard/openstack_dashboard
+%dir %attr(0750, wwwrun, www) %{_datadir}/openstack-dashboard/openstack_dashboard/local
+%attr(0640, wwwrun, www) %{_datadir}/openstack-dashboard/openstack_dashboard/local/__init__.py*
+%config(noreplace) %attr(0640, wwwrun, www) %{_datadir}/openstack-dashboard/openstack_dashboard/local/local_settings.py
+%{_datadir}/openstack-dashboard/openstack_dashboard/api/
+%{_datadir}/openstack-dashboard/openstack_dashboard/dashboards/
+%{_datadir}/openstack-dashboard/openstack_dashboard/openstack/
+%exclude %{_datadir}/openstack-dashboard/openstack_dashboard/dashboards/*/*/templates
+%exclude %{_datadir}/openstack-dashboard/openstack_dashboard/templates
+%exclude %{_datadir}/openstack-dashboard/openstack_dashboard/test/
+%if %{with nodejs}
+%dir %{python_sitelib}/bin
+%dir %{python_sitelib}/bin/less
+%dir %{python_sitelib}/bin/lib
+%{python_sitelib}/bin/less/lessc
+%{python_sitelib}/bin/lib/less/
+%endif
+%{_datadir}/openstack-dashboard/openstack_dashboard/usage/
+%{_datadir}/openstack-dashboard/openstack_dashboard/wsgi/
+%{_datadir}/openstack-dashboard/openstack_dashboard/*.py*
%openstack_apache_ssl_cert_files
%{_sysconfdir}/apache2/conf.d/openstack-dashboard.conf.sample
# lang files
-%dir %{_localstatedir}/lib/openstack-dashboard/openstack_dashboard/locale
-%dir %{_localstatedir}/lib/openstack-dashboard/openstack_dashboard/locale/*
-%dir %{_localstatedir}/lib/openstack-dashboard/openstack_dashboard/locale/*/LC_MESSAGES
-%lang(bg-bg) %{_localstatedir}/lib/openstack-dashboard/openstack_dashboard/locale/bg_BG/LC_MESSAGES/django.mo
-%lang(cs) %{_localstatedir}/lib/openstack-dashboard/openstack_dashboard/locale/cs/LC_MESSAGES/django.mo
-%lang(en) %{_localstatedir}/lib/openstack-dashboard/openstack_dashboard/locale/en/LC_MESSAGES/django.mo
-%lang(es) %{_localstatedir}/lib/openstack-dashboard/openstack_dashboard/locale/es/LC_MESSAGES/django.mo
-%lang(fr) %{_localstatedir}/lib/openstack-dashboard/openstack_dashboard/locale/fr/LC_MESSAGES/django.mo
-%lang(ja) %{_localstatedir}/lib/openstack-dashboard/openstack_dashboard/locale/ja/LC_MESSAGES/django.mo
-%lang(ko) %{_localstatedir}/lib/openstack-dashboard/openstack_dashboard/locale/ko_KR/LC_MESSAGES/django.mo
-%lang(nl-nl) %{_localstatedir}/lib/openstack-dashboard/openstack_dashboard/locale/nl_NL/LC_MESSAGES/django.mo
-%lang(pl) %{_localstatedir}/lib/openstack-dashboard/openstack_dashboard/locale/pl/LC_MESSAGES/django.mo
-%lang(pt) %{_localstatedir}/lib/openstack-dashboard/openstack_dashboard/locale/pt/LC_MESSAGES/django.mo
-%lang(pt-br) %{_localstatedir}/lib/openstack-dashboard/openstack_dashboard/locale/pt_BR/LC_MESSAGES/django.mo
-%lang(zh-cn) %{_localstatedir}/lib/openstack-dashboard/openstack_dashboard/locale/zh_CN/LC_MESSAGES/django.mo
-%lang(zh-tw) %{_localstatedir}/lib/openstack-dashboard/openstack_dashboard/locale/zh_TW/LC_MESSAGES/django.mo
+%dir %{_datadir}/openstack-dashboard/openstack_dashboard/locale
+%dir %{_datadir}/openstack-dashboard/openstack_dashboard/locale/*
+%dir %{_datadir}/openstack-dashboard/openstack_dashboard/locale/*/LC_MESSAGES
+%lang(bg-bg) %{_datadir}/openstack-dashboard/openstack_dashboard/locale/bg_BG/LC_MESSAGES/django.mo
+%lang(ca) %{_datadir}/openstack-dashboard/openstack_dashboard/locale/ca/LC_MESSAGES/django.mo
+%lang(cs) %{_datadir}/openstack-dashboard/openstack_dashboard/locale/cs/LC_MESSAGES/django.mo
+%lang(en) %{_datadir}/openstack-dashboard/openstack_dashboard/locale/en/LC_MESSAGES/django.mo
+%lang(en_GB) %{_datadir}/openstack-dashboard/openstack_dashboard/locale/en_GB/LC_MESSAGES/django.mo
+%lang(es) %{_datadir}/openstack-dashboard/openstack_dashboard/locale/es/LC_MESSAGES/django.mo
+%lang(fi_FI) %{_datadir}/openstack-dashboard/openstack_dashboard/locale/fi_FI/LC_MESSAGES/django.mo
+%lang(fr) %{_datadir}/openstack-dashboard/openstack_dashboard/locale/fr/LC_MESSAGES/django.mo
+%lang(hu) %{_datadir}/openstack-dashboard/openstack_dashboard/locale/hu/LC_MESSAGES/django.mo
+%lang(it) %{_datadir}/openstack-dashboard/openstack_dashboard/locale/it/LC_MESSAGES/django.mo
+%lang(ja) %{_datadir}/openstack-dashboard/openstack_dashboard/locale/ja/LC_MESSAGES/django.mo
+%lang(ka_GE) %{_datadir}/openstack-dashboard/openstack_dashboard/locale/ka_GE/LC_MESSAGES/django.mo
+%lang(ko) %{_datadir}/openstack-dashboard/openstack_dashboard/locale/ko_KR/LC_MESSAGES/django.mo
+%lang(nl-nl) %{_datadir}/openstack-dashboard/openstack_dashboard/locale/nl_NL/LC_MESSAGES/django.mo
+%lang(pl) %{_datadir}/openstack-dashboard/openstack_dashboard/locale/pl/LC_MESSAGES/django.mo
+%lang(pt) %{_datadir}/openstack-dashboard/openstack_dashboard/locale/pt/LC_MESSAGES/django.mo
+%lang(ru) %{_datadir}/openstack-dashboard/openstack_dashboard/locale/ru/LC_MESSAGES/django.mo
+%lang(pt-br) %{_datadir}/openstack-dashboard/openstack_dashboard/locale/pt_BR/LC_MESSAGES/django.mo
+%lang(vi_VN) %{_datadir}/openstack-dashboard/openstack_dashboard/locale/vi_VN/LC_MESSAGES/django.mo
+%lang(zh-cn) %{_datadir}/openstack-dashboard/openstack_dashboard/locale/zh_CN/LC_MESSAGES/django.mo
+%lang(zh-tw) %{_datadir}/openstack-dashboard/openstack_dashboard/locale/zh_TW/LC_MESSAGES/django.mo
+
+%files branding-upstream
+%defattr(-,root,root)
+%{_datadir}/openstack-dashboard/openstack_dashboard/dashboards/*/*/templates
+%if %{with nodejs}
+%{_datadir}/openstack-dashboard/openstack_dashboard/static
+%endif
+%{_datadir}/openstack-dashboard/openstack_dashboard/templates
+%{_datadir}/openstack-dashboard/static
%files -n python-horizon
%defattr(-,root,root)
%{python_sitelib}/horizon/
+%exclude %{python_sitelib}/horizon/conf/*/static
+%exclude %{python_sitelib}/horizon/conf/*/templates
+%if %{with nodejs}
+%exclude %{python_sitelib}/horizon/static
+%endif
+%exclude %{python_sitelib}/horizon/templates
+%exclude %{python_sitelib}/horizon/test
%{python_sitelib}/horizon-*.egg-info
+%files -n python-horizon-branding-upstream
+%defattr(-,root,root)
+%{python_sitelib}/horizon/conf/*/static
+%{python_sitelib}/horizon/conf/*/templates
+%if %{with nodejs}
+%{python_sitelib}/horizon/static
+%endif
+%{python_sitelib}/horizon/templates
+
# FIXME: we should package the translations with %%lang, but just doing it the
# way below will package the files twice...
## lang files
@@ -299,6 +366,7 @@
%files test
%defattr(-,root,root)
-%{_localstatedir}/lib/openstack-dashboard-test/
+%{_localstatedir}/lib/%{name}-test/
+%{python_sitelib}/horizon/test
%changelog
++++++ _service ++++++
--- /var/tmp/diff_new_pack.uhUJPz/_old 2013-06-20 21:24:47.000000000 +0200
+++ /var/tmp/diff_new_pack.uhUJPz/_new 2013-06-20 21:24:47.000000000 +0200
@@ -1,6 +1,7 @@
<services>
<service name="git_tarballs" mode="disabled">
- <param name="url">http://tarballs.openstack.org/horizon/horizon-stable-folsom.tar.gz</param>
- <param name="email">cloud-devel@suse.de</param>
+ <param name="url">http://tarballs.openstack.org/horizon/horizon-stable-grizzly.tar.gz</param>
+ <param name="email">opensuse-cloud@opensuse.org</param>
+ <param name="plain-version">True</param>
</service>
</services>
++++++ openstack-dashboard.conf.sample ++++++
--- /var/tmp/diff_new_pack.uhUJPz/_old 2013-06-20 21:24:47.000000000 +0200
+++ /var/tmp/diff_new_pack.uhUJPz/_new 2013-06-20 21:24:47.000000000 +0200
@@ -14,10 +14,10 @@
ErrorLog /var/log/apache2/openstack-dashboard-error_log
TransferLog /var/log/apache2/openstack-dashboard-access_log
- DocumentRoot /var/lib/openstack-dashboard/
+ DocumentRoot /usr/share/openstack-dashboard/
- WSGIScriptAlias / /var/lib/openstack-dashboard/openstack_dashboard/wsgi/django.wsgi
-