[zabbix/el6] Include sysconfig, obsolete docs, no extra output from usermod on update

[Volker Fröhlich]

commit e775fde72d3dfafc4dfa9ce16c2e72ca2275a952
Author: Volker Fröhlich <volker27 at gmx.at>
Date:   Sat Oct 20 23:46:06 2012 +0200

    Include sysconfig, obsolete docs, no extra output from usermod on update
    
    - Include sysconfig file in init script (BZ 851009)
    - No extra output from usermod (BZ 810870)
    - Remove defattr, no longer necessary since EL4
    - Obsolete docs subpackage
    - Really remove .orig files in frontend left from patching

 zabbix-agent.init  |    2 ++
 zabbix-proxy.init  |    2 ++
 zabbix-server.init |    2 ++
 zabbix.spec        |   33 ++++++++++++---------------------
 4 files changed, 18 insertions(+), 21 deletions(-)
---
diff --git a/zabbix-agent.init b/zabbix-agent.init
index 6901610..70d4ced 100644
--- a/zabbix-agent.init
+++ b/zabbix-agent.init
@@ -24,6 +24,8 @@
 exec=/usr/sbin/zabbix_agentd
 prog=${exec##*/}
 lockfile=/var/lock/subsys/zabbix-agent
+syscf=zabbix-agent
+[ -e /etc/sysconfig/$syscf ] && . /etc/sysconfig/$syscf
 
 start()
 {
diff --git a/zabbix-proxy.init b/zabbix-proxy.init
index cdb38c5..5fbf9d6 100644
--- a/zabbix-proxy.init
+++ b/zabbix-proxy.init
@@ -30,6 +30,8 @@ fi
 prog=${exec##*/}
 lockfile=/var/lock/subsys/zabbix-proxy
 conf=
+syscf=zabbix-proxy
+[ -e /etc/sysconfig/$syscf ] && . /etc/sysconfig/$syscf
 
 start()
 {
diff --git a/zabbix-server.init b/zabbix-server.init
index ef2b60d..a258dbe 100644
--- a/zabbix-server.init
+++ b/zabbix-server.init
@@ -29,6 +29,8 @@ else
 fi
 prog=${exec##*/}
 lockfile=/var/lock/subsys/zabbix
+syscf=zabbix-server
+[ -e /etc/sysconfig/$syscf ] && . /etc/sysconfig/$syscf
 
 start()
 {
diff --git a/zabbix.spec b/zabbix.spec
index 2b05b67..25c3c53 100644
--- a/zabbix.spec
+++ b/zabbix.spec
@@ -7,7 +7,7 @@
 
 Name:           zabbix
 Version:        1.8.15
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Open-source monitoring solution for your IT infrastructure
 
 Group:          Applications/Internet
@@ -49,6 +49,7 @@ BuildRequires:   libssh2-devel
 %endif
 
 Requires:        logrotate
+Obsoletes:       %{name}-docs < 1.8.15-2
 Requires(pre):   /usr/sbin/useradd
 
 %description
@@ -352,7 +353,8 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/%{name}
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/%{name}
 
-# install the frontend
+# Install the frontend after removing backup files from patching
+find frontends/php -name '*.orig' -exec rm {} \;
 cp -a frontends/php $RPM_BUILD_ROOT%{_datadir}/%{name}
 
 # prepare ghosted config file
@@ -449,7 +451,7 @@ getent group zabbix > /dev/null || groupadd -r zabbix
 if ! getent passwd zabbix > /dev/null; then
     useradd -r -g zabbix -d %{_localstatedir}/lib/%{name} -s /sbin/nologin \
     -c "Zabbix Monitoring System" zabbix
-else
+elif [ x"$(getent passwd zabbix | cut -d: -f6)" != x"%{_localstatedir}/lib/%{name}" ]; then
     # fix bad home dir introduced in 1.8.6-1
     usermod -d %{_localstatedir}/lib/%{name} zabbix > /dev/null
 fi
@@ -535,19 +537,13 @@ fi
 
 
 %files
-%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING CREDITS NEWS README
 %dir %{_sysconfdir}/zabbix
 %attr(0755,zabbix,zabbix) %dir %{_localstatedir}/log/zabbix
 %attr(0755,zabbix,zabbix) %dir %{_localstatedir}/run/zabbix
 %attr(0755,zabbix,zabbix) %dir %{_localstatedir}/lib/zabbix
 
-%files docs
-%defattr(-,root,root,-)
-%doc README
-
 %files server
-%defattr(-,root,root,-)
 %attr(0640,root,zabbix) %config(noreplace) %{_sysconfdir}/zabbix/zabbix_server.conf
 %attr(0755,zabbix,zabbix) %dir %{_sysconfdir}/zabbix/externalscripts
 %config(noreplace) %{_sysconfdir}/logrotate.d/zabbix-server
@@ -557,22 +553,18 @@ fi
 %{_mandir}/man8/zabbix_server.8*
 
 %files server-mysql
-%defattr(-,root,root,-)
 %{_docdir}/%{name}-server-mysql-%{version}/
 %{_sbindir}/zabbix_server_mysql
 
 %files server-pgsql
-%defattr(-,root,root,-)
 %{_docdir}/%{name}-server-pgsql-%{version}/
 %{_sbindir}/zabbix_server_pgsql
 
 %files server-sqlite3
-%defattr(-,root,root,-)
 %{_docdir}/%{name}-server-sqlite3-%{version}/
 %{_sbindir}/zabbix_server_sqlite3
 
 %files agent
-%defattr(-,root,root,-)
 %doc zabbix_snmptrap.README
 %config(noreplace) %{_sysconfdir}/zabbix/zabbix_agent.conf
 %config(noreplace) %{_sysconfdir}/zabbix/zabbix_agentd.conf
@@ -587,7 +579,6 @@ fi
 %{_mandir}/man8/zabbix_agentd.8*
 
 %files proxy
-%defattr(-,root,root,-)
 %attr(0640,root,zabbix) %config(noreplace) %{_sysconfdir}/zabbix/zabbix_proxy.conf
 %attr(0755,zabbix,zabbix) %dir %{_sysconfdir}/zabbix/externalscripts
 %config(noreplace) %{_sysconfdir}/logrotate.d/zabbix-proxy
@@ -597,38 +588,38 @@ fi
 %{_mandir}/man8/zabbix_proxy.8*
 
 %files proxy-mysql
-%defattr(-,root,root,-)
 %{_docdir}/%{name}-proxy-mysql-%{version}/
 %{_sbindir}/zabbix_proxy_mysql
 
 %files proxy-pgsql
-%defattr(-,root,root,-)
 %{_docdir}/%{name}-proxy-pgsql-%{version}/
 %{_sbindir}/zabbix_proxy_pgsql
 
 %files proxy-sqlite3
-%defattr(-,root,root,-)
 %{_docdir}/%{name}-proxy-sqlite3-%{version}/
 %{_sbindir}/zabbix_proxy_sqlite3
 
 %files web
-%defattr(-,root,root,-)
 %dir %attr(0750,apache,apache) %{_sysconfdir}/zabbix/web
 %ghost %attr(0644,apache,apache) %config(noreplace) %{_sysconfdir}/zabbix/web/zabbix.conf.php
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/zabbix.conf
 %{_datadir}/zabbix
 
 %files web-mysql
-%defattr(-,root,root,-)
 
 %files web-pgsql
-%defattr(-,root,root,-)
 
 %files web-sqlite3
-%defattr(-,root,root,-)
 
 
 %changelog
+* Sat Oct 20 2012 Volker Fröhlich <volker27 at gmx.at> - 1.8.15-2
+- Include sysconfig file in init script (BZ 851009)
+- No extra output from usermod (BZ 810870)
+- Remove defattr, no longer necessary since EL4
+- Obsolete docs subpackage
+- Really remove .orig files in frontend left from patching
+
 * Mon Aug 20 2012 Volker Fröhlich <volker27 at gmx.at> - 1.8.15-1
 - update to 1.8.15
 - Rework patches to not leave backup files in the frontend