summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPádraig Brady <P@draigBrady.com>2012-06-08 16:20:56 (GMT)
committerPádraig Brady <P@draigBrady.com>2012-06-08 16:24:20 (GMT)
commit0176a7c5cff7d65a3cf5ae287fe54fee53ae7868 (patch)
tree57f220c0e6d0c4c547a9819b656d0b0c74f55fca
parent52371f37d216622882dc0b3e51870a9a09319ad0 (diff)
downloadpython-django-horizon-0176a7c.zip
python-django-horizon-0176a7c.tar.gz
python-django-horizon-0176a7c.tar.xz
update to folsom milestone 1
Note the Django 1.4 requirement I think is only for django.contrib.sessions.backends.signed_cookies so it might be easy enough to backport to django 1.3 if required
-rw-r--r--.gitignore1
-rw-r--r--python-django-horizon.spec33
-rw-r--r--sources2
3 files changed, 12 insertions, 24 deletions
diff --git a/.gitignore b/.gitignore
index eb7fa05..f07c9de 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/horizon-2012.1~e3.tar.gz
/horizon-2012.1~rc1~20120304.1447.tar.gz
/horizon-2012.1.tar.gz
+/horizon-2012.2~f1.tar.gz
diff --git a/python-django-horizon.spec b/python-django-horizon.spec
index 6182eb8..d41ed21 100644
--- a/python-django-horizon.spec
+++ b/python-django-horizon.spec
@@ -1,37 +1,24 @@
-#
-# This is 2012.1 essex-3 milestone
-#
-%global release_name essex
-%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
-Release: 4%{?dist}
+Version: 2012.2
+Release: 0.1.f1%{?dist}
Summary: Django application for talking to Openstack
Group: Development/Libraries
# Code in horizon/horizon/utils taken from django which is BSD
License: ASL 2.0 and BSD
-URL: http://horizon.openstack.org
+URL: http://horizon.openstack.org/
BuildArch: noarch
-Source0: http://launchpad.net/horizon/%{release_name}/%{version}/+download/horizon-%{version}.tar.gz
+Source0: http://launchpad.net/horizon/folsom/folsom-1/+download/horizon-2012.2~f1.tar.gz
Source1: openstack-dashboard.conf
Patch1: %{name}-disable-debug.patch
Patch2: %{name}-default-db.patch
-Patch3: xss-in-log-viewer.patch
-Patch4: CVE-2012-2144-session_fixation.patch
-Patch5: %{name}-disable-nose.patch
-Requires: Django >= 1.3.0
-Requires: openstack-glance >= 2012.1
+Requires: Django >= 1.4.0
Requires: python-cloudfiles >= 1.7.9.3
Requires: python-dateutil
+Requires: python-glanceclient
Requires: python-keystoneclient >= 2012.1
Requires: python-novaclient >= 2012.1
Requires: python-quantumclient >= 2012.1
@@ -74,9 +61,9 @@ Requires: %{name} = %{version}-%{release}
BuildRequires: python-sphinx >= 1.1.3
# Doc building basically means we have to mirror Requires:
-BuildRequires: openstack-glance
BuildRequires: python-cloudfiles >= 1.7.9.3
BuildRequires: python-dateutil
+BuildRequires: python-glanceclient
BuildRequires: python-keystoneclient
BuildRequires: python-novaclient >= 2012.1
BuildRequires: python-quantumclient
@@ -89,9 +76,6 @@ Documentation for the Django Horizon application for talking with Openstack
%setup -q -n horizon-%{version}
%patch1 -p1
%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
%build
%{__python} setup.py build
@@ -141,6 +125,9 @@ python %{_datadir}/openstack-dashboard/manage.py collectstatic --noinput >/dev/n
%doc html
%changelog
+* Wed Jun 06 2012 Pádraig Brady <P@draigBrady.com> - 2012.2-0.1.f1
+- Update to folsom milestone 1
+
* Wed May 09 2012 Alan Pevec <apevec@redhat.com> - 2012.1-4
- Remove the currently uneeded dependency on python-django-nose
diff --git a/sources b/sources
index 774f118..36be7b3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-24306c7953fc2c4d1fb36951b61443c9 horizon-2012.1.tar.gz
+bbde055c1797906cfa493741bb6d6ecf horizon-2012.2~f1.tar.gz