From b6a600c474845fa58758fa4c1e09d255e7dcf6c5 Mon Sep 17 00:00:00 2001 From: Piotr Popieluch Date: Nov 14 2015 21:08:54 +0000 Subject: update to 0.9.14 --- diff --git a/.gitignore b/.gitignore index 997880b..b872568 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /graphite-web-0.9.12.tar.gz /graphite-web-28cc7276784bcc4d8a1be6854a6add1145ec4109.tar.gz /graphite-web-aa992b96273e6042660111d594ee62108cea52ae.tar.gz +/graphite-web-2d22f52.tar.gz diff --git a/graphite-web-0.9.13-Amend-default-filesystem-locations.patch b/graphite-web-0.9.13-Amend-default-filesystem-locations.patch index 8eb783d..e3d2060 100644 --- a/graphite-web-0.9.13-Amend-default-filesystem-locations.patch +++ b/graphite-web-0.9.13-Amend-default-filesystem-locations.patch @@ -13,26 +13,26 @@ diff --git a/conf/graphite.wsgi.example b/conf/graphite.wsgi.example index 0527f53..fcb7a41 100755 --- a/conf/graphite.wsgi.example +++ b/conf/graphite.wsgi.example -@@ -1,5 +1,5 @@ - import os, sys --sys.path.append('/opt/graphite/webapp') +@@ -1,5 +1,6 @@ + import os + import sys +sys.path.append('/usr/share/graphite/webapp') - os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'graphite.settings') - import django + try: + from importlib import import_module diff --git a/setup.py b/setup.py index 78d2b20..4dc0ce0 100644 --- a/setup.py +++ b/setup.py -@@ -60,6 +60,7 @@ setup( - package_data={'graphite' : - ['templates/*', 'local_settings.py.example']}, - scripts=glob('bin/*'), -- data_files=webapp_content.items() + storage_dirs + conf_files + examples, -+ #data_files=webapp_content.items() + storage_dirs + conf_files + examples, -+ data_files=webapp_content.items(), - **setup_kwargs - ) +@@ -87,7 +87,7 @@ + package_data={'graphite' : + ['templates/*', 'local_settings.py.example']}, + scripts=glob('bin/*'), +- data_files=webapp_content.items() + storage_dirs + conf_files + examples, ++ data_files=webapp_content.items(), + **setup_kwargs + ) + finally: diff --git a/webapp/graphite/local_settings.py.example b/webapp/graphite/local_settings.py.example index 73a0c57..d6f9857 100644 --- a/webapp/graphite/local_settings.py.example diff --git a/graphite-web-0.9.13-Force-use-of-system-libraries.patch b/graphite-web-0.9.13-Force-use-of-system-libraries.patch index d92a4e8..1088029 100644 --- a/graphite-web-0.9.13-Force-use-of-system-libraries.patch +++ b/graphite-web-0.9.13-Force-use-of-system-libraries.patch @@ -16,15 +16,15 @@ diff --git a/setup.py b/setup.py index 4dc0ce0..1b910d1 100644 --- a/setup.py +++ b/setup.py -@@ -54,8 +54,6 @@ setup( - 'graphite.dashboard', - 'graphite.events', - 'graphite.version', -- 'graphite.thirdparty', -- 'graphite.thirdparty.pytz', - ], - package_data={'graphite' : - ['templates/*', 'local_settings.py.example']}, +@@ -81,8 +81,6 @@ + 'graphite.dashboard', + 'graphite.events', + 'graphite.version', +- 'graphite.thirdparty', +- 'graphite.thirdparty.pytz', + ], + package_data={'graphite' : + ['templates/*', 'local_settings.py.example']}, diff --git a/webapp/graphite/cli/parser.py b/webapp/graphite/cli/parser.py index ec1a435..7d7d48d 100644 --- a/webapp/graphite/cli/parser.py diff --git a/graphite-web-0.9.14-Disable-whitenoise.patch b/graphite-web-0.9.14-Disable-whitenoise.patch new file mode 100644 index 0000000..f93594c --- /dev/null +++ b/graphite-web-0.9.14-Disable-whitenoise.patch @@ -0,0 +1,33 @@ +--- a/conf/graphite.wsgi.example 2015-11-11 13:22:51.025797310 +0100 ++++ b/conf/graphite.wsgi.example 2015-11-11 13:23:22.280070370 +0100 +@@ -15,30 +15,6 @@ + + application = get_wsgi_application() + +-try: +- import whitenoise +-except ImportError: +- whitenoise = False +-else: +- # WhiteNoise < 2.0.1 does not support Python 2.6 +- if sys.version_info[:2] < (2, 7): +- whitenoise_version = tuple(map( +- int, getattr(whitenoise, '__version__', '0').split('.'))) +- if whitenoise_version < (2, 0, 1): +- whitenoise = False +- +-if whitenoise: +- from whitenoise.django import DjangoWhiteNoise +- application = DjangoWhiteNoise(application) +- prefix = "/".join((settings.URL_PREFIX.strip('/'), 'static')) +- for directory in settings.STATICFILES_DIRS: +- application.add_files(directory, prefix=prefix) +- for app_path in settings.INSTALLED_APPS: +- module = import_module(app_path) +- directory = os.path.join(os.path.dirname(module.__file__), 'static') +- if os.path.isdir(directory): +- application.add_files(directory, prefix=prefix) +- + # Initializing the search index can be very expensive. The import below + # ensures the index is preloaded before any requests are handed to the + # process. diff --git a/graphite-web.spec b/graphite-web.spec index 5b71399..c4d4522 100644 --- a/graphite-web.spec +++ b/graphite-web.spec @@ -4,19 +4,19 @@ %{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %endif -%global commit aa992b96273e6042660111d594ee62108cea52ae -%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global commit0 2d22f529dccdfaf7980d6d27696542a5c4e005af +%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Name: graphite-web -Version: 0.9.13 -Release: 0.4.%{shortcommit}%{?dist} +Version: 0.9.14 +Release: 1%{?dist} Summary: A Django web application for enterprise scalable realtime graphing Group: Applications/Internet License: ASL 2.0 URL: https://github.com/graphite-project -Source0: https://github.com/graphite-project/graphite-web/archive/%{commit}/%{name}-%{commit}.tar.gz +Source0: https://github.com/graphite-project/%{name}/archive/%{commit0}.tar.gz#/%{name}-%{shortcommit0}.tar.gz Source1: graphite-web-vhost.conf Source2: graphite-web-README.fedora Source10: %{name}.logrotate @@ -24,6 +24,7 @@ Patch0: %{name}-0.9.13-Amend-default-filesystem-locations.patch Patch1: %{name}-0.9.13-Force-use-of-system-libraries.patch Patch5: %{name}-0.9.13-Fix-build-index.sh-variables.patch Patch7: %{name}-0.9.13-Disable-internal-log-rotation.patch +Patch8: %{name}-0.9.14-Disable-whitenoise.patch BuildArch: noarch BuildRequires: python-devel @@ -65,7 +66,7 @@ scalability. %prep -%setup -q -n graphite-web-%{commit} +%setup -q -n graphite-web-%{commit0} rm -rf webapp/graphite/thirdparty find -type f -iname '*.swf' -delete @@ -83,6 +84,9 @@ install -m0644 %{SOURCE2} README.fedora # Disable internal log rotation. %patch7 -p1 +# Disable loading whitenoise module automatically when installed +%patch8 -p1 + %build %{__python2} setup.py build @@ -131,7 +135,9 @@ chmod 0644 %{buildroot}%{_datadir}/graphite/webapp/content/js/window/* %files -%doc README.fedora LICENSE conf/* examples/* +%{!?_licensedir:%global license %%doc} +%license LICENSE +%doc README.fedora conf/* examples/* %dir %{_sysconfdir}/graphite-web %config(noreplace) %{_sysconfdir}/httpd/conf.d/graphite-web.conf @@ -150,6 +156,9 @@ chmod 0644 %{buildroot}%{_datadir}/graphite/webapp/content/js/window/* %changelog +* Wed Nov 11 2015 Piotr Popieluch - 0.9.14-1 +- Update to new version + * Wed Jun 17 2015 Fedora Release Engineering - 0.9.13-0.4.aa992b9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index 49bf354..b53c3f0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -27afd3f995f4a9676945ddcb8b9f36c0 graphite-web-aa992b96273e6042660111d594ee62108cea52ae.tar.gz +e3ee4266a77dcaf40a2bb9dc1f7acdef graphite-web-2d22f52.tar.gz