Merge remote-tracking branch 'origin/pr/835'

[collectd.git] / contrib / redhat / collectd.spec

diff --git a/contrib/redhat/collectd.spec b/contrib/redhat/collectd.spec
index 99d21d4..acc38ac 100644 (file)
--- a/contrib/redhat/collectd.spec
+++ b/contrib/redhat/collectd.spec
@@ -213,7 +213,7 @@ Source:             http://collectd.org/files/%{name}-%{version}.tar.bz2
 License:       GPLv2
 Group:         System Environment/Daemons
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
-BuildRequires: libgcrypt-devel, kernel-headers
+BuildRequires: libgcrypt-devel, kernel-headers, libtool-ltdl-devel
 Vendor:                collectd development team <collectd@verplant.org>
 
 %if 0%{?el7:1}
@@ -222,15 +222,9 @@ Requires(post):            systemd
 Requires(preun):       systemd
 Requires(postun):      systemd
 %else
-       %if 0%{?el6:1}
-Requires(pre):         initscripts
-Requires(preun):       upstart
-Requires(postun):      upstart
-       %else
 Requires(post):                chkconfig
 Requires(preun):       chkconfig, initscripts
 Requires(postun):      initscripts
-       %endif
 %endif
 
 %description
@@ -1663,11 +1657,7 @@ rm -rf %{buildroot}
 %if 0%{?el7:1}
 %{__install} -Dp -m0644 contrib/systemd.collectd.service %{buildroot}%{_unitdir}/collectd.service
 %else
-       %if 0%{?el6:1}
-%{__install} -Dp -m0644 contrib/upstart.collectd.conf %{buildroot}%{_sysconfdir}/init/collectd.conf
-       %else
 %{__install} -Dp -m0755 contrib/redhat/init.d-collectd %{buildroot}%{_initrddir}/collectd
-       %endif
 %endif
 %{__install} -Dp -m0644 src/collectd.conf %{buildroot}%{_sysconfdir}/collectd.conf
 %{__install} -d %{buildroot}%{_sharedstatedir}/collectd/
@@ -1697,6 +1687,8 @@ find %{buildroot} -type f -name .packlist -delete
 find %{buildroot} -type f -name perllocal.pod -delete
 
 %if ! %{with_java}
+rm -f %{buildroot}%{_datadir}/collectd/java/collectd-api.jar
+rm -f %{buildroot}%{_datadir}/collectd/java/generic-jmx.jar
 rm -f %{buildroot}%{_mandir}/man5/collectd-java.5*
 %endif
 
@@ -1707,6 +1699,10 @@ rm -fr perl-examples/
 rm -fr %{buildroot}/usr/lib/perl5/
 %endif
 
+%if ! %{with_postgresql}
+rm -f %{buildroot}%{_datadir}/collectd/postgresql_default.conf
+%endif
+
 %if ! %{with_python}
 rm -f %{buildroot}%{_mandir}/man5/collectd-python.5*
 %endif
@@ -1720,8 +1716,8 @@ rm -f %{buildroot}%{_mandir}/man5/collectd-snmp.5*
 rm -rf %{buildroot}
 
 %pre
-%if 0%{?el7:1}%{?el6:1}
-# stop sysv-based instance before upgrading to upstart/systemd
+%if 0%{?el7:1}
+# stop sysv-based instance before upgrading to systemd
 if [ $1 -eq 2 ] && [ -f /var/lock/subsys/collectd ]; then
        SYSTEMCTL_SKIP_REDIRECT=1 %{_initddir}/collectd stop >/dev/null 2>&1 || :
 fi
@@ -1734,9 +1730,7 @@ if [ $1 -eq 2 ]; then
 fi
 %systemd_post collectd.service
 %else
-       %if 0%{!?el6:1}
 /sbin/chkconfig --add collectd || :
-       %endif
 %endif
 
 %preun
@@ -1745,12 +1739,8 @@ fi
 %else
 # stop collectd only when uninstalling
 if [ $1 -eq 0 ]; then
-       %if 0%{?el6:1}
-       /sbin/initctl stop collectd >/dev/null 2>&1 || :
-       %else
        /sbin/service collectd stop >/dev/null 2>&1 || :
        /sbin/chkconfig --del collectd || :
-       %endif
 fi
 %endif
 
@@ -1760,15 +1750,7 @@ fi
 %else
 # restart collectd only when upgrading
 if [ $1 -eq 1 ]; then
-       %if 0%{?el6:1}
-       if /sbin/initctl status collectd 2>/dev/null | grep -q 'running'; then
-               /sbin/initctl restart collectd >/dev/null 2>&1 || :
-       else
-               /sbin/initctl start collectd >/dev/null 2>&1 || :
-       fi
-       %else
        /sbin/service collectd condrestart >/dev/null 2>&1 || :
-       %endif
 fi
 %endif
 
@@ -1782,18 +1764,14 @@ fi
 %if 0%{?el7:1}
 %{_unitdir}/collectd.service
 %else
-       %if 0%{?el6:1}
-%{_sysconfdir}/init/collectd.conf
-       %else
 %{_initrddir}/collectd
-       %endif
 %endif
 %{_sbindir}/collectd
 %{_bindir}/collectd-nagios
 %{_bindir}/collectd-tg
 %{_bindir}/collectdctl
 %{_sbindir}/collectdmon
-%{_datadir}/collectd/
+%{_datadir}/collectd/types.db
 %{_sharedstatedir}/collectd
 %{_mandir}/man1/collectd-nagios.1*
 %{_mandir}/man1/collectd.1*
@@ -2095,8 +2073,8 @@ fi
 
 %if %{with_java}
 %files java
-%{_prefix}/share/collectd/java/collectd-api.jar
-%{_prefix}/share/collectd/java/generic-jmx.jar
+%{_datadir}/collectd/java/collectd-api.jar
+%{_datadir}/collectd/java/generic-jmx.jar
 %{_libdir}/%{name}/java.so
 %{_mandir}/man5/collectd-java.5*
 %endif
@@ -2188,7 +2166,7 @@ fi
 
 %if %{with_postgresql}
 %files postgresql
-%{_prefix}/share/collectd/postgresql_default.conf
+%{_datadir}/collectd/postgresql_default.conf
 %{_libdir}/%{name}/postgresql.so
 %endif
 
@@ -2277,6 +2255,7 @@ fi
 # - New plugins disabled by default: barometer, write_kafka
 # - Enable zfs_arc, now supported on Linux
 # - Install disk plugin in an dedicated package, as it depends on libudev
+# - use systemd on EL7, sysvinit on EL6 & EL5
 
 * Mon Aug 19 2013 Marc Fournier <marc.fournier@camptocamp.com> 5.4.0-1
 - New upstream version