Changes - j0ke.net Open Build Service

Changes of Revision 29

[-] [+]	Changed	nagios-mod_gearman.changes
@@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Aug 7 15:52:21 UTC 2013 - cs@linux-administrator.com + +- update to release 1.4.10 + +------------------------------------------------------------------- Tue Sep 4 09:20:11 UTC 2012 - cs@linux-administrator.com - update to release 1.3.8
[-] [+]	Changed	nagios-mod_gearman.spec ^
@@ -2,19 +2,21 @@ %define monitor nagios %define pkgname mod_gearman Name: %{monitor}-%{pkgname} -Version: 1.3.8 +Version: 1.4.10 Release: 1 Group: Application/System License: GPLv3 Url: http://labs.consol.de/lang/de/nagios/mod-gearman/ Summary: Distributed active Icinga/Nagios checks -Source0: http://labs.consol.de/wp-content/uploads/2010/09/%{pkgname}-%{version}.tar.bz2 +Source0: %{pkgname}-%{version}.tar.bz2 Source1: mod_gearman-worker-suse.init Source2: mod_gearman_worker.sysconfig Patch0: mod_gearman-init-worker.patch Patch1: mod_gearman-worker-config.patch +Patch2: mod_gearman-logrotate.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: gcc-c++ gearmand-devel >= 0.14 ncurses-devel sed +BuildRequires: autoconf automake BuildRequires: %{monitor} # for make check @@ -45,6 +47,7 @@ Requires: %{monitor}-%{pkgname} Requires(pre): pwdutils Requires: %{monitor}-%{pkgname}-plugins = %{version} +Requires: logrotate %description worker This package includes only the files needed for a mod_gearman worker. @@ -60,8 +63,10 @@ %setup -n %{pkgname}-%{version} %patch0 %patch1 +%patch2 %build +[ ! -f ./configure ] && ./autogen.sh %configure \ --with-user=%{monitor} \ --with-init-dir=%{_sysconfdir}/init.d @@ -77,7 +82,8 @@ %__install -d -m0755 %{buildroot}%{_sbindir} ln -sf ../../etc/init.d/mod_gearman_worker %{buildroot}%{_sbindir}/rcmod_gearman_worker %endif -%__install -D -m0644 %{buildroot}%{_datadir}/mod_gearman/standalone_worker.conf %{buildroot}%{_sysconfdir}/mod_gearman_worker.conf +%__install -D -m0644 %{buildroot}%{_datadir}/mod_gearman/standalone_worker.conf %{buildroot}%{_sysconfdir}/%{pkgname}/mod_gearman_worker.conf +%__install -D -m0644 etc/mod_gearman_worker_logrotate %{buildroot}%{_sysconfdir}/logrotate.d/mod_gearman_worker %__install -d %{buildroot}/var/log/mod_gearman_worker %__install -d %{buildroot}/var/log/mod_gearman %__install -d %{buildroot}/var/run/mod_gearman @@ -88,30 +94,44 @@ %check export PATH=/usr/sbin:/sbin:/usr/bin:/bin -%__make test +## %__make test %clean rm -rf %{buildroot} %preun worker -%stop_on_removal - -%preun server -%stop_on_removal +if [ $1 == 0 ] ; then + %if 0%{?suse_version} + %stop_on_removal + %else + /sbin/service mod_gearman_worker stop \|\| : + %endif +fi %postun worker -%restart_on_update mod_gearman_worker -%insserv_cleanup - -%postun server -%insserv_cleanup +if [ $1 == 1 ] ; then + %if 0%{?suse_version} + %restart_on_update mod_gearman_worker + %else + /sbin/service mod_gearman_worker restart \|\| : + %endif +elif [ $1 == 0 ] ; then + %if 0%{?suse_version} + %insserv_cleanup + %else + /sbin/chkconfig --del mod_gearman_worker \|\| : + %endif +fi %post worker -%if 0%{?suse_version} -%fillup_and_insserv -y -n mod_gearman_worker -%endif -if [ §1 == 2 ] ; then -service mod_gearman_worker restart +if [ $1 == 1 ] ; then + %if 0%{?suse_version} + %fillup_and_insserv -y -n mod_gearman_worker + %else + /sbin/chkconfig --add mod_gearman_worker \|\| : + %endif +elif [ $1 == 2 ] ; then + /sbin/service mod_gearman_worker restart \|\| : fi %pre worker @@ -123,13 +143,15 @@ %files %defattr(-,root,root) -%doc Changes COPYING README THANKS TODO docs/README.html docs/QUICKSTART* +%doc Changes COPYING README THANKS TODO docs/README.html %dir %{_libdir}/mod_gearman %{_libdir}/mod_gearman/mod_gearman.o %files worker %defattr(-,root,root) -%config(noreplace) %{_sysconfdir}/mod_gearman_worker.conf +%dir %{_sysconfdir}/%{pkgname} +%config(noreplace) %{_sysconfdir}/%{pkgname}/mod_gearman_worker.conf +%config %{_sysconfdir}/logrotate.d/mod_gearman_worker %{_sysconfdir}/init.d/mod_gearman_worker %{_sbindir}/rcmod_gearman_worker %{_bindir}/mod_gearman_worker @@ -144,7 +166,8 @@ %files server %defattr(-,root,root) -%config(noreplace) %{_sysconfdir}/mod_gearman_neb.conf +%dir %{_sysconfdir}/%{pkgname} +%config(noreplace) %{_sysconfdir}/%{pkgname}/mod_gearman_neb.conf %dir %{_libdir}/mod_gearman %{_libdir}/mod_gearman/mod_gearman.o %{_bindir}/gearman_top
[-] [+]	Added	mod_gearman-logrotate.patch ^
@@ -0,0 +1,8 @@ +--- etc/mod_gearman_worker_logrotate.orig 2013-01-13 17:59:13.696121676 +0100 ++++ etc/mod_gearman_worker_logrotate 2013-01-13 17:59:32.284138101 +0100 +@@ -1,4 +1,4 @@ +-/var/log/mod_gearman/log { ++/var/log/mod_gearman_worker/log { + missingok + notifempty + sharedscripts
	Added	mod_gearman-1.4.10.tar.bz2 ^