[icinga-checkins] icinga.org: icinga-core/r1.3: rpmlint cleanup

git at icinga.org git at icinga.org
Tue Apr 19 21:34:34 CEST 2011


Module: icinga-core
Branch: r1.3
Commit: c04dc51a96a3dbc464d25d31092a9d09f1c58153
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=c04dc51a96a3dbc464d25d31092a9d09f1c58153

Author: Christoph Maser <cmr at financial.com>
Date:   Tue Apr 19 21:33:43 2011 +0200

rpmlint cleanup

---

 icinga.spec |   26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/icinga.spec b/icinga.spec
index 3cbf3f0..d7f9a8a 100644
--- a/icinga.spec
+++ b/icinga.spec
@@ -79,7 +79,7 @@ Documentation for %{name}
 
 
 %prep
-%setup -n %{name}-%{version}
+%setup -qn %{name}-%{version}
 
 # /usr/local/nagios is hardcoded in many places
 %{__perl} -pi.orig -e 's|/usr/local/nagios/var/rw|%{_localstatedir}/nagios/rw|g;' contrib/eventhandlers/submit_check_result
@@ -95,7 +95,7 @@ Documentation for %{name}
     --sysconfdir="%{_sysconfdir}/icinga" \
     --with-cgiurl="/icinga/cgi-bin" \
     --with-command-user="icinga" \
-    --with-command-group="icingacmd" \
+    --with-command-group="icinga-cmd" \
     --with-gd-lib="%{_libdir}" \
     --with-gd-inc="%{_includedir}" \
     --with-htmurl="/icinga" \
@@ -144,14 +144,14 @@ Documentation for %{name}
 mv %{buildroot}%{_sysconfdir}/icinga/ido2db.cfg-sample %{buildroot}%{_sysconfdir}/icinga/ido2db.cfg
 mv %{buildroot}%{_sysconfdir}/icinga/idomod.cfg-sample %{buildroot}%{_sysconfdir}/icinga/idomod.cfg
 
-### copy idutils db-script
+### copy idoutils db-script
 cp -r module/idoutils/db %{buildroot}%{_sysconfdir}/icinga/idoutils
 
 %pre
 # Add icinga user
 /usr/sbin/groupadd icinga 2> /dev/null || :
-/usr/sbin/groupadd icingacmd 2> /dev/null || :
-/usr/sbin/useradd -c "icinga" -s /sbin/nologin -r -d /var/icinga -G icingacmd -g icinga icinga 2> /dev/null || :
+/usr/sbin/groupadd icinga-cmd 2> /dev/null || :
+/usr/sbin/useradd -c "icinga" -s /sbin/nologin -r -d /var/icinga -G icinga-cmd -g icinga icinga 2> /dev/null || :
 
 
 %post
@@ -164,8 +164,8 @@ if [ $1 -eq 0 ]; then
 fi
 
 %pre gui
-# Add apacheuser in the icingacmd group
-  /usr/sbin/usermod -a -G icingacmd %{apacheuser}
+# Add apacheuser in the icinga-cmd group
+  /usr/sbin/usermod -a -G icinga-cmd %{apacheuser}
 
 %post idoutils
 /sbin/chkconfig --add ido2db
@@ -202,7 +202,7 @@ fi
 %{logdir}
 %dir %{_localstatedir}/icinga
 %dir %{_localstatedir}/icinga/checkresults
-%attr(2755,icinga,icingacmd) %{_localstatedir}/icinga/rw/
+%attr(2755,icinga,icinga-cmd) %{_localstatedir}/icinga/rw/
 
 %files doc
 %defattr(-,icinga,icinga,-)
@@ -293,17 +293,17 @@ fi
 
 * Mon Oct 26 2009 Christoph Maser <cmr at financial.com> - 1.0-0.RC1.1
 - Update to 1.0-RC1
-- Correct checkconfig --del in idoutils %preun
+- Correct checkconfig --del in idoutils #preun
 
 * Mon Oct 26 2009 Christoph Maser <cmr at financial.com> - 0.8.4-3
-- Use icingacmd group and add apache user to that group instead
+- Use icinga-cmd group and add apache user to that group instead
   of using apachegroup as icinga command group.
 
 * Wed Oct 07 2009 Christoph Maser <cmr at financial.com> - 0.8.4-2
 - make packages openSUSE compatible
-- add %apachecondir, %apacheuser, %apachegroup depending on vendor
-- configure add --with-httpd-conf=%{apacheconfdir} 
-- configure add --with-init-dir=%{_initrddir}
+- add #apachecondir, #apacheuser, #apachegroup depending on vendor
+- configure add --with-httpd-conf=#{apacheconfdir} 
+- configure add --with-init-dir=#{_initrddir}
 
 * Wed Sep 16 2009 Christoph Maser <cmr at financial.com> - 0.8.4-1
 - Update to version 0.8.4.





More information about the icinga-checkins mailing list