Attachment 937484 Details for Bug 1141651 – require python-django15 on f20 specfile patch

[patch] require python-django15 on f20 specfile patch

graphite-web.spec.django15-f20.patch (text/plain), 1.86 KB, created by Piotr Popieluch on 2014-09-15 08:49:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Piotr Popieluch

Created: 2014-09-15 08:49:40 UTC

Size: 1.86 KB

patch

obsolete

>--- graphite-web.spec.orig	2013-10-02 01:26:37.000000000 +0200
>+++ graphite-web.spec	2014-09-15 10:49:02.951495004 +0200
>@@ -2,7 +2,7 @@
> 
> Name:           graphite-web
> Version:        0.9.12
>-Release:        5%{?dist}
>+Release:        6%{?dist}
> Summary:        A Django webapp for enterprise scalable realtime graphing
> Group:          Applications/Internet
> 
>@@ -16,6 +16,7 @@
> Patch1:         graphite-web-0.9.12-dashboard-load.patch
> Patch2:         graphite-web-0.9.12-carbonlink-exception-log.patch
> Patch3:         graphite-web-0.9.12-safe-unpickle-deque-addition.patch
>+Patch4:         graphite-web-0.9.12-django15-wsgi.patch
> BuildRoot:      %{_tmppath}/graphite-web-%{version}-%{release}-root-%(%{__id_u} -n)
> 
> BuildArch:      noarch
>@@ -23,11 +24,15 @@
> Requires:       python-whisper >= %{version}, mod_wsgi, pytz, pyparsing, python-simplejson
> Requires:       dejavu-sans-fonts, dejavu-serif-fonts, pycairo, django-tagging
> 
>+%if 0%{?fedora} >= 20
>+Requires:       python-django15
>+%else
> %if 0%{?fedora} >= 18
> Requires:       python-django >= 1.3
> %else
> Requires:       Django >= 1.3
> %endif
>+%endif
> 
> %if 0%{?el5}
> Requires:       python-sqlite2
>@@ -75,6 +80,10 @@
> %patch2 -p1
> # Add deque to the PICKLE_SAFE filter (https://github.com/graphite-project/graphite-web/issues/423)
> %patch3 -p1
>+# Use Django 1.5 on Fedora >= 20
>+%if 0%{?fedora} >= 20
>+%patch4 -p1
>+%endif
> %{__install} -m 644 %{SOURCE2} README.fedora
> %{__install} -m 644 %{SOURCE3} README.selinux
> 
>@@ -166,6 +175,10 @@
> %doc README.selinux
> 
> %changelog
>+* Mon Sep 15 2014 Piotr Popieluch <piotr1212@gmail.com> - 0.9.12-6
>+- Require python-django15 on f20
>+- Patch wsgi for python-django15 on f20
>+
> * Tue Oct 01 2013 Jonathan Steffan <jsteffan@fedoraproject.org> - 0.9.12-5
> - Patch for fix loading dashboards by name (RHBZ#1014349)
> - Patch for log name of metric that throws exception for CarbonLink (RHBZ#1014349)

Actions: View | Diff

Attachments on bug 1141651: 937484 | 937485