Logoj0ke.net Open Build Service > Projects > server:monitoring > icinga-mod_gearman > Changes
Sign Up | Log In

Changes of Revision 3

[-] Changed icinga-mod_gearman.changes
x
 
1
@@ -1,4 +1,10 @@
2
 -------------------------------------------------------------------
3
+Sat Jan 29 14:42:54 UTC 2011 - cs@linux-administrator.com
4
+
5
+- update to release 0.9
6
+- split package in to library, server and worker
7
+
8
+-------------------------------------------------------------------
9
 Thu Jan 13 10:25:25 UTC 2011 - cs@linux-administrator.com
10
 
11
 - initial package build of version 0.8
12
[-] Changed icinga-mod_gearman.spec ^
124
 
1
@@ -2,16 +2,18 @@
2
 %define    monitor icinga
3
 %define pkgname    mod_gearman
4
 Name:      %{monitor}-%{pkgname}
5
-Version:   0.8
6
+Version:   0.9
7
 Release:   1
8
 Group:     Application/System
9
 License:   GPLv3
10
 Url:       http://labs.consol.de/lang/de/nagios/mod-gearman/
11
 Summary:   Distributed active Icinga/Nagios checks
12
 Source0:   http://labs.consol.de/wp-content/uploads/2010/09/%{pkgname}-%{version}.tar.bz2
13
+Source1:   mod_gearman-worker-suse.init
14
+Source2:   mod_gearman_worker.sysconfig
15
 Patch0:        mod_gearman-init-worker.patch
16
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
17
-BuildRequires: gcc-c++ gearmand-devel >= 0.14 ncurses-devel
18
+BuildRequires: gcc-c++ gearmand-devel >= 0.14 ncurses-devel sed
19
 BuildRequires: %{monitor}
20
 
21
 %description
22
@@ -22,6 +24,24 @@
23
 The counterpart is one or more worker clients for the checks itself.
24
 They can be bound to host and servicegroups.
25
 
26
+%package server
27
+Group:     Application/System
28
+Summary:   The server part of mod_gearman
29
+Requires:  %{monitor}-%{pkgname}
30
+Requires:  %{monitor}
31
+
32
+%description server
33
+
34
+
35
+%package worker
36
+Group:     Application/System
37
+Summary:   The worker part of mod_gearman
38
+Requires:       %{monitor}-%{pkgname}
39
+Requires(pre): pwdutils
40
+
41
+%description server
42
+
43
+
44
 %prep
45
 %setup -n %{pkgname}-%{version}
46
 %patch0
47
@@ -35,30 +55,68 @@
48
 
49
 %install
50
 %__make DESTDIR=%{buildroot} install
51
+%if 0%{?suse_version}
52
+%__install -D -m0755 %{S:1} %{buildroot}/etc/init.d/mod_gearman_worker
53
+%__install -D -m0644 %{S:2} %{buildroot}/var/adm/fillup-templates/sysconfig.mod_gearman_worker
54
+sed -i s@"%USERID%"@"%{monitor}"@ %{buildroot}/var/adm/fillup-templates/sysconfig.mod_gearman_worker
55
+%endif
56
+%__install -D -m0644 %{buildroot}%{_datadir}/mod_gearman/standalone_worker.conf %{buildroot}%{_sysconfdir}/mod_gearman_worker.conf
57
 
58
 %clean
59
 rm -rf %{buildroot}
60
 
61
-%preun
62
+%preun worker
63
 %stop_on_removal
64
 
65
-%postun
66
+%preun server
67
+%stop_on_removal
68
+
69
+%postun worker
70
+%insserv_cleanup
71
+
72
+%postun server
73
 %insserv_cleanup
74
 
75
+%post worker
76
+%if 0%{?suse_version}
77
+%fillup_and_insserv
78
+%endif
79
+
80
+%pre worker
81
+%if 0%{?suse_version}
82
+getent group %{monitor} >/dev/null || groupadd -r %{monitor}
83
+getent passwd %{monitor} >/dev/null || useradd -r -g %{monitor} -d %{_datadir}/mod_gearman -s /sbin/nologin -c "mod_gearman_worker" %{monitor}
84
+exit 0
85
+%endif
86
+
87
 %files
88
 %defattr(-,root,root)
89
 %doc Changes COPYING README README.html THANKS TODO
90
+%dir %{_libdir}/mod_gearman
91
+%{_libdir}/mod_gearman/mod_gearman.so
92
+
93
+%files worker
94
+%defattr(-,root,root)
95
+%config(noreplace) %{_sysconfdir}/mod_gearman_worker.conf
96
+%dir %{_libdir}/mod_gearman
97
+%{_libdir}/mod_gearman/mod_gearman.so
98
 %{_sysconfdir}/init.d/mod_gearman_worker
99
-%{_bindir}/check_gearman
100
-%{_bindir}/gearman_top
101
 %{_bindir}/mod_gearman_worker
102
-%{_bindir}/send_gearman
103
-%{_bindir}/send_multi
104
+%dir %{_datadir}/mod_gearman
105
+%{_datadir}/mod_gearman/standalone_worker.conf
106
+%if 0%{?suse_version}
107
+/var/adm/fillup-templates/sysconfig.mod_gearman_worker
108
+%endif
109
+
110
+%files server
111
+%defattr(-,root,root)
112
 %dir %{_libdir}/mod_gearman
113
 %{_libdir}/mod_gearman/mod_gearman.o
114
-%{_libdir}/mod_gearman/mod_gearman.so
115
+%{_bindir}/gearman_top
116
+%{_bindir}/check_gearman
117
+%{_bindir}/send_gearman
118
+%{_bindir}/send_multi
119
 %dir %{_datadir}/mod_gearman
120
 %{_datadir}/mod_gearman/shared.conf
121
-%{_datadir}/mod_gearman/standalone_worker.conf
122
 
123
 %changelog
124
Changed mod_gearman-0.9.tar.bz2 ^
[+] Added mod_gearman-worker-suse.init ^
[+] Added mod_gearman_worker.sysconfig ^