rpms/nagios/F-13 import.log,1.2,1.3 nagios.spec,1.78,1.79

[Peter Lemenkov]

Author: peter

Update of /cvs/pkgs/rpms/nagios/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv11978/F-13

Modified Files:
	import.log nagios.spec 
Log Message:
Splitted off gid/uid creation part and common libraries


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/nagios/F-13/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log	13 Mar 2010 06:47:23 -0000	1.2
+++ import.log	25 Apr 2010 08:50:26 -0000	1.3
@@ -1,2 +1,3 @@
 nagios-3_2_0-4_fc12:F-13:nagios-3.2.0-4.fc12.src.rpm:1267099005
 nagios-3_2_1-1_fc12:F-13:nagios-3.2.1-1.fc12.src.rpm:1268462815
+nagios-3_2_1-2_fc12:F-13:nagios-3.2.1-2.fc12.src.rpm:1272185361


Index: nagios.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nagios/F-13/nagios.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- nagios.spec	13 Mar 2010 06:47:23 -0000	1.78
+++ nagios.spec	25 Apr 2010 08:50:26 -0000	1.79
@@ -1,6 +1,6 @@
 Name: nagios
 Version: 3.2.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Host/service/network monitoring program
 
 Group: Applications/System
@@ -28,11 +28,16 @@ BuildRequires: perl(Test::Simple)
 
 Requires: httpd
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-Requires(pre): shadow-utils
 Requires(preun): initscripts, chkconfig
-Requires(post): initscripts, chkconfig, shadow-utils
+Requires(post): initscripts, chkconfig
 Requires(postun): initscripts
 
+Requires: nagios-common
+Requires: user(nagios)
+Requires(pre): user(nagios)
+Requires: group(nagios)
+Requires(pre): group(nagios)
+
 Summary: Nagios monitors hosts and services and yells if somethings breaks
 Summary(de): Nagios überwacht Dienste und Rechner und meldet Ihnen Ausfälle
 
@@ -63,6 +68,18 @@ Nagios überprüft die Rechner und Diens
 braucht dafür externe Programme. Viele dieser Programme finden
 Sie im Paket nagios-plugins.
 
+%package common
+Group: Applications/System
+Summary: Provides common directories, uid and gid among nagios-related packages
+Requires(pre): shadow-utils
+Requires(post): shadow-utils
+Provides: user(nagios)
+Provides: group(nagios)
+Obsoletes: %{name} < 3.2.1-2
+
+%description common
+Provides common directories, uid and gid among nagios-related packages.
+
 %package devel
 Group: Applications/System
 Summary: Provides include files that Nagios-related applications may compile against
@@ -106,7 +123,7 @@ may compile against.
 	--enable-embedded-perl \
 	--with-perlcache \
 	--with-template-objects \
-	--with-template-extinfo	
+	--with-template-extinfo
 make %{?_smp_mflags} all
 
 %{__sed} -e "s| package Embed::Persistent;|#\!%{_bindir}/perl\npackage Embed::Persistent;|" < p1.pl > p1.pl.fedora
@@ -155,8 +172,11 @@ make DESTDIR=%{buildroot} INSTALL_OPTS="
 %clean
 rm -rf %{buildroot} > /dev/null 2>&1
 
-%pre
-%{_sbindir}/useradd -d %{_localstatedir}/spool/%{name} -r -s /sbin/nologin nagios 2> /dev/null || :
+%pre common
+getent group nagios >/dev/null || groupadd -r nagios
+getent passwd nagios >/dev/null || useradd -r -g nagios -d %{_localstatedir}/spool/%{name} -s /sbin/nologin nagios
+exit 0
+
 
 %preun
 if [ $1 = 0 ]; then
@@ -167,6 +187,8 @@ fi
 %post
 /sbin/chkconfig --add %{name} || :
 /sbin/service httpd condrestart > /dev/null 2>&1 || :
+
+%post common
 %{_sbindir}/usermod -a -G %{name} apache || :
 
 %postun
@@ -175,8 +197,6 @@ fi
 %files
 %defattr(-,root,root,-)
 %dir %{_sysconfdir}/%{name}
-%dir %{_libdir}/%{name}
-%dir %{_libdir}/%{name}/plugins
 %dir %{_libdir}/%{name}/plugins/eventhandlers
 %dir %{_libdir}/%{name}/cgi-bin
 %dir %{_datadir}/%{name}
@@ -198,18 +218,25 @@ fi
 %attr(0640,root,nagios) %config(noreplace) %{_sysconfdir}/%{name}/conf.d/internet.cfg
 %attr(0640,root,apache) %config(noreplace) %{_sysconfdir}/%{name}/.htpasswd
 %attr(0640,root,apache) %config(noreplace) %{_datadir}/%{name}/html/config.inc.php
-%attr(0755,nagios,nagios) %dir %{_localstatedir}/spool/%{name}
 %attr(2775,nagios,nagios) %dir %{_localstatedir}/spool/%{name}/cmd
 %attr(0755,nagios,nagios) %dir %{_localstatedir}/log/%{name}
 %attr(0755,nagios,nagios) %dir %{_localstatedir}/log/%{name}/archives
 %attr(0755,nagios,nagios) %dir %{_localstatedir}/log/%{name}/spool/
 %attr(0755,nagios,nagios) %dir %{_localstatedir}/log/%{name}/spool/checkresults
 
+%files common
+%defattr(-,root,root,-)
+%dir %{_libdir}/%{name}
+%attr(0755,nagios,nagios) %dir %{_localstatedir}/spool/%{name}
+
 %files devel
 %defattr(-,root,root)
 %{_includedir}/%{name}
 
 %changelog
+* Sun Apr 25 2010  Peter Lemenkov <lemenkov at gmail.com> - 3.2.1-2
+- Created 'common' subpackage for gid/uid and common directory
+
 * Sat Mar 13 2010 Peter Lemenkov <lemenkov at gmail.com> - 3.2.1-1
 - Upgrade to 3.2.1 (#572587).
 - Fixed SELinux patch (#573119).
@@ -266,7 +293,7 @@ fi
 
 * Mon Oct 20 2008 Robert M. Albrecht <romal at gmx.de> 3.0.4-1
 - Upstream released 3.0.4
-- Fixed two typos in nagios.spec 
+- Fixed two typos in nagios.spec
 
 * Sun Sep 28 2008 Mike McGrath <mmcgrath at redhat.com> 3.0.3-9
 - License fix