X-Git-Url: https://arthur.barton.de/gitweb/?p=netdata.git;a=blobdiff_plain;f=netdata.spec.in;h=685d6e0e790292c829b5f76fe968abac0f97fe53;hp=85e05ba7eff3d0b13dc3f2b19e7257842049b91a;hb=a3ae351f1e4576e5a32166ddbc28c8699ce31991;hpb=8e2d4ffa132c464480ad20bf15cc3dff27548889

diff --git a/netdata.spec.in b/netdata.spec.in
index 85e05ba7..685d6e0e 100644
--- a/netdata.spec.in
+++ b/netdata.spec.in
@@ -1,15 +1,4 @@
 %global contentdir %{_datadir}/netdata
-%if 0%{?suse_version}
-%global distro_post %service_add_post netdata.service
-%global distro_preun %service_del_preun netdata.service
-%global distro_postun %service_del_postun netdata.service
-%global distro_buildrequires BuildRequires:\ systemd-rpm-macros
-%else
-%global distro_post %systemd_post netdata.service
-%global distro_preun %systemd_preun netdata.service
-%global distro_postun %systemd_postun_with_restart netdata.service
-%global distro_buildrequires %{nil}
-%endif
 
 # This is temporary and should eventually be resolved. This bypasses
 # the default rhel __os_install_post which throws a python compile
@@ -26,7 +15,50 @@
 %undefine	with_systemd
 %endif
 
-%if 0%{?fedora}
+%if %{with systemd}
+%if 0%{?suse_version}
+%global netdata_initd_buildrequires \
+BuildRequires: systemd-rpm-macros \
+%{nil}
+%global netdata_initd_requires \
+%{?systemd_requires} \
+%{nil}
+%global netdata_init_post %service_add_post netdata.service
+%global netdata_init_preun %service_del_preun netdata.service
+%global netdata_init_postun %service_del_postun netdata.service
+%else
+%global netdata_initd_buildrequires %{nil}
+%global netdata_initd_requires \
+Requires(preun):  systemd-units \
+Requires(postun): systemd-units \
+Requires(post):   systemd-units \
+%{nil}
+%global netdata_init_post %systemd_post netdata.service
+%global netdata_init_preun %systemd_preun netdata.service
+%global netdata_init_postun %systemd_postun_with_restart netdata.service
+%endif
+%else
+%global netdata_initd_buildrequires %{nil}
+%global netdata_initd_requires \
+Requires(post):   chkconfig \
+%{nil}
+%global netdata_init_post \
+/sbin/chkconfig --add netdata \
+%{nil}
+%global netdata_init_preun %{nil} \
+if [ $1 = 0 ]; then \
+        /sbin/service netdata stop > /dev/null 2>&1 \
+        /sbin/chkconfig --del netdata \
+fi \
+%{nil}
+%global netdata_init_postun %{nil} \
+if [ $1 != 0 ]; then \
+        /sbin/service netdata condrestart 2>&1 > /dev/null \
+fi \
+%{nil}
+%endif
+
+%if 0%{?_fedora}
 %global netdata_recommends \
 Recommends:	curl \
 Recommends:	iproute-tc \
@@ -46,19 +78,16 @@ Summary:	Real-time performance monitoring, done right
 Name:		@PACKAGE_NAME@
 Version:	@PACKAGE_RPM_VERSION@
 Release:	1%{?dist}
-License:	GPL v3+
+License:	GPLv3+
 Group:		Applications/System
-Source0:	http://firehol.org/download/netdata/releases/v@PACKAGE_VERSION@/%{name}-@PACKAGE_VERSION@.tar.xz
-URL:		http://my-netdata.io/
-%distro_buildrequires
+Source0:	https://firehol.org/download/netdata/releases/v@PACKAGE_VERSION@/%{name}-@PACKAGE_VERSION@.tar.xz
+URL:		http://my-netdata.io
 BuildRequires:	pkgconfig
 BuildRequires:	xz
 BuildRequires:	zlib-devel
 BuildRequires:	libuuid-devel
 Requires:	zlib
 Requires:	libuuid
-Requires(post): libcap
-%{netdata_recommends}
 
 # Packages can be found in the EPEL repo
 %if %{with nfacct}
@@ -70,18 +99,11 @@ Requires: libnetfilter_acct
 
 Requires(pre): /usr/sbin/groupadd
 Requires(pre): /usr/sbin/useradd
+Requires(post): libcap
 
-%if %{with systemd}
-%if 0%{?suse_version}
-%{?systemd_requires}
-%else
-Requires(preun):  systemd-units
-Requires(postun): systemd-units
-Requires(post):   systemd-units
-%endif
-%else
-Requires(post):   chkconfig
-%endif
+%{netdata_initd_buildrequires}
+%{netdata_recommends}
+%{netdata_initd_requires}
 
 %description
 netdata is the fastest way to visualize metrics. It is a resource
@@ -124,56 +146,21 @@ install -m 755 system/netdata-init-d \
         "${RPM_BUILD_ROOT}/etc/rc.d/init.d/netdata"
 %endif
 
-%if %{with systemd}
-%pre
-# Add the "netdata" user
-/usr/sbin/groupadd -r netdata 2> /dev/null || :
-/usr/sbin/useradd -c "netdata" -g netdata \
-        -s /sbin/nologin -r -d %{contentdir} netdata 2> /dev/null || :
-
-%post
-%distro_post
-
-%preun
-%distro_preun
-
-%postun
-%distro_postun
-%else
 %pre
-# Add the "netdata" user
 getent group netdata >/dev/null || groupadd -r netdata
 getent group docker >/dev/null || groupadd -r docker
 getent passwd netdata >/dev/null || \
   useradd -r -g netdata -G docker -s /sbin/nologin \
     -d %{contentdir} -c "netdata" netdata
-exit 0
 
 %post
-# Register the netdata service
-/sbin/chkconfig --add netdata
-# Only gets run on initial install (not upgrades or uninstalls)
-if [ $1 = 1 ]; then
-        # Start the netdata service
-        /sbin/service netdata start
-fi
-exit 0
+%{netdata_init_post}
 
 %preun
-# Only gets run on uninstall (not upgrades)
-if [ $1 = 0 ]; then
-        /sbin/service netdata stop > /dev/null 2>&1
-        /sbin/chkconfig --del netdata
-fi
-exit 0
+%{netdata_init_preun}
 
 %postun
-# Only gets run on upgrade (not uninstalls)
-if [ $1 != 0 ]; then
-        /sbin/service netdata condrestart 2>&1 > /dev/null
-fi
-exit 0
-%endif
+%{netdata_init_postun}
 
 %clean
 rm -rf "${RPM_BUILD_ROOT}"
@@ -218,6 +205,17 @@ rm -rf "${RPM_BUILD_ROOT}"
 %{_datadir}/%{name}/web
 
 %changelog
+* Mon Mar 20 2017 Costa Tsaousis <costa@tsaousis.gr> - 1.6.0-1
+- central netdata
+- monitoring ephemeral nodes
+- monitoring ephemeral containers and VM guests
+- apps.plugin ported for FreeBSD
+- web_log plugin
+- JSON backends
+- IPMI monitoring
+- several new and improved plugins
+- several new and improved alarms and notifications
+- dozens more improvements and bug fixes
 * Sun Jan 22 2017 Costa Tsaousis <costa@tsaousis.gr> - 1.5.0-1
 - FreeBSD, MacOS, FreeNAS
 - Backends support