Changes - j0ke.net Open Build Service

Changes of Revision 15

[-] [+]	Changed	icinga.spec
@@ -25,9 +25,6 @@ Group: Application/System Source0: %{name}-%{version}.tar.bz2 Source1: %{name}-rpmlintrc -# included since 1.0.3 -#Patch0: %{name}-init-lsb.patch -#Patch1: %{name}-ido2db-init-lsb.patch BuildRoot: %{_tmppath}/%{name}-buildroot Requires: gd > 1.8 zlib libpng libjpeg bash grep perl libdbi-drivers Requires(pre): pwdutils @@ -35,6 +32,7 @@ BuildRequires: gd-devel > 1.8 zlib-devel libpng-devel libjpeg-devel glibc-devel libgcc gcc gcc-c++ perl BuildRequires: openssl-devel BuildRequires: libdbi-devel libocilib-devel +Provides: icinga-api = %{version} %if 0%{?fedora_version} >= 7 BuildRequires: perl-ExtUtils-MakeMaker @@ -99,9 +97,6 @@ %prep %setup -q -##patch0 -##patch1 - %pre # Create `icinga' user on the system if necessary if /usr/bin/id %{nsusr} > /dev/null 2>&1 ; then @@ -232,7 +227,7 @@ --with-httpd-conf=/etc/apache2/conf.d \ --with-checkresult-dir=/var/spool/icinga/checkresults -make all +%__make all # make sample configs ###cd sample-config @@ -243,7 +238,7 @@ # make daemonchk.cgi and event handlers cd contrib -make +%__make cd eventhandlers for f in `find . -type f` ; do F=`mktemp temp.XXXXXX` @@ -254,6 +249,29 @@ done cd ../.. +cd module/icinga-api +./configure \ + --host=%{arch}-suse-linux-gnu \ + --build=%{arch}-suse-linux-gnu \ + --target=%{arch}-suse-linux \ + --prefix=%{_prefix} \ + --exec-prefix=%{_prefix}/sbin \ + --bindir=%{_prefix}/sbin \ + --sbindir=%{_prefix}/lib/icinga/cgi \ + --libexecdir=%{_prefix}/lib/icinga/plugins \ + --datarootdir=%{_prefix}/share/icinga \ + --datadir=%{_prefix}/share/icinga \ + --mandir=%{_mandir} \ + --docdir=%{_docdir}/%{name} \ + --sysconfdir=/etc/icinga \ + --localstatedir=/var/log/icinga \ + --with-icinga-user=%{nsusr} \ + --with-icinga-group=%{nsgrp} \ + --with-command-user=%{nsusr} \ + --with-command-group=%{cmdgrp} \ + --with-web-user=%{wwwusr} \ + --with-web-group=%{wwwgrp} +%__make all %install [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT @@ -308,6 +326,9 @@ done cd ../.. +cd module/icinga-api +make INSTALL=install DESTDIR=${RPM_BUILD_ROOT} INSTALL_OPTS="" INSTALL_OPTS_WEB="" COMMAND_OPTS="" install + install -d -m 0755 ${RPM_BUILD_ROOT}/var/log/icinga/rw chmod +x %{buildroot}/etc/init.d/ido2db