use apache 2.2/2.4 compatible config

[packages/graphite-web.git] / graphite-web.spec

diff --git a/graphite-web.spec b/graphite-web.spec
index 7e8f5bcbd6eeb02e606cec250243c82fdca35e49..16db3f674dc825203f6a3e7aacc4e5da811ad31c 100644 (file)
--- a/graphite-web.spec
+++ b/graphite-web.spec
@@ -5,26 +5,24 @@
 
 Summary:       A Django webapp for enterprise scalable realtime graphing
 Name:          graphite-web
-Version:       0.9.14
+Version:       0.9.15
 Release:       1
 License:       Apache v2.0
 Group:         Applications/WWW
-Source0:       https://codeload.github.com/graphite-project/graphite-web/tar.gz/%{version}
+Source0:       https://github.com/graphite-project/graphite-web/archive/0.9.15/%{name}-%{version}.tar.gz
+# Source0-md5: f81c50b8b57672fc15a1cfe7bbae1c52
 Source1:       apache.conf
 Source2:       %{name}.logrotate
 Source3:       local_settings.py
 Patch0:                %{name}-kill-thirdparty-modules.patch
-
 URL:           https://launchpad.net/graphite/
 BuildRequires: rpm-pythonprov
-# for the py_build, py_install macros
 BuildRequires: python-devel
 BuildRequires: rpmbuild(macros) >= 1.710
 Requires:      apache-mod_alias
 Requires:      apache-mod_authz_host
 Requires:      apache-mod_log_config
 Requires:      apache-mod_wsgi
-
 Requires:      fonts-TTF-DejaVu
 Requires:      python-django
 Requires:      python-django_tagging >= 0.3
@@ -34,7 +32,6 @@ Requires:     python-pyparsing
 Requires:      python-pytz
 Requires:      python-simplejson
 Requires:      python-whisper >= %{version}
-
 Requires:      webapps
 Conflicts:     logrotate < 3.8.0
 BuildArch:     noarch
@@ -65,7 +62,6 @@ and enterprise scalability.
 %build
 %py_build %{?with_tests:test}
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 # http://graphite.readthedocs.org/en/latest/install-source.html#installing-in-the-default-location
@@ -77,19 +73,17 @@ rm -rf $RPM_BUILD_ROOT
 %py_postclean -x manage.py
 
 # Create directories
-install -d $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}
-install -d $RPM_BUILD_ROOT%{_localstatedir}/log/%{name}
-install -d $RPM_BUILD_ROOT%{_sysconfdir}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir},/etc/logrotate.d,%{_localstatedir}/{lib,log}/%{name}}
 
 # Install some default configurations and wsgi
 install -Dp conf/dashboard.conf.example $RPM_BUILD_ROOT%{_sysconfdir}/dashboard.conf
 # mv $RPM_BUILD_ROOT{%{py_sitescriptdir}/graphite/local_settings.py.example,%{_sysconfdir}/local_settings.py}
-install -Dp %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/local_settings.py
+cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/local_settings.py
 
 touch $RPM_BUILD_ROOT%{py_sitescriptdir}/graphite/local_settings.py{c,o}
-install -Dp conf/graphite.wsgi.example $RPM_BUILD_ROOT%{_datadir}/graphite/%{name}.wsgi
-install -Dp %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
-install -Dp %{SOURCE2} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
+cp -p conf/graphite.wsgi.example $RPM_BUILD_ROOT%{_datadir}/graphite/%{name}.wsgi
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
+cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
 
 # Configure django /media/ location
 sed -i 's|##PYTHON_SITELIB##|%{py_sitescriptdir}|' $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
@@ -123,7 +117,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc conf/* examples/*
 %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/%{name}
-## %dir %attr(750,root,http) %{_sysconfdir}
+%dir %attr(750,root,http) %{_sysconfdir}
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf
 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/dashboard.conf
 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/local_settings.py