[shinken] fix specfile
david hannequin
hvad at fedoraproject.org
Mon Jan 7 20:39:41 UTC 2013
commit e37723097fcda4bc1649688ef611637e31b8114f
Author: hvad <david.hannequin at gmail.com>
Date: Mon Jan 7 21:39:30 2013 +0100
fix specfile
shinken.spec | 159 ++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 106 insertions(+), 53 deletions(-)
---
diff --git a/shinken.spec b/shinken.spec
index e30f7c5..63172a9 100644
--- a/shinken.spec
+++ b/shinken.spec
@@ -4,20 +4,13 @@
Summary: Python Monitoring tool
Name: shinken
-Version: 1.0.1
-Release: 7%{?dist}
-URL: http://%{name}-monitoring.org
-Source0: http://%{name}-monitoring.org/pub/%{name}-%{version}.tar.gz
-Source1: shinken-admin.8shinken
-Source2: shinken.commands.cfg
-Source3: shinken-arbiter.init
-Source4: shinken-scheduler.init
-Source5: shinken-poller.init
-Source6: shinken-broker.init
-Source7: shinken-reactionner.init
-Source8: shinken-receiver.init
-Patch0: %{name}-build.patch
+Version: 1.2.2
+Release: 1%{?dist}
+URL: http://www.%{name}-monitoring.org
+Source0: http://www.%{name}-monitoring.org/pub/%{name}-%{version}.tar.gz
+Source1: %{name}-commands.cfg
License: AGPLv3+
+Patch0: %{name}-webui-menu.patch
Requires: python
Requires: python-pyro
Requires: python-simplejson
@@ -99,15 +92,16 @@ Shinken receiver daemon
%prep
%setup -q
+%patch0 -p1 -b .patch
-%patch0 -p1 -b orig
# clean git files/
find . -name '.gitignore' -exec rm -f {} \;
# Check confuguration files
sed -i -e 's!./$SCRIPT!python ./$SCRIPT!' test/quick_tests.sh
sed -i -e 's!include var/void_for_git!exclude var/void_for_git!' MANIFEST.in
-rm etc/packs/databases/mongodb/macros.cfg
+
+rm -rf shinken/webui/plugins/eue shinken/webui/plugins/mobile/htdocs/css/log.css shinken/webui/plugins/mobile/htdocs/css/system.css shinken/webui/plugins/mobile/htdocs/css/details.css etc/packs/os/collectd/discovery.cfg etc/packs/databases/mongodb/macros.cfg shinken/webui/plugins_skonf bin/shinken-skonf
%build
@@ -115,6 +109,8 @@ rm etc/packs/databases/mongodb/macros.cfg
%install
+find %{buildroot} -size 0 -delete
+
%{__python} setup.py install -O1 --skip-build --root %{buildroot} --install-scripts=/usr/sbin/ --owner %{shinken_user} --group %{shinken_group}
install -d -m0755 %{buildroot}%{_sbindir}
@@ -139,7 +135,7 @@ install -p -m0644 for_fedora/etc/discovery*.cfg %{buildroot}%{_sysconfdir}/%{nam
install -p -m0644 for_fedora/etc/{contactgroups,nagios,timeperiods,%{name}-specific,escalations,servicegroups,resource,templates}.cfg %{buildroot}%{_sysconfdir}/%{name}/
install -p -m0644 for_fedora/etc/{brokerd,pollerd,reactionnerd,receiverd,schedulerd}.ini %{buildroot}%{_sysconfdir}/%{name}/
-cp -rf %{SOURCE2} %{buildroot}%{_sysconfdir}/%{name}/commands.cfg
+cp %{SOURCE1} %{buildroot}%{_sysconfdir}/%{name}/commands.cfg
%if %{with_systemd}
install -d -m0755 %{buildroot}%{_unitdir}
@@ -151,12 +147,12 @@ cp -rf %{SOURCE2} %{buildroot}%{_sysconfdir}/%{name}/commands.cfg
install -p -m0644 for_fedora/systemd/%{name}-poller.service %{buildroot}%{_unitdir}/%{name}-poller.service
%else
install -d -m0755 %{buildroot}%{_initrddir}
- cp %{SOURCE3} %{buildroot}%{_initrddir}/%{name}-arbiter
- cp %{SOURCE4} %{buildroot}%{_initrddir}/%{name}-scheduler
- cp %{SOURCE5} %{buildroot}%{_initrddir}/%{name}-poller
- cp %{SOURCE6} %{buildroot}%{_initrddir}/%{name}-broker
- cp %{SOURCE7} %{buildroot}%{_initrddir}/%{name}-reactionner
- cp %{SOURCE8} %{buildroot}%{_initrddir}/%{name}-receiver
+ install -p -m0644 for_fedora/init.d/%{name}-arbiter.init %{buildroot}%{_initrddir}/%{name}-arbiter
+ install -p -m0644 for_fedora/init.d/%{name}-scheduler.init %{buildroot}%{_initrddir}/%{name}-scheduler
+ install -p -m0644 for_fedora/init.d/%{name}-poller.init %{buildroot}%{_initrddir}/%{name}-poller
+ install -p -m0644 for_fedora/init.d/%{name}-broker.init %{buildroot}%{_initrddir}/%{name}-broker
+ install -p -m0644 for_fedora/init.d/%{name}-reactionner.init %{buildroot}%{_initrddir}/%{name}-reactionner
+ install -p -m0644 for_fedora/init.d/%{name}-receiver.init %{buildroot}%{_initrddir}/%{name}-receiver
%endif
install -d -m0755 %{buildroot}%{_sysconfdir}/logrotate.d
@@ -177,7 +173,6 @@ install -m0755 libexec/*{.py,.pl} %{buildroot}%{_usr}/lib/%{name}/plugins
install -d -m0755 %{buildroot}%{_mandir}/man3
install -p -m0644 doc/man/* %{buildroot}%{_mandir}/man3
-install -p -m0644 %{SOURCE1} %{buildroot}%{_mandir}/man3
for lib in %{buildroot}%{python_sitearch}/%{name}/*.py; do
sed '/\/usr\/bin\/env/d' $lib > $lib.new &&
@@ -185,19 +180,72 @@ for lib in %{buildroot}%{python_sitearch}/%{name}/*.py; do
mv $lib.new $lib
done
-chmod -x %{buildroot}%{python_sitelib}/%{name}/{property,daemon,basemodule}.py
+for Files in %{buildroot}%{python_sitelib}/%{name}/__init__.py %{buildroot}%{python_sitelib}/%{name}/core/__init__.py %{buildroot}%{python_sitelib}/%{name}/daemons/*.py %{buildroot}%{python_sitelib}/%{name}/modules/{openldap_ui.py,nrpe_poller.py,livestatus_broker/livestatus_query_cache.py} ; do
+ %{__sed} -i.orig -e 1d ${Files}
+ touch -r ${Files}.orig ${Files}
+ %{__rm} ${Files}.orig
+done
+
+
+chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/htdocs/js/shinken-greeting.js
+chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/plugins/login/htdocs/js/jQuery.dPassword.js
+chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/plugins/system/views/log.tpl
+chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/plugins/login/htdocs/css/login.css
+chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/htdocs/js/jquery.js
+chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/htdocs/js/application.js
chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/plugins/eltdetail/htdocs/js/domtab.js
-chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/bottle.py
-chmod -x %{buildroot}%{python_sitelib}/%{name}/modules/livestatus_broker/mapping.py
+chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/plugins/dashboard/views/dashboard.tpl
+chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/plugins/problems/views/widget_problems.tpl
+chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/plugins/dashboard/htdocs/css/fullscreen.css
+chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/htdocs/js/README.md
+chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/htdocs/css/bootstrap.css
+chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/plugins/dashboard/htdocs/css/shinken-currently.css
+chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/plugins/impacts/views/impacts.tpl
+chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/views/header_element.tpl.patch
+chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/plugins/dashboard/htdocs/js/jquery.jclock.js
+chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/views/widget.tpl
+chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/views/pagination_element.tpl
+chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/htdocs/css/custom/layout.css
+chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/plugins/dashboard/htdocs/css/fullscreen-widget.css
+chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/htdocs/css/bootstrap.min.css
+chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/htdocs/font/fontawesome-webfont.svg
+chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/views/header_element.tpl
+chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/plugins/dashboard/htdocs/css/dashboard.css
+chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/htdocs/js/bootstrap-scrollspy.js
+chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/plugins_hostd/login/htdocs/js/jQuery.dPassword.js
+chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/plugins/dashboard/htdocs/css/widget.css
+chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/plugins_hostd/login/htdocs/css/login.css
+chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/htdocs/js/jquery.meow.js
+chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/plugins/problems/views/widget_last_problems.tpl
+chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/plugins/eltdetail/htdocs/css/eltdetail.css
chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/plugins/system/htdocs/css/system.css
-chmod -x %{buildroot}%{python_sitelib}/%{name}/modules/livestatus_broker/*.py
-chmod -x %{buildroot}%{python_sitelib}/%{name}/modules/{logstore_mongodb.py,logstore_sqlite.py}
+chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/plugins/dashboard/views/fullscreen.tpl
+chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/htdocs/css/elements/jquery.meow.css
+chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/htdocs/js/bootstrap-carousel.js
+chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/views/footer_element.tpl
chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/plugins/system/htdocs/css/log.css
-chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/plugins/eltdetail/htdocs/css/eltdetail2.css
+chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/plugins/problems/views/problems.tpl
+chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/htdocs/js/bootstrap.js
+chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/htdocs/js/bootstrap.min.js
+chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/htdocs/js/google-code-prettify/prettify.js
+chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/plugins/impacts/htdocs/css/impacts.css
+chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/plugins/dashboard/views/currently.tpl
+chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/plugins/login/views/login.tpl
+chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/htdocs/js/bootstrap-typeahead.js
+chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/plugins/system/views/system.tpl
+chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/htdocs/js/google-code-prettify/prettify.css
+chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/plugins/eltdetail/views/eltdetail.tpl
+chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/htdocs/css/docs.css
+chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/views/layout.tpl
+chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/htdocs/css/font-awesome.css
+chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/htdocs/css/font-awesome-ie7.css
+chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/htdocs/js/shinkenui.js
+chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/plugins/system/views/system_widget.tpl
+chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/htdocs/js/bootstrap-alert.js
+chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/htdocs/css/custom/badger.css
+chmod -x %{buildroot}%{python_sitelib}/%{name}/webui/views/navigation_element.tpl
+
-sed -i -e '1d;2i#!/usr/bin/env pyhton' %{buildroot}%{python_sitelib}/%{name}/__init__.py
-sed -i -e 's:#!/usr/bin/python::' %{buildroot}%{python_sitelib}/%{name}/core/__init__.py
-sed -i -e 's:#!/usr/bin/python::' %{buildroot}%{python_sitelib}/%{name}/plugins/__init__.py
sed -i -e '1d;2i#!/usr/bin/env python' %{buildroot}%{_usr}/lib/%{name}/plugins/nsca_client.py
sed -i -e 's!/usr/local/shinken/libexec!%{_libdir}/nagios/plugins!' %{buildroot}%{_sysconfdir}/%{name}/resource.cfg
sed -i -e 's!/usr/lib/nagios/plugins!%{_libdir}/nagios/plugins!' %{buildroot}%{_sysconfdir}/%{name}/resource.cfg
@@ -214,16 +262,20 @@ rm -rf %{buildroot}%{_localstatedir}/{log,run,lib}/%{name}/void_for_git
rm %{buildroot}%{_usr}/lib/%{name}/plugins/check.sh
rm %{buildroot}%{_sysconfdir}/default/shinken
rm -rf %{buildroot}%{_sysconfdir}/init.d/shinken*
-rm -rf %{buildroot}%{_sbindir}/%{name}-skonf
rm -rf %{buildroot}%{_usr}/lib/%{name}/plugins/*.{pyc,pyo}
rm -rf %{buildroot}%{_sbindir}/shinken-{arbiter,discovery,broker,poller,reactionner,receiver,scheduler}.py
-sed -i -e '1d;2i#!/usr/bin/env python' %{buildroot}%{python_sitelib}/%{name}/modules/ip_tag_arbiter/{__init__,ip_tag_arbiter}.py
-sed -i -e '1d;2i#!/usr/bin/env python' %{buildroot}%{python_sitelib}/%{name}/misc/{filter,sorter,perfdata}.py
-sed -i -e '1d;2i#!/usr/bin/env python' %{buildroot}%{python_sitelib}/%{name}/modules/glpi_arbiter.py
-sed -i -e '1d;2i#!/usr/bin/env python' %{buildroot}%{python_sitelib}/%{name}/misc/datamanager.py
-sed -i -e '1d;2i#!/usr/bin/env python' %{buildroot}%{python_sitelib}/%{name}/webui/plugins/system/system.py
-sed -i -e '1d;2i#!/usr/bin/env python' %{buildroot}%{python_sitelib}/%{name}/webui/plugins/mobile/mobile.py
+find %{buildroot}%{python_sitelib}/%{name} -type f | xargs sed -i 's|#!/usr/bin/python||g'
+
+chmod +x %{buildroot}%{python_sitelib}/%{name}/{acknowledge.py,trigger_functions.py,__init__.py,action.py,db_sqlite.py,dependencynode.py,satellite.py,bin.py,notification.py,sorteddict.py,skonfuiworker.py,arbiterlink.py,eventhandler.py,autoslots.py,modulesmanager.py,borg.py,memoized.py,singleton.py}
+
+sed -i 's|#!/usr/bin/env python||g' %{buildroot}%{python_sitelib}/%{name}/webui/plugins/mobile/mobile.py
+sed -i 's|#!/usr/bin/env python||g' %{buildroot}%{python_sitelib}/%{name}/modules/webui_broker/helper.py
+sed -i 's|#!/usr/bin/env python||g' %{buildroot}%{python_sitelib}/%{name}/webui/plugins/mobile/mobile.py
+sed -i 's|#!/usr/bin/env python||g' %{buildroot}%{python_sitelib}/%{name}/modules/webui_broker/helper.py
+rm -rf %{buildroot}%{python_sitelib}/%{name}/webui/plugins/user/{__init__.pyo,__init__.pyc}
+rm -rf %{buildroot}%{python_sitelib}/%{name}/webui/plugins/eue
+chmod -x %{buildroot}%{python_sitelib}/%{name}/{acknowledge.py,trigger_functions.py,__init__.py}
%clean
@@ -233,7 +285,6 @@ getent passwd %{shinken_user} >/dev/null || useradd -r -g %{shinken_group} -d %{
exit 0
%post arbiter
-# Initial installation
if [ $1 -eq 1 ] ; then
%if %{with_systemd}
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
@@ -357,7 +408,6 @@ fi
%if %{with_systemd}
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
if [ $1 -ge 1 ] ; then
- # Package upgrade, not uninstall
/bin/systemctl try-restart %{name}-arbiter.service >/dev/null 2>&1 || :
fi
%endif
@@ -366,7 +416,6 @@ fi
%if %{with_systemd}
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
if [ $1 -ge 1 ] ; then
- # Package upgrade, not uninstall
/bin/systemctl try-restart %{name}-broker.service >/dev/null 2>&1 || :
fi
%endif
@@ -375,7 +424,6 @@ fi
%if %{with_systemd}
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
if [ $1 -ge 1 ] ; then
- # Package upgrade, not uninstall
/bin/systemctl try-restart %{name}-poller.service >/dev/null 2>&1 || :
fi
%endif
@@ -384,7 +432,6 @@ fi
%if %{with_systemd}
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
if [ $1 -ge 1 ] ; then
- # Package upgrade, not uninstall
/bin/systemctl try-restart %{name}-reactionner.service >/dev/null 2>&1 || :
fi
%endif
@@ -393,7 +440,6 @@ fi
%if %{with_systemd}
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
if [ $1 -ge 1 ] ; then
- # Package upgrade, not uninstall
/bin/systemctl try-restart %{name}-scheduler.service >/dev/null 2>&1 || :
fi
%endif
@@ -402,7 +448,6 @@ fi
%if %{with_systemd}
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
if [ $1 -ge 1 ] ; then
- # Package upgrade, not uninstall
/bin/systemctl try-restart %{name}-receiver.service >/dev/null 2>&1 || :
fi
%endif
@@ -464,13 +509,15 @@ fi
%files
%{python_sitelib}/%{name}
%if %{with_systemd}
-%{python_sitelib}/Shinken-1.0.1-py2.7.egg-info
+%{python_sitelib}/Shinken-1.2.2-py2.7.egg-info
%else
-%{python_sitelib}/Shinken-1.0.1-py2.6.egg-info
+%{python_sitelib}/Shinken-1.2.2-py2.6.egg-info
%endif
%{_sbindir}/%{name}-receiver*
%{_sbindir}/%{name}-discovery
%{_sbindir}/%{name}-admin
+%{_sbindir}/%{name}-hostd
+%{_sbindir}/%{name}-packs
%doc etc/packs COPYING THANKS
%{_mandir}/man3/%{name}-*
%{_usr}/lib/%{name}/plugins
@@ -482,20 +529,26 @@ fi
%attr(-,%{shinken_user} ,%{shinken_group}) %dir %{_localstatedir}/run/%{name}
%changelog
+* Sat Dec 15 2012 David Hannequin <david.hannequin at gmail.com> - 1.2.2-1
+- update from upstream,
+- delete eue module,
+- Fix web site url,
+- Fix Bug 874092 (thanks Sébastien Andreatta).
+
* Fri Dec 14 2012 David Hannequin <david.hannequin at gmail.com> - 1.0.1-7
-- Fix uninstall receiver bug .
+- Fix uninstall receiver.
* Wed Nov 5 2012 David Hannequin <david.hannequin at gmail.com> - 1.0.1-6
- Fix bug 874089.
* Sun Sep 16 2012 David Hannequin <david.hannequin at gmail.com> - 1.0.1-5
-- Add support of el6.
-- Remove shebang from Python libraries.
-- Delete echo printing.
+- Add support of el6,
+- Remove shebang from Python libraries,
+- Delete echo printing,
- Remove CFLAGS.
* Mon Sep 10 2012 David Hannequin <david.hannequin at gmail.com> - 1.0.1-4
-- Add COPYING README THANKS file.
+- Add COPYING README THANKS file,
- delete defattr.
* Sun Sep 09 2012 David Hannequin <david.hannequin at gmail.com> - 1.0.1-3
More information about the scm-commits
mailing list