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

Changes of Revision 39

[-] Changed icinga.changes
 
1
@@ -1,4 +1,9 @@
2
 -------------------------------------------------------------------
3
+Sun Oct 21 10:09:12 UTC 2012 - cs@linux-administrator.com
4
+
5
+- update to release 1.8.0
6
+
7
+-------------------------------------------------------------------
8
 Tue Jun 19 08:24:47 UTC 2012 - cs@linux-administrator.com
9
10
 - update to release 1.7.1
11
​
[-] Changed icinga.spec ^
170
 
1
@@ -1,7 +1,7 @@
2
 #!BuildIgnore:          post-build-checks
3
 %define name icinga
4
-%define version 1.7.1
5
-%define pkgversion 1.7.1
6
+%define version 1.8.0
7
+%define pkgversion 1.8.0
8
 %define release 1
9
 %define nsusr icinga
10
 %define nsgrp icinga
11
@@ -222,6 +222,7 @@
12
    --with-gd-inc=/usr/include \
13
    --with-dbi-lib=%{_libdir} \
14
    --with-dbi-inc=%{_includedir}/db \
15
+   --with-libdbi-driver-dir=%{_libdir}/dbd \
16
    --with-oci-lib=%{_libdir} \
17
    --with-oci-inc=%{_includedir} \
18
    --with-ssl-dir=%{_prefix} \
19
@@ -235,13 +236,6 @@
20
21
 %__make all
22
23
-# make sample configs
24
-###cd sample-config
25
-###F=`mktemp temp.XXXXXX`
26
-###sed -e 's=/var/log/icinga/rw/=/var/spool/icinga/=;s=@sysconfdir@/resource.cfg=@sysconfdir@/private/resource.cfg=' icinga.cfg > ${F}
27
-###mv ${F} icinga.cfg
28
-###cd ..
29
-
30
 # make daemonchk.cgi and event handlers
31
 cd contrib
32
 %__make
33
@@ -255,33 +249,7 @@
34
 done
35
 cd ../..
36
37
-#cd module/icinga-api
38
-#./configure \
39
-#        --host=%{arch}-suse-linux-gnu \
40
-#        --build=%{arch}-suse-linux-gnu \
41
-#        --target=%{arch}-suse-linux \
42
-#        --prefix=%{_prefix} \
43
-#        --exec-prefix=%{_prefix}/sbin \
44
-#        --bindir=%{_prefix}/sbin \
45
-#        --sbindir=%{_prefix}/lib/icinga/cgi \
46
-#        --libexecdir=%{_prefix}/lib/icinga/plugins \
47
-#        --datarootdir=%{_prefix}/share/icinga \
48
-#        --datadir=%{_prefix}/share/icinga \
49
-#        --mandir=%{_mandir} \
50
-#        --docdir=%{_docdir}/%{name} \
51
-#        --sysconfdir=/etc/icinga \
52
-#        --localstatedir=/var/log/icinga \
53
-#  --with-phpapi-log-dir=%{logdir}/api \
54
-#  --with-icinga-user=%{nsusr} \
55
-#  --with-icinga-group=%{nsgrp} \
56
-#  --with-command-user=%{nsusr} \
57
-#  --with-command-group=%{cmdgrp} \
58
-#  --with-web-user=%{wwwusr} \
59
-#  --with-web-group=%{wwwgrp}
60
-#%__make all
61
-
62
 %install
63
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
64
 install -d -m 0775 ${RPM_BUILD_ROOT}/var/spool/icinga
65
 install -d -m 0775 ${RPM_BUILD_ROOT}/var/spool/icinga/checkresults
66
 install -d -m 0755 ${RPM_BUILD_ROOT}%{_prefix}/include/icinga
67
@@ -289,7 +257,6 @@
68
 install -d -m 0755 ${RPM_BUILD_ROOT}/etc/logrotate.d
69
 install -d -m 0755 ${RPM_BUILD_ROOT}/etc/apache2/conf.d
70
 install -d -m 0755 ${RPM_BUILD_ROOT}/etc/icinga
71
-### install -d -m 0755 ${RPM_BUILD_ROOT}/etc/icinga/private
72
 make DESTDIR=${RPM_BUILD_ROOT} INSTALL_OPTS="" INSTALL_OPTS_WEB="" COMMAND_OPTS="" install
73
 make DESTDIR=${RPM_BUILD_ROOT} INSTALL_OPTS="" INSTALL_OPTS_WEB="" COMMAND_OPTS="" INIT_OPTS="" install-daemoninit
74
 make DESTDIR=${RPM_BUILD_ROOT} INSTALL_OPTS="" INSTALL_OPTS_WEB="" COMMAND_OPTS="" install-idoutils
75
@@ -322,8 +289,6 @@
76
 # install CGIs
77
 cd contrib
78
 make INSTALL=install DESTDIR=${RPM_BUILD_ROOT} INSTALL_OPTS="" COMMAND_OPTS="" CGIDIR=%{_prefix}/lib/icinga/cgi install
79
-#mv ${RPM_BUILD_ROOT}%{_prefix}/lib/icinga/cgi/convertcfg ${RPM_BUILD_ROOT}%{_prefix}/lib/icinga/
80
-#mv ${RPM_BUILD_ROOT}%{_prefix}/lib/icinga/cgi/mini_epn ${RPM_BUILD_ROOT}%{_prefix}/sbin/
81
 cd ..
82
83
 # install event handlers
84
@@ -334,9 +299,6 @@
85
 done
86
 cd ../..
87
88
-#cd module/icinga-api
89
-#make INSTALL=install DESTDIR=${RPM_BUILD_ROOT} INSTALL_OPTS="" INSTALL_OPTS_WEB="" COMMAND_OPTS="" install
90
-
91
 install -d -m 0755 ${RPM_BUILD_ROOT}/var/log/icinga/rw
92
93
 chmod +x %{buildroot}/etc/init.d/ido2db
94
@@ -359,7 +321,6 @@
95
 %{_sbindir}/mini_epn
96
 %{_sbindir}/new_mini_epn
97
 %{_sbindir}/ido2db
98
-#%{_sbindir}/idomod.o
99
 %{_sbindir}/log2ido
100
 %{_sbindir}/rcicinga
101
 %{_sbindir}/rcido2db
102
@@ -375,9 +336,7 @@
103
 %dir /etc/icinga/objects
104
 %config /etc/icinga/objects/ido2db_check_proc.cfg
105
 %defattr(750,root,%{nsgrp})
106
-###%dir /etc/icinga/private
107
 %defattr(640,root,%{nsgrp})
108
-### %config(noreplace) /etc/icinga/private/resource.cfg
109
 %defattr(755,%{nsusr},%{nsgrp})
110
 %dir /var/log/icinga
111
 %dir /var/log/icinga/rw
112
@@ -390,6 +349,8 @@
113
 %doc module/idoutils/db/mysql/mysql.sql
114
 %doc module/idoutils/db/oracle/oracle.sql
115
 %doc module/idoutils/db/pgsql/pgsql.sql
116
+%doc sample-config/updates/
117
+%doc module/idoutils/config/updates/
118
 %defattr(-,%{nsusr},%{nsgrp})
119
 %dir %{logdir}
120
121
@@ -405,7 +366,6 @@
122
 %dir %{logdir}/cgi
123
 %{logdir}/cgi/index.htm
124
 %{logdir}/cgi/.htaccess
125
-##%dir %{logdir}/api
126
127
 %files devel
128
 %defattr(-,root,root)
129
@@ -414,40 +374,3 @@
130
131
132
 %changelog
133
-* Thu Mar 31 2011 Carsten Schoene <cs@linux-administrator.com> - 1.3.1-1
134
-- update to release 1.3.1
135
-
136
-* Wed Feb 16 2011 Carsten Schoene <cs@linux-administrator.com> - 1.3.0-1
137
-- update to release 1.3.0
138
-
139
-* Sun Jan 30 2011 Carsten Schoene <cs@linux-administrator.com> - 1.2.1-3
140
-- added rcicinga & rcido2db links
141
-- added /var/log/icinga/rw directory
142
-- added initial ido2db sql definitions to docs
143
-
144
-* Mon Oct 25 2010 Carsten Schoene <cs@linux-administrator.com> - 1.2.1-1
145
-- update to release 1.2.1
146
-
147
-* Wed Oct 06 2010 Carsten Schoene <cs@linux-administrator.com> - 1.2.0-1
148
-- update to release 1.2.0
149
-
150
-* Wed Aug 18 2010 Carsten Schoene <cs@linux-administrator.com> - 1.0.3-1
151
-- update to release 1.0.3
152
-
153
-* Wed Jun 30 2010 Carsten Schoene <cs@linux-administrator.com> - 1.0.2-1
154
-- update to release 1.0.2
155
-
156
-* Thu Mar 04 2010 Carsten Schoene <cs@linux-administrator.com> - 1.0.1-1
157
-- update to release 1.0.1
158
-
159
-* Mon Dec 21 2009 Carsten Schoene <cs@linux-administrator.com> - 1.0.0-1
160
-- update to release 1.0.0
161
-
162
-* Sun Sep 27 2009 Carsten Schoene <cs@linux-administrator.com> - 0.8.4-1
163
-- update to release 0.8.4
164
-
165
-* Thu Aug 13 2009 Carsten Schoene <cs@linux-administrator.com> - 0.8.2-1
166
-- update to release 0.8.2
167
-
168
-* Sun Jul 19 2009 Carsten Schoene <cs@linux-administrator.com> - 0.8.1-1
169
-- initial icinga build
170
​
Changed icinga-1.8.0.tar.bz2 ^

Cancel