[python-django-horizon/el6-grizzly: 19/20] Merge branch 'f19' into el6-grizzly

[Matthias Runge]

commit aa974ca1d45846181a679a8df5dbac64924e29fd
Merge: e6a4f26 46e5b49
Author: Matthias Runge <mrunge at redhat.com>
Date:   Mon Aug 12 12:27:06 2013 +0200

    Merge branch 'f19' into el6-grizzly
    
    Conflicts:
    	.gitignore
    	0001-disable-debug-move-web-root.patch
    	0001-disable-debug.patch
    	0002-disable-debug-move-web-root.patch
    	0003-Don-t-access-the-net-while-building-docs.patch
    	python-django-horizon.spec

 .gitignore                                         |    6 +++-
 ...p-stable-grizzly-next-version-to-2013.1.4.patch |   23 ++++++++++++++++++++
 ...patch => 0002-disable-debug-move-web-root.patch |    8 +++---
 ...-Don-t-access-the-net-while-building-docs.patch |    0
 python-django-horizon.spec                         |   18 ++++++++++-----
 5 files changed, 43 insertions(+), 12 deletions(-)
---
diff --cc python-django-horizon.spec
index 06b38ee,9c955a6..104d1b2
--- a/python-django-horizon.spec
+++ b/python-django-horizon.spec
@@@ -16,15 -16,17 +16,16 @@@ Source2:    openstack-dashboard-httpd-2
  Source4:    openstack-dashboard-httpd-logging.conf
  
  #
- # patches_base=2013.1.1
+ # patches_base=2013.1.3
  #
- Patch0001: 0001-disable-debug-move-web-root.patch
- Patch0002: 0002-Don-t-access-the-net-while-building-docs.patch
+ Patch0001: 0001-Bump-stable-grizzly-next-version-to-2013.1.4.patch
+ Patch0002: 0002-disable-debug-move-web-root.patch
+ Patch0003: 0003-Don-t-access-the-net-while-building-docs.patch
  
- %if 0%{?rhel}>6 || 0%{?fedora} > 17
 -
+ %if 0%{?rhel}>6 || 0%{?fedora} > 18
  # grizzly requires python-django14
  BuildRequires:   python-django14
- Requires:   python-django14
+ Requires:   python-django14 <= 1.5
  
  %else
  # epel6 has a separate Django14 package
@@@ -248,20 -252,30 +251,23 @@@ cd %{buildroot}%{_datadir}/openstack-da
  %doc html 
  
  %changelog
+ * Mon Aug 12 2013 Matthias Runge <mrunge at redhat.com> - 2013.1.3-1
+ - rebase to 2013.1.3
+ 
 -* Wed Jul 03 2013 Matthias Runge <mrunge at redhat.com> - 2013.1.2-2
 -- explicitly require a Django version < 1.5 (rhbz#978647)
 -
 -* Mon Jun 10 2013 Matthias Runge <mrunge at redhat.com> - 2013.1.2-1
 -- update to 2013.1.2
 -
 -* Thu Jun 06 2013 Matthias Runge <mrunge at redhat.com> - 2013.1.1-2
 -- python-django14 is just for >f18 available
 -
  * Mon May 13 2013 Matthias Runge <mrunge at redhat.com> - 2013.1.1-1
 -- change buildrequires from lessjs to nodejs-less
 -- update to 2013.1.1
 +- update to 2013.1.1 stable release
 +- move to compression using node.js/less
  
 -* Fri Apr 05 2013 Matthias Runge <mrunge at redhat.com> - 2013.1-2
 -- explicitly require python-django14
 +* Mon Apr 08 2013 Matthias Runge <mrunge at redhat.com> - 2013.1-1
 +- update to grizzly final
  
 -* Fri Apr 05 2013 Matthias Runge <mrunge at redhat.com> - 2013.1-1
 -- update to 2013.1 
 +* Thu Mar 14 2013 Matthias Runge <mrunge at redhat.com> - 2013.1-0.7.g3
 +- fix compressed css (rhbz#921036)
 +- enable compression in httpd file
 +- set expires in httpd config file
  
  * Fri Mar 08 2013 Matthias Runge <mrunge at redhat.com> - 2013.1-0.6.g3
 -- fix syntax error in config
 +- fix a syntax error in config file
  
  * Wed Feb 27 2013 Matthias Runge <mrunge at redhat.com> - 2013.1-0.5.g3
  - update to grizzly-3