Merge pull request #774 from paulfantom/master

[netdata.git] / netdata.spec.in

diff --git a/netdata.spec.in b/netdata.spec.in
index d48bea2a3c6a9d46d877ee1688768606438691c5..68a69ad7d425607bf0a943bb0856c11685623682 100644 (file)
--- a/netdata.spec.in
+++ b/netdata.spec.in
@@ -18,7 +18,7 @@
 Summary:       Real-time performance monitoring, done right
 Name:          @PACKAGE_NAME@
 Version:       @PACKAGE_RPM_VERSION@
-Release:       @PACKAGE_RPM_RELEASE@%{?release_suffix}%{?dist}
+Release:       1%{?dist}
 License:       GPL v3+
 Group:         Applications/System
 Source0:       http://firehol.org/download/netdata/releases/v@PACKAGE_VERSION@/%{name}-@PACKAGE_VERSION@.tar.xz
@@ -115,14 +115,27 @@ exit 0
 %post
 # Register the netdata service
 /sbin/chkconfig --add netdata
-# Start the netdata service
-/sbin/service netdata start
+# 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
 
 %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
+
+%postun
+# Only gets run on upgrade (not uninstalls)
+if [ $1 != 0 ]; then
+        /sbin/service netdata condrestart 2>&1 > /dev/null
+fi
+exit 0
 %endif
 
 %clean
@@ -142,10 +155,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0700,netdata,netdata) %dir %{_localstatedir}/cache/%{name}
 %attr(0700,netdata,netdata) %dir %{_localstatedir}/log/%{name}
 %attr(0700,netdata,netdata) %dir %{_localstatedir}/lib/%{name}
-%attr(0700,netdata,netdata) %dir %{_localstatedir}/lib/%{name}/registry
 
 %dir %{_datadir}/%{name}
-%attr(0644,root,netdata,0755) %{_datadir}/%{name}/web
 
 %if %{with systemd}
 %{_unitdir}/netdata.service
@@ -153,6 +164,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/rc.d/init.d/netdata
 %endif
 
+# Enforce 0644 for files and 0755 for directories
+# for the netdata web directory
+%defattr(0644,root,netdata,0755)
+%{_datadir}/%{name}/web
+
 %changelog
 * Tue Jul 26 2016 Jason Barnett <J@sonBarnett.com> - 1.2.0-2
 - Added support for EL6