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

Changes of Revision 2

[-] Changed check_mk.spec
​x
 
1
@@ -67,7 +67,7 @@
2
 BuildRequires:  unzip
3
 %endif
4
 # systemd
5
-%if 0%{?suse_version} >= 1210
6
+%if 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7
7
 BuildRequires: systemd
8
 %{?systemd_requires}
9
 %endif
10
@@ -454,7 +454,7 @@
11
 install -Dm 644 %{buildroot}/$agentsdir/xinetd_caching.conf %{buildroot}%{_sysconfdir}/xinetd.d/check_mk-caching
12
13
 # install systemd service and socket units for socket activation
14
-%if 0%{?suse_version} >= 1210
15
+%if 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7
16
 install -Dm 644 %{SOURCE9} %{buildroot}%{_unitdir}/%{name}-agent@.service
17
 sed -e 's/-agent$/-caching-agent/' < %{buildroot}%{_unitdir}/%{name}-agent@.service > %{buildroot}%{_unitdir}/%{name}-caching-agent@.service
18
 install -Dm 644 %{SOURCE10} %{buildroot}%{_unitdir}/%{name}-agent.socket
19
@@ -529,13 +529,13 @@
20
 %endif
21
22
 %pre agent
23
-%if 0%{?suse_version} >= 1210
24
+%if 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7
25
 %service_add_pre %{name}-agent.socket %{name}-agent@.service
26
 %endif
27
28
 %post agent
29
 # ensure xinetd is enabled if the package is installed for the first time
30
-%if 0%{?suse_version} >= 1210
31
+%if 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7
32
 %service_add_post xinetd.service
33
 %service_add_post %{name}-agent.socket %{name}-agent@.service
34
 %else
35
@@ -543,12 +543,12 @@
36
 %endif
37
38
 %preun agent
39
-%if 0%{?suse_version} >= 1210
40
+%if 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7
41
 %service_del_preun %{name}-agent.socket %{name}-agent@.service
42
 %endif
43
44
 %postun agent
45
-%if 0%{?suse_version} >= 1210
46
+%if 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7
47
 %service_del_postun xinetd.service
48
 %service_del_postun %{name}-agent.socket %{name}-agent@.service
49
 %else
50
@@ -556,12 +556,12 @@
51
 %endif
52
53
 %pre caching-agent
54
-%if 0%{?suse_version} >= 1210
55
+%if 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7
56
 %service_add_pre %{name}-caching-agent.socket %{name}-caching-agent@.service
57
 %endif
58
59
 %post caching-agent
60
-%if 0%{?suse_version} >= 1210
61
+%if 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7
62
 %service_add_post xinetd.service
63
 %service_add_post %{name}-caching-agent.socket %{name}-caching-agent@.service
64
 %else
65
@@ -569,12 +569,12 @@
66
 %endif
67
68
 %preun caching-agent
69
-%if 0%{?suse_version} >= 1210
70
+%if 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7
71
 %service_del_preun %{name}-caching-agent.socket %{name}-caching-agent@.service
72
 %endif
73
74
 %postun caching-agent
75
-%if 0%{?suse_version} >= 1210
76
+%if 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7
77
 %service_del_postun xinetd.service
78
 %service_del_postun %{name}-caching-agent.socket %{name}-caching-agent@.service
79
 %else
80
@@ -684,7 +684,7 @@
81
 %{_bindir}/waitmax
82
 %{_bindir}/mk-job
83
 %config(noreplace) %{_sysconfdir}/xinetd.d/%{name}
84
-%if 0%{?suse_version} >= 1210
85
+%if 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7
86
 %{_unitdir}/%{name}-agent@.service
87
 %{_unitdir}/%{name}-agent.socket
88
 %endif
89
@@ -698,7 +698,7 @@
90
 %defattr(-,root,root)
91
 %{_bindir}/check_mk_caching_agent
92
 %config(noreplace) %{_sysconfdir}/xinetd.d/%{name}-caching
93
-%if 0%{?suse_version} >= 1210
94
+%if 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7
95
 %{_unitdir}/%{name}-caching-agent@.service
96
 %{_unitdir}/%{name}-caching-agent.socket
97
 %endif
98
​

Cancel