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

Changes of Revision 36

[-] Changed icinga.changes
 
1
@@ -1,4 +1,9 @@
2
 -------------------------------------------------------------------
3
+Tue May 15 19:57:36 UTC 2012 - cs@linux-administrator.com
4
+
5
+- update to release 1.7.0
6
+
7
+-------------------------------------------------------------------
8
 Fri Dec  2 21:09:39 UTC 2011 - cs@linux-administrator.com
9
10
 - update to release 1.6.1
11
​
[-] Changed icinga.spec ^
119
 
1
@@ -1,7 +1,7 @@
2
 #!BuildIgnore:          post-build-checks
3
 %define name icinga
4
-%define version 1.6.1
5
-%define pkgversion 1.6.1
6
+%define version 1.7.0
7
+%define pkgversion 1.7.0
8
 %define release 1
9
 %define nsusr icinga
10
 %define nsgrp icinga
11
@@ -62,7 +62,7 @@
12
 Summary: Provides the HTML and CGI files for the Nagios web interface
13
 Requires: %{name} = %{version}
14
 Requires: http_daemon
15
-Provides: icinga-api = %{version}
16
+#Provides: icinga-api = %{version}
17
18
 %description www
19
 Nagios is a program that will monitor hosts and services on your
20
@@ -205,8 +205,9 @@
21
    --with-icinga-group=%{nsgrp} \
22
    --prefix=%{_prefix} \
23
    --exec-prefix=%{_prefix}/sbin \
24
-   --bindir=%{_prefix}/sbin \
25
+   --bindir=%{_sbindir} \
26
    --sbindir=%{_prefix}/lib/icinga/cgi \
27
+   --libdir=%{_libdir}/icinga \
28
    --libexecdir=%{_prefix}/lib/icinga/plugins \
29
    --datarootdir=%{_prefix}/share/icinga \
30
    --datadir=%{_prefix}/share/icinga \
31
@@ -254,30 +255,30 @@
32
 done
33
 cd ../..
34
35
-cd module/icinga-api
36
-./configure \
37
-        --host=%{arch}-suse-linux-gnu \
38
-        --build=%{arch}-suse-linux-gnu \
39
-        --target=%{arch}-suse-linux \
40
-        --prefix=%{_prefix} \
41
-        --exec-prefix=%{_prefix}/sbin \
42
-        --bindir=%{_prefix}/sbin \
43
-        --sbindir=%{_prefix}/lib/icinga/cgi \
44
-        --libexecdir=%{_prefix}/lib/icinga/plugins \
45
-        --datarootdir=%{_prefix}/share/icinga \
46
-        --datadir=%{_prefix}/share/icinga \
47
-        --mandir=%{_mandir} \
48
-        --docdir=%{_docdir}/%{name} \
49
-        --sysconfdir=/etc/icinga \
50
-        --localstatedir=/var/log/icinga \
51
-   --with-phpapi-log-dir=%{logdir}/api \
52
-   --with-icinga-user=%{nsusr} \
53
-   --with-icinga-group=%{nsgrp} \
54
-   --with-command-user=%{nsusr} \
55
-   --with-command-group=%{cmdgrp} \
56
-   --with-web-user=%{wwwusr} \
57
-   --with-web-group=%{wwwgrp}
58
-%__make all
59
+#cd module/icinga-api
60
+#./configure \
61
+#        --host=%{arch}-suse-linux-gnu \
62
+#        --build=%{arch}-suse-linux-gnu \
63
+#        --target=%{arch}-suse-linux \
64
+#        --prefix=%{_prefix} \
65
+#        --exec-prefix=%{_prefix}/sbin \
66
+#        --bindir=%{_prefix}/sbin \
67
+#        --sbindir=%{_prefix}/lib/icinga/cgi \
68
+#        --libexecdir=%{_prefix}/lib/icinga/plugins \
69
+#        --datarootdir=%{_prefix}/share/icinga \
70
+#        --datadir=%{_prefix}/share/icinga \
71
+#        --mandir=%{_mandir} \
72
+#        --docdir=%{_docdir}/%{name} \
73
+#        --sysconfdir=/etc/icinga \
74
+#        --localstatedir=/var/log/icinga \
75
+#  --with-phpapi-log-dir=%{logdir}/api \
76
+#  --with-icinga-user=%{nsusr} \
77
+#  --with-icinga-group=%{nsgrp} \
78
+#  --with-command-user=%{nsusr} \
79
+#  --with-command-group=%{cmdgrp} \
80
+#  --with-web-user=%{wwwusr} \
81
+#  --with-web-group=%{wwwgrp}
82
+#%__make all
83
84
 %install
85
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
86
@@ -333,8 +334,8 @@
87
 done
88
 cd ../..
89
90
-cd module/icinga-api
91
-make INSTALL=install DESTDIR=${RPM_BUILD_ROOT} INSTALL_OPTS="" INSTALL_OPTS_WEB="" COMMAND_OPTS="" install
92
+#cd module/icinga-api
93
+#make INSTALL=install DESTDIR=${RPM_BUILD_ROOT} INSTALL_OPTS="" INSTALL_OPTS_WEB="" COMMAND_OPTS="" install
94
95
 install -d -m 0755 ${RPM_BUILD_ROOT}/var/log/icinga/rw
96
97
@@ -358,10 +359,11 @@
98
 %{_sbindir}/mini_epn
99
 %{_sbindir}/new_mini_epn
100
 %{_sbindir}/ido2db
101
-%{_sbindir}/idomod.o
102
+#%{_sbindir}/idomod.o
103
 %{_sbindir}/log2ido
104
 %{_sbindir}/rcicinga
105
 %{_sbindir}/rcido2db
106
+%{_libdir}/icinga/idomod.so
107
 %dir %{_prefix}/lib/icinga/eventhandlers
108
 %{_prefix}/lib/icinga/eventhandlers/*
109
 %{_sbindir}/convertcfg
110
@@ -401,7 +403,7 @@
111
 %dir %{logdir}/cgi
112
 %{logdir}/cgi/index.htm
113
 %{logdir}/cgi/.htaccess
114
-%dir %{logdir}/api
115
+##%dir %{logdir}/api
116
117
 %files devel
118
 %defattr(-,root,root)
119
​
Changed icinga-1.7.0.tar.bz2 ^

Cancel