hvad pushed to shinken (f20). "use init/systemd file from upstream"
notifications at fedoraproject.org
notifications at fedoraproject.org
Tue Jun 2 15:58:56 UTC 2015
From 7eb0142dcbbd37a2b08200f44bbaad8c50d4cb47 Mon Sep 17 00:00:00 2001
From: hvad <david.hannequin at gmail.com>
Date: Thu, 28 May 2015 22:25:27 +0200
Subject: use init/systemd file from upstream
diff --git a/shinken.spec b/shinken.spec
index baa4364..1de8a23 100644
--- a/shinken.spec
+++ b/shinken.spec
@@ -5,23 +5,11 @@
Summary: Python Monitoring tool
Name: shinken
Version: 2.2
-Release: 4%{?dist}
+Release: 5%{?dist}
URL: http://www.%{name}-monitoring.org
Source0: https://github.com/naparuba/%{name}/archive/%{version}.tar.gz
-Source1: %{name}-arbiter.service
-Source2: %{name}-broker.service
-Source3: %{name}-reactionner.service
-Source4: %{name}-scheduler.service
-Source5: %{name}-receiver.service
-Source6: %{name}-poller.service
-Source7: %{name}-arbiter.init
-Source8: %{name}-broker.init
-Source9: %{name}-reactionner.init
-Source10: %{name}-scheduler.init
-Source11: %{name}-receiver.init
-Source12: %{name}-poller.init
-Source13: %{name}.8shinken
-Source14: path.cfg
+Source1: %{name}.8shinken
+Source2: path.cfg
License: AGPLv3+
Requires: python-simplejson
Requires: python-pycurl
@@ -149,25 +137,25 @@ install -p -m0644 for_fedora/etc/objects/contacts/nagiosadmin.cfg %{buildroot}%{
install -p -m0644 for_fedora/etc/objects/hosts/localhost.cfg %{buildroot}%{_sysconfdir}/%{name}/hosts/localhost.cfg
install -p -m0644 for_fedora/etc/objects/services/linux_disks.cfg %{buildroot}%{_sysconfdir}/%{name}/services/linux_disks.cfg
install -p -m0644 for_fedora/etc/contactgroups.cfg %{buildroot}%{_sysconfdir}/%{name}/contactgroups/contactgroups.cfg
-install -p -m0644 %{SOURCE14} %{buildroot}%{_sysconfdir}/%{name}/resource.d/path.cfg
+install -p -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/%{name}/resource.d/path.cfg
%if %{with_systemd}
install -d -m0755 %{buildroot}%{_unitdir}
- install -p -m0644 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}-arbiter.service
- install -p -m0644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}-broker.service
- install -p -m0644 %{SOURCE3} %{buildroot}%{_unitdir}/%{name}-reactionner.service
- install -p -m0644 %{SOURCE4} %{buildroot}%{_unitdir}/%{name}-scheduler.service
- install -p -m0644 %{SOURCE5} %{buildroot}%{_unitdir}/%{name}-receiver.service
- install -p -m0644 %{SOURCE6} %{buildroot}%{_unitdir}/%{name}-poller.service
+ install -p -m0644 for_fedora/systemd/%{name}-arbiter.service %{buildroot}%{_unitdir}/%{name}-arbiter.service
+ install -p -m0644 for_fedora/systemd/%{name}-broker.service %{buildroot}%{_unitdir}/%{name}-broker.service
+ install -p -m0644 for_fedora/systemd/%{name}-reactionner.service %{buildroot}%{_unitdir}/%{name}-reactionner.service
+ install -p -m0644 for_fedora/systemd/%{name}-scheduler.service %{buildroot}%{_unitdir}/%{name}-scheduler.service
+ install -p -m0644 for_fedora/systemd/%{name}-receiver.service %{buildroot}%{_unitdir}/%{name}-receiver.service
+ install -p -m0644 for_fedora/systemd/%{name}-poller.service %{buildroot}%{_unitdir}/%{name}-poller.service
%else
install -d -m0755 %{buildroot}%{_initrddir}
- install -p -m0644 %{SOURCE7} %{buildroot}%{_initrddir}/%{name}-arbiter
- install -p -m0644 %{SOURCE8} %{buildroot}%{_initrddir}/%{name}-broker
- install -p -m0644 %{SOURCE9} %{buildroot}%{_initrddir}/%{name}-reactionner
- install -p -m0644 %{SOURCE10} %{buildroot}%{_initrddir}/%{name}-scheduler
- install -p -m0644 %{SOURCE11} %{buildroot}%{_initrddir}/%{name}-receiver
- install -p -m0644 %{SOURCE12} %{buildroot}%{_initrddir}/%{name}-poller
+ install -p -m0644 for_fedora/init.d/%{name}-arbiter %{name}-arbiter %{buildroot}%{_initrddir}/%{name}-arbiter
+ install -p -m0644 for_fedora/init.d/%{name}-broker %{buildroot}%{_initrddir}/%{name}-broker
+ install -p -m0644 for_fedora/init.d/%{name}-reactionner %{buildroot}%{_initrddir}/%{name}-reactionner
+ install -p -m0644 for_fedora/init.d/%{name}-scheduler %{buildroot}%{_initrddir}/%{name}-scheduler
+ install -p -m0644 for_fedora/init.d/%{name}-receiver %{buildroot}%{_initrddir}/%{name}-receiver
+ install -p -m0644 for_fedora/init.d/%{name}-poller %{buildroot}%{_initrddir}/%{name}-poller
%endif
install -d -m0755 %{buildroot}%{_sysconfdir}/logrotate.d
@@ -185,7 +173,7 @@ install -d -m0755 %{buildroot}%{_localstatedir}/run/%{name}
install -d -m0755 %{buildroot}%{_mandir}/man8
install -p -m0644 for_fedora/man/* %{buildroot}%{_mandir}/man8
-install -p -m0644 %{SOURCE13} %{buildroot}%{_mandir}/man8
+install -p -m0644 %{SOURCE1} %{buildroot}%{_mandir}/man8
sed -i 's|#!/usr/bin/env python||g' %{buildroot}%{_localstatedir}/lib/%{name}/cli/desc/cli.py
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/shinken.git/commit/?h=f20&id=7eb0142dcbbd37a2b08200f44bbaad8c50d4cb47
More information about the scm-commits
mailing list