New graphite package, but does not work, pnp4nagios and kodi updated

2017-09-16 17:24:26 +02:00
parent d7d0658a5a
commit aafd1ef83b
4 changed files with 258 additions and 5 deletions
--- a/fedora/SPECS/graphite-web.spec
+++ b/fedora/SPECS/graphite-web.spec
@@ -0,0 +1,135 @@
+Name:           graphite-web
+Version:        1.0.2
+Release:        3%{?dist}
+
+Summary:        A Django web application for enterprise scalable realtime graphing
+License:        ASL 2.0
+URL:            https://github.com/graphite-project/graphite-web
+
+%define pversion %{version}
+Source0:        %{name}-%{version}.tar.gz
+Source1:        graphite-web-vhost.conf
+Source2:        graphite-web-README.fedora
+Source10:       %{name}.logrotate
+Patch0:					0_%{name}-%{pversion}-django-update.patch                      
+Patch1:         1_%{name}-%{pversion}-Amend-default-filesystem-locations.patch 
+Patch2:         2_%{name}-%{pversion}-Disable-internal-log-rotation.patch 
+Patch3:         3_%{name}-%{pversion}-Static_url_example.patch
+Patch4:         4_%{name}-%{pversion}-Fix-build-index.sh-variables.patch
+
+BuildArch:      noarch
+BuildRequires:  python2-devel
+
+Requires:       dejavu-sans-fonts
+Requires:       dejavu-serif-fonts
+Requires:       django-tagging
+Requires:       mod_wsgi
+Requires:       pycairo
+Requires:       pyparsing
+Requires:       python-simplejson
+Requires:       python2-carbon
+Requires:       python2-whisper >= %{version}
+Requires:       python2-whitenoise
+Requires:       python-memcached
+Requires:       pytz
+
+%if 0%{?fedora} || 0%{?rhel} >= 7
+Requires:       python-django >= 1.3
+%else
+Requires:       Django >= 1.3
+%endif
+
+Obsoletes:      %{name}-selinux < 0.9.12-7
+
+
+%description
+Graphite consists of a storage backend and a web-based visualization frontend.
+Client applications send streams of numeric time-series data to the Graphite
+backend (called carbon), where it gets stored in fixed-size database files
+similar in design to RRD. The web frontend provides user interfaces
+for visualizing this data in graphs as well as a simple URL-based API for
+direct graph generation.
+
+Graphite's design is focused on providing simple interfaces (both to users and
+applications), real-time visualization, high-availability, and enterprise
+scalability.
+
+
+%prep
+%setup -q -n graphite-web-%{version}
+rm -rf webapp/graphite/thirdparty
+find -type f -iname '*.swf' -delete
+
+%patch0 -p1 
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+
+install -m0644 %{SOURCE2} README.fedora
+
+
+%build
+%py2_build
+
+
+%install
+%py2_install \
+    --install-lib=%{python2_sitelib} \
+    --install-data=%{_datadir}/graphite \
+    --install-scripts=%{_bindir}
+
+mkdir -p %{buildroot}%{_localstatedir}/lib/graphite-web
+mkdir -p %{buildroot}%{_localstatedir}/log/graphite-web
+mkdir -p %{buildroot}%{_sysconfdir}/graphite-web
+
+install -Dp -m0644 webapp/graphite/local_settings.py.example \
+    %{buildroot}%{_sysconfdir}/graphite-web/local_settings.py
+ln -s %{_sysconfdir}/graphite-web/local_settings.py \
+    %{buildroot}%{python_sitelib}/graphite/local_settings.py
+install -Dp -m0644 conf/dashboard.conf.example  \
+    %{buildroot}%{_sysconfdir}/graphite-web/dashboard.conf
+install -Dp -m0644 %{SOURCE1} \
+    %{buildroot}%{_sysconfdir}/httpd/conf.d/graphite-web.conf
+install -Dp -m0644 conf/graphite.wsgi.example \
+    %{buildroot}%{_datadir}/graphite/graphite-web.wsgi
+
+# Log rotation.
+install -D -p -m0644 %{SOURCE10} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
+
+# Remove unneeded binaries.
+rm -f %{buildroot}%{_bindir}/run-graphite-devel-server.py
+
+# Rename build-index.sh.
+mv %{buildroot}%{_bindir}/build-index %{buildroot}%{_bindir}/graphite-build-index
+rm %{buildroot}%{_bindir}/build-index.sh
+
+# Fix permissions.
+chmod 0644 conf/graphite.wsgi.example
+
+%clean
+[ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
+
+%files
+%license LICENSE
+%doc README.fedora conf/* examples/*
+
+%dir %{_sysconfdir}/graphite-web
+%config(noreplace) %{_sysconfdir}/httpd/conf.d/graphite-web.conf
+%config(noreplace) %{_sysconfdir}/graphite-web/dashboard.conf
+%config(noreplace) %{_sysconfdir}/graphite-web/local_settings.py*
+%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
+
+%{_bindir}/graphite-build-index
+%{_datadir}/graphite
+%attr(0755,apache,apache) %dir %{_localstatedir}/lib/graphite-web
+%attr(0755,apache,apache) %dir %{_localstatedir}/log/graphite-web
+
+%{python_sitelib}/graphite/
+%{python_sitelib}/graphite_web-*-py?.?.egg-info
+
+
+%changelog
+* Sat Sep 16 2017 Daniel Steiner <daniel.steiner@greenmail.ch> 
+- First build for Fedora 26
+
--- a/fedora/SPECS/kodi.spec
+++ b/fedora/SPECS/kodi.spec
@@ -7,7 +7,7 @@
 %global _with_dvd 0

 Name: kodi
-Version: 17.3
+Version: 17.4
 Release: 1%{?dist}
 Summary: Media center

@@ -268,7 +268,7 @@ cp -p %{SOURCE4} tools/depends/target/libdvdcss/libdvdcss-master.tar.gz
 %else
 %patch2 -p1 -b.libdvd
 %endif
-%patch3 -p0 -b.ftpparse
+#%patch3 -p0 -b.ftpparse


 %build
@@ -427,6 +427,9 @@ fi


 %changelog
+* Sat Sep 2 2017 Daniel Steiner <dsteiner@redhat.com> - 17.4-1
+- Updated to Kodi 17.4
+
 * Tue Jul 18 2017 Daniel Steiner <dsteiner@redhat.com> - 17.3-1
 - Kodi 17.3 final for Fedora 26

--- a/fedora/SPECS/pnp4nagios.spec
+++ b/fedora/SPECS/pnp4nagios.spec
@@ -1,6 +1,6 @@
 Name:           pnp4nagios
-Version:        0.6.25
-Release:        6%{?dist}
+Version:        0.6.26
+Release:        1%{?dist}
 Summary:        Nagios performance data analysis tool

 Group:          Applications/System
@@ -39,7 +39,7 @@ and stores them automatically into RRD-databases.
 %prep
 %setup -q
 %patch1 -p1
-%patch2 -p0
+#%patch2 -p0
 autoreconf

 cp -p %{SOURCE3} README.fedora
@@ -142,6 +142,9 @@ fi
 %{_datadir}/nagios/html/%{name}/kohana

 %changelog
+* Sat Sep 2 2017 Daniel Steiner <dsteiner@redhat.com> - 0.6.26-1
+- Update to new release 0.6.26.
+
 * Sat Jul 22 2017 Daniel Steiner <dsteiner@redhat.com> - 0.6.25-6
 - Package requires now icinga2 instead of nagios. User/group changed to icinga

--- a/fedora/SPECS/python2-whisper.spec
+++ b/fedora/SPECS/python2-whisper.spec
@@ -0,0 +1,112 @@
+%if 0%{?rhel} && 0%{?rhel} <= 6
+%{!?__python2: %global __python2 /usr/bin/python2}
+%{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
+%{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
+%endif
+
+Name:           python2-whisper
+Version:        1.0.2
+Release:        1%{?dist}
+Summary:        Simple database library for storing time-series data
+
+Group:          Development/Libraries
+License:        ASL 2.0
+URL:            https://github.com/graphite-project
+
+Source0:        whisper-%{version}.tar.gz
+Source10:       rrd2whisper.1
+Source11:       whisper-create.1
+Source12:       whisper-dump.1
+Source13:       whisper-fetch.1
+Source14:       whisper-info.1
+Source15:       whisper-merge.1
+Source16:       whisper-resize.1
+Source17:       whisper-set-aggregation-method.1
+Source18:       whisper-update.1
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch:      noarch
+BuildRequires:  python2-devel
+BuildRequires:  python2-setuptools
+
+
+%description
+Whisper is a fixed-size database, similar in design and purpose to RRD
+(round-robin-database). It provides fast, reliable storage of numeric
+data over time. Whisper allows for higher resolution (seconds per point)
+of recent data to degrade into lower resolutions for long-term retention
+of historical data.
+
+
+%prep
+%setup -q -n whisper-%{version}
+
+
+%build
+%{__python} setup.py build
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+
+# man pages
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
+install -D -p -m0644 %{SOURCE10} $RPM_BUILD_ROOT%{_mandir}/man1
+install -D -p -m0644 %{SOURCE11} $RPM_BUILD_ROOT%{_mandir}/man1
+install -D -p -m0644 %{SOURCE12} $RPM_BUILD_ROOT%{_mandir}/man1
+install -D -p -m0644 %{SOURCE13} $RPM_BUILD_ROOT%{_mandir}/man1
+install -D -p -m0644 %{SOURCE14} $RPM_BUILD_ROOT%{_mandir}/man1
+install -D -p -m0644 %{SOURCE15} $RPM_BUILD_ROOT%{_mandir}/man1
+install -D -p -m0644 %{SOURCE16} $RPM_BUILD_ROOT%{_mandir}/man1
+install -D -p -m0644 %{SOURCE17} $RPM_BUILD_ROOT%{_mandir}/man1
+install -D -p -m0644 %{SOURCE18} $RPM_BUILD_ROOT%{_mandir}/man1
+
+# remove .py suffix
+for i in $RPM_BUILD_ROOT%{_bindir}/*.py; do
+    mv ${i} ${i%%.py}
+done
+
+
+%clean
+[ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
+
+
+%files
+%doc LICENSE
+%{_bindir}/rrd2whisper
+%{_bindir}/whisper-create
+%{_bindir}/whisper-dump
+%{_bindir}/whisper-fetch
+%{_bindir}/whisper-fill
+%{_bindir}/whisper-info
+%{_bindir}/whisper-merge
+%{_bindir}/whisper-resize
+%{_bindir}/whisper-set-aggregation-method
+%{_bindir}/whisper-update
+%{_bindir}/find-corrupt-whisper-files
+%{_bindir}/update-storage-times
+%{_bindir}/whisper-auto-resize
+%{_bindir}/whisper-auto-update
+%{_bindir}/whisper-diff
+%{_bindir}/whisper-set-xfilesfactor
+%{_mandir}/man1/rrd2whisper.1*
+%{_mandir}/man1/whisper-create.1*
+%{_mandir}/man1/whisper-dump.1*
+%{_mandir}/man1/whisper-fetch.1*
+%{_mandir}/man1/whisper-info.1*
+%{_mandir}/man1/whisper-merge.1*
+%{_mandir}/man1/whisper-resize.1*
+%{_mandir}/man1/whisper-set-aggregation-method.1*
+%{_mandir}/man1/whisper-update.1*
+%{python_sitelib}/whisper.py*
+
+%if 0%{?fedora} || 0%{?rhel} > 5
+%{python_sitelib}/whisper-*-py?.?.egg-info
+%endif
+
+
+%changelog
+* Sat Sep 16 2017 Daniel Steiner <daniel.steiner@greenmail.ch>
+- First inital release for Fedora 26
+