Mailinglist Archive: opensuse-commit (1857 mails)

< Previous Next >
commit icinga for openSUSE:Factory

Hello community,

here is the log from the commit of package icinga for openSUSE:Factory
checked in at Wed Sep 21 17:05:30 CEST 2011.



--------
--- icinga/icinga.changes 2011-09-15 17:08:53.000000000 +0200
+++ /mounts/work_src_done/STABLE/icinga/icinga.changes 2011-09-21
14:45:48.000000000 +0200
@@ -2 +2,7 @@
-Thu Sep 15 15:06:28 UTC 2011 - thardeck@xxxxxxx
+Tue Sep 20 11:12:36 UTC 2011 - thardeck@xxxxxxxx
+
+- imported Upstream version 1.5.1
+- ran spec-cleaner and added patch tags
+
+-------------------------------------------------------------------
+Thu Sep 15 15:06:28 UTC 2011 - thardeck@xxxxxxxx
@@ -8 +14 @@
-Fri Sep 9 13:50:06 UTC 2011 - thardeck@xxxxxxx
+Fri Sep 9 13:50:06 UTC 2011 - thardeck@xxxxxxxx
@@ -14 +20 @@
-Mon Sep 2 14:55:17 UTC 2011 - thardeck@xxxxxxx
+Mon Sep 2 14:55:17 UTC 2011 - thardeck@xxxxxxxx
@@ -33 +39 @@
-Mon Jul 11 18:51:42 UTC 2011 - thardeck@xxxxxxxxxx
+Mon Jul 11 18:51:42 UTC 2011 - thardeck@xxxxxxxx
@@ -38 +44 @@
-Mon Jul 11 18:37:09 UTC 2011 - thardeck@xxxxxxxxxx
+Mon Jul 11 18:37:09 UTC 2011 - thardeck@xxxxxxxx
@@ -53 +59 @@
-Tue Jun 21 17:33:49 UTC 2011 - thardeck@xxxxxxxxxx
+Tue Jun 21 17:33:49 UTC 2011 - thardeck@xxxxxxxx
@@ -58 +64 @@
-Fri Jun 17 09:18:23 UTC 2011 - thardeck@xxxxxxxxxx
+Fri Jun 17 09:18:23 UTC 2011 - thardeck@xxxxxxxx
@@ -64 +70 @@
-Thu Jun 9 12:54:17 UTC 2011 - thardeck@xxxxxxxxxx
+Thu Jun 9 12:54:17 UTC 2011 - thardeck@xxxxxxxx
@@ -69 +75 @@
-Wed Jun 8 13:01:52 UTC 2011 - thardeck@xxxxxxxxxx
+Wed Jun 8 13:01:52 UTC 2011 - thardeck@xxxxxxxx
@@ -74 +80 @@
-Fri May 20 14:24:59 UTC 2011 - thardeck@xxxxxxxxxx
+Fri May 20 14:24:59 UTC 2011 - thardeck@xxxxxxxx
@@ -79 +85 @@
-Fri May 20 14:14:04 UTC 2011 - thardeck@xxxxxxxxxx
+Fri May 20 14:14:04 UTC 2011 - thardeck@xxxxxxxx
@@ -85 +91 @@
-Thu May 19 12:51:44 UTC 2011 - thardeck@xxxxxxxxxx
+Thu May 19 12:51:44 UTC 2011 - thardeck@xxxxxxxx
@@ -92 +98 @@
-Fri May 6 14:16:22 UTC 2011 - thardeck@xxxxxxxxxx
+Fri May 6 14:16:22 UTC 2011 - thardeck@xxxxxxxx
@@ -97 +103 @@
-Fri May 6 12:56:33 UTC 2011 - thardeck@xxxxxxxxxx
+Fri May 6 12:56:33 UTC 2011 - thardeck@xxxxxxxx
@@ -104 +110 @@
-Thu Mar 31 11:58:59 UTC 2011 - thardeck@xxxxxxxxxx
+Thu Mar 31 11:58:59 UTC 2011 - thardeck@xxxxxxxx
@@ -109 +115 @@
-Thu Mar 3 16:18:45 UTC 2011 - thardeck@xxxxxxxxxx
+Thu Mar 3 16:18:45 UTC 2011 - thardeck@xxxxxxxx
@@ -115 +121 @@
-Mon Feb 28 18:07:39 UTC 2011 - thardeck@xxxxxxxxxx
+Mon Feb 28 18:07:39 UTC 2011 - thardeck@xxxxxxxx
@@ -121 +127 @@
-Mon Feb 28 16:14:39 UTC 2011 - thardeck@xxxxxxxxxx
+Mon Feb 28 16:14:39 UTC 2011 - thardeck@xxxxxxxx
@@ -145 +151 @@
-Fri Feb 18 10:22:12 UTC 2011 - thardeck@xxxxxxxxxx
+Fri Feb 18 10:22:12 UTC 2011 - thardeck@xxxxxxxx

calling whatdependson for head-i586


Old:
----
_service:download_url:icinga-1.5.0.tar.gz
icinga-apache.patch
icinga-remove-api.patch

New:
----
_service:download_url:icinga-1.5.1.tar.gz
icinga-add-ifdefine-to-apache.patch
icinga-remove-obsolete-api.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ icinga.spec ++++++
--- /var/tmp/diff_new_pack.lWCQ1L/_old 2011-09-21 17:05:18.000000000 +0200
+++ /var/tmp/diff_new_pack.lWCQ1L/_new 2011-09-21 17:05:18.000000000 +0200
@@ -1,6 +1,8 @@
#
# spec file for package icinga
#
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
@@ -9,16 +11,19 @@
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
#

+
# set to 1 to also build the obsolete api packages
%define build_api 0

%define logdir %{_localstatedir}/log/icinga

Name: icinga
-Version: 1.5.0
-Release: 4
+Version: 1.5.1
+Release: 1
License: GPLv2
%define nsusr icinga
%define nsgrp icinga
@@ -42,9 +47,11 @@
Source8: ido2db.8
Source9: mini_epn_icinga.8
Source12: htpasswd.users
-Patch0: icinga-apache.patch
+# PATCH-FIX-OPENSUSE icinga-add-ifdefine-to-apache.patch
+Patch0: icinga-add-ifdefine-to-apache.patch
%if 0%{?build_api} == 0
-Patch1: icinga-remove-api.patch
+# PATCH-FIX-OPENSUSE icinga-remove-obsolete-api.patch
+Patch1: icinga-remove-obsolete-api.patch
%endif
BuildRequires: apache2-devel
%if 0%{?suse_version} >= 1110
@@ -56,35 +63,35 @@
BuildRequires: krb5-devel
BuildRequires: libdbi-devel
BuildRequires: libjpeg-devel
+BuildRequires: libopenssl-devel
BuildRequires: libpng-devel
BuildRequires: mailx
-BuildRequires: pcre-devel
-BuildRequires: net-tools
-BuildRequires: zlib-devel
BuildRequires: net-snmp-devel
+BuildRequires: net-tools
BuildRequires: openssl
-BuildRequires: libopenssl-devel
-PreReq: %fillup_prereq
-PreReq: %insserv_prereq
-PreReq: /bin/logger
-PreReq: grep
-PreReq: pwdutils
-PreReq: fileutils
-PreReq: sed
-PreReq: gawk
+BuildRequires: pcre-devel
+BuildRequires: zlib-devel
Requires: net-tools
+Requires(pre): %fillup_prereq
+Requires(pre): %insserv_prereq
+Requires(pre): /bin/logger
+Requires(pre): fileutils
+Requires(pre): gawk
+Requires(pre): grep
+Requires(pre): pwdutils
+Requires(pre): sed
%if 0%{?suse_version} >= 1110
Requires: perl >= 5.10.0
%else
Recommends: perl >= 5.10.0
%endif
-Recommends: cron
-Recommends: %{name}-www
+Requires: mailx
Recommends: %{name}-plugins-eventhandlers
+Recommends: %{name}-www
+Recommends: cron
Recommends: nagios-plugins
Recommends: net-snmp
Recommends: openssl
-Requires: mailx
BuildRoot: %{_tmppath}/%{name}-%{version}-build

%description
@@ -106,8 +113,8 @@
Summary: Provides the HTML and CGI files for the Icinga web interface
Group: System/Monitoring
Requires: %{name} = %{version}
-PreReq: apache2
Recommends: %{name}-doc = %{version}
+Requires(pre): apache2

%description www
Icinga is a program that will monitor hosts and services on your
@@ -142,8 +149,8 @@
%package idoutils
Summary: Provides the IDOUtils functionality for Icinga
Group: System/Monitoring
-Requires: %name-idoutils-drivers-dbd >= %{version}
-PreReq: %{name} = %{version}
+Requires: %{name}-idoutils-drivers-dbd >= %{version}
+Requires(pre): %{name} = %{version}

%description idoutils
Icinga is a program that will monitor hosts and services on your
@@ -158,12 +165,12 @@
%package idoutils-mysql
Summary: IDOUtils drivers for MySQL
Group: System/Monitoring
-Provides: %name-idoutils-drivers-dbd = %{version}-%{release}
Requires: %{name}-idoutils = %{version}
Requires: libdbi-drivers-dbd-mysql
Requires: perl(DBD::mysql)
-Recommends: mysql-client
Recommends: mysql
+Recommends: mysql-client
+Provides: %{name}-idoutils-drivers-dbd = %{version}

%description idoutils-mysql
This package requires all needed packages for using IDOUtils with MySQL.
@@ -177,20 +184,18 @@
%description idoutils-oracle
This package requires all needed packages for using IDOUtils with OracleDB.

-
%package idoutils-pgsql
Summary: IDOUtils drivers for PostgreSQL
Group: System/Monitoring
-Provides: %name-idoutils-drivers-dbd = %{version}-%{release}
Requires: %{name}-idoutils = %{version}
Requires: libdbi-drivers-dbd-pgsql
-Recommends: postgresql-libs
Recommends: postgresql
+Recommends: postgresql-libs
+Provides: %{name}-idoutils-drivers-dbd = %{version}

%description idoutils-pgsql
This package requires all needed packages for using IDOUtils with PostgreSQL.

-
%package doc
Summary: Online documentation for %{name}
Group: System/Monitoring
@@ -199,7 +204,6 @@
%description doc
This package provides the online documentation for %{name}.

-
%package plugins-eventhandlers
Summary: Eventhandlers for %{name}
Group: System/Monitoring
@@ -210,15 +214,15 @@
monitoring, redundancy and disabling and enabling service checks and
notifications.

-
%if 0%{?build_api} != 0
+
%package api
Summary: PHP api for icinga
Group: System/Monitoring
-PreReq: %{name} = %{version}
Recommends: %{name}-idoutils
Recommends: php5-mysql
Recommends: php5-pgsql
+Requires(pre): %{name} = %{version}

%description api
PHP based, the Icinga API is free from complex data schemas, and has no
@@ -233,7 +237,6 @@
In short: This package provides the API needed to access idoutils and
livestatus information from PHP.

-
%package api-doc
Summary: Online documentation for %{name}-api
Group: System/Monitoring
@@ -243,7 +246,6 @@
This package provides the online documentation for %{name}-api.
%endif

-
%prep
%setup -q
%patch0 -p1
@@ -258,7 +260,7 @@
"module/idoutils/config/idomod.cfg-sample.in";

# remove GPLv3+ source files which are not needed for this package
-%{__rm} t-tap/*.c
+rm t-tap/*.c

%build
export PATH_TO_TRACEROUTE="%{_sbindir}/traceroute"
@@ -298,8 +300,8 @@
#
# make daemonchk.cgi and event handlers
#
-make %{?jobs:-j%jobs} all
-make %{?jobs:-j%jobs} -C contrib
+make %{?_smp_mflags} all
+make %{?_smp_mflags} -C contrib
pushd contrib/eventhandlers 1>/dev/null
for f in `find . -type f` ; do
sed -i "s=/usr/local/nagios/var/rw/=/var/spool/%{name}/=; \
@@ -316,7 +318,6 @@
cd contrib
make

-
%install
install -d -m0775 %{buildroot}%{_localstatedir}/log/%{name}/archives
install -d -m0775 %{buildroot}%{_localstatedir}/spool/%{name}
@@ -328,8 +329,8 @@
install -d -m0755 %{buildroot}%{_sysconfdir}/%{name}/objects
install -d -m0755 %{buildroot}%{_localstatedir}/lib/%{name}
install -d -m0755 %{buildroot}%{_prefix}/lib/nagios/plugins/eventhandlers
-%{__make} install install-commandmode install-idoutils install-config
install-webconf install-cgis install-init \
- DESTDIR="%{buildroot}" \
+make install install-commandmode install-idoutils install-config
install-webconf install-cgis install-init \
+ DESTDIR=%{buildroot} \
INSTALL_OPTS="" \
COMMAND_OPTS="" \
INSTALL_OPTS_WEB="" \
@@ -337,8 +338,8 @@
CGICFGDIR="%{_sysconfdir}/%{name}" \
INIT_OPTS=""

-%{__make} install -C contrib \
- DESTDIR="%{buildroot}" \
+make install -C contrib \
+ DESTDIR=%{buildroot} \
CGIDIR="%{_prefix}/lib/%{name}/cgi" \
CGICFGDIR="%{_sysconfdir}/%{name}" \
INSTALL_OPTS=""
@@ -349,51 +350,51 @@
mv %{buildroot}%{_sysconfdir}/icinga/modules/idoutils.cfg-sample
%{buildroot}%{_sysconfdir}/icinga/modules/idoutils.cfg

# install directory for event brokers like ndoutils
-%{__install} -d -m0755 %{buildroot}%{_prefix}/lib/nagios/brokers
+install -d -m0755 %{buildroot}%{_prefix}/lib/nagios/brokers
# install eventhandlers
cp -r contrib/eventhandlers %{buildroot}%{_prefix}/lib/nagios/plugins/

# install headers for development package
-%{__install} -d -m0755 %{buildroot}%{_includedir}/%{name}/
-%{__install} -m0644 include/{config,snprintf,cgiutils,locations}.h
%{buildroot}%{_includedir}/%{name}
+install -d -m0755 %{buildroot}%{_includedir}/%{name}/
+install -m0644 include/{config,snprintf,cgiutils,locations}.h
%{buildroot}%{_includedir}/%{name}

# remove unnecessary files from www log directory
-%{__rm} %{buildroot}/%{logdir}/www/{.htaccess,index.htm}
+rm %{buildroot}/%{logdir}/www/{.htaccess,index.htm}

%if 0%{?build_api} != 0
### remove API PLACEHOLDER
-%{__rm} %{buildroot}/%{logdir}/api/PLACEHOLDER
+rm %{buildroot}/%{logdir}/api/PLACEHOLDER
%endif

# REST of special SUSE stuff here, if needed....
# init-scripts
# remove the default init script as SUSE uses an adapted one
test -f %{buildroot}%{_sysconfdir}/init.d/%{name} && rm -v
%{buildroot}%{_sysconfdir}/init.d/%{name}
-%{__install} -D -m0755 %{S:1} %{buildroot}%{_sysconfdir}/init.d/%{name}
+install -D -m0755 %{SOURCE1} %{buildroot}%{_sysconfdir}/init.d/%{name}
ln -sf ../../%{_sysconfdir}/init.d/%{name} %{buildroot}%{_sbindir}/rc%{name}
-%{__install} -D -m0755 %{S:2} %{buildroot}%{_sysconfdir}/init.d/ido2db
+install -D -m0755 %{SOURCE2} %{buildroot}%{_sysconfdir}/init.d/ido2db
ln -sf ../../%{_sysconfdir}/init.d/ido2db %{buildroot}%{_sbindir}/rcido2db
# sysconfig script
-%{__install} -D -m 0644 %{S:3}
%{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}
+install -D -m 0644 %{SOURCE3}
%{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}
# install cronjob (gzip' the logfiles)
-%{__install} -D -m 0640 %{S:4} %{buildroot}%{_sysconfdir}/cron.weekly/%{name}
+install -D -m 0640 %{SOURCE4} %{buildroot}%{_sysconfdir}/cron.weekly/%{name}
%if 0%{?suse_version} >= 1110
%fdupes -s %{buildroot}
%endif

# fix documentation
-%{__rm} -f sample-config/*.in
-%{__rm} -f sample-config/template-object/*.in
+rm -f sample-config/*.in
+rm -f sample-config/template-object/*.in

# install manpages from Debian
mkdir -p %{buildroot}%{_mandir}/man8/
-install -m644 %{S:6} %{buildroot}%{_mandir}/man8/
-install -m644 %{S:7} %{buildroot}%{_mandir}/man8/
-install -m644 %{S:8} %{buildroot}%{_mandir}/man8/
-install -m644 %{S:9} %{buildroot}%{_mandir}/man8/
+install -m644 %{SOURCE6} %{buildroot}%{_mandir}/man8/
+install -m644 %{SOURCE7} %{buildroot}%{_mandir}/man8/
+install -m644 %{SOURCE8} %{buildroot}%{_mandir}/man8/
+install -m644 %{SOURCE9} %{buildroot}%{_mandir}/man8/

# install default www interface user
-install -m644 %{S:12} %{buildroot}%{_sysconfdir}/%{name}/
+install -m644 %{SOURCE12} %{buildroot}%{_sysconfdir}/%{name}/

# install ido2utils scripts
pushd module/idoutils/db/scripts >/dev/null
@@ -407,17 +408,14 @@
done
popd >/dev/null

-
%clean
rm -rf %{buildroot}

-
%pre
groupadd -r %{nsgrp} 2>/dev/null || :
groupadd -r %{cmdgrp} 2>/dev/null || :
/usr/sbin/useradd -c %{nsusr} -s /sbin/nologin -r -d
%{_localstatedir}/lib/%{name} -G %{cmdgrp} -g %{nsgrp} %{nsusr} 2> /dev/null ||
:

-
%post
%{fillup_and_insserv %{name}}
# New installation?
@@ -455,7 +453,7 @@
fi
# if apache user is not in cmdgrp, add it
if /usr/bin/id -Gn $wwwusr 2>/dev/null | /bin/grep -q %{cmdgrp} > /dev/null
2>&1 ; then
- : # $wwwusr (default: %cmdusr) is already in %{cmdgrp} group
+ : # $wwwusr (default: %{cmdusr}) is already in %{cmdgrp} group
else
# modify apache user, adding it to cmdgrp
groupmod -A $wwwusr %{cmdgrp} 2>/dev/null
@@ -477,7 +475,6 @@
%restart_on_update apache2
fi

-
%post idoutils
#post a db update notification in case of major updates
if [ "$1" == "2" ] &&
@@ -537,7 +534,6 @@
%dir %{logdir}/archives
%attr(0755,%{nsusr},%{cmdgrp}) %dir %{_localstatedir}/spool/%{name}

-
%files www
%defattr(-,root,root)
%config(noreplace) %attr(-,root,root)
%{_sysconfdir}/apache2/conf.d/%{name}.conf
@@ -602,10 +598,10 @@

%files plugins-eventhandlers
%defattr(0755,root,root)
-%dir %{_prefix}/lib/nagios/plugins/eventhandlers
-%{_prefix}/lib/nagios/plugins/eventhandlers/*
+%{_prefix}/lib/nagios/plugins/eventhandlers/

%if 0%{?build_api} != 0
+
%files api
%defattr(-,%{nsusr},%{nsgrp})
%dir %{_datadir}/icinga/icinga-api
@@ -620,5 +616,4 @@
%doc module/icinga-api/doc/*
%endif

-
%changelog

++++++ _service ++++++
--- /var/tmp/diff_new_pack.lWCQ1L/_old 2011-09-21 17:05:18.000000000 +0200
+++ /var/tmp/diff_new_pack.lWCQ1L/_new 2011-09-21 17:05:18.000000000 +0200
@@ -3,11 +3,11 @@
<service name="download_url">
<param name="protocol">http</param>
<param name="host">sourceforge.net</param>
- <param
name="path">/projects/icinga/files/icinga/1.5.0/icinga-1.5.0.tar.gz/download</param>
+ <param
name="path">/projects/icinga/files/icinga/1.5.1/icinga-1.5.1.tar.gz/download</param>
</service>
<service name="verify_file">
- <param name="file">_service:download_url:icinga-1.5.0.tar.gz</param>
+ <param name="file">_service:download_url:icinga-1.5.1.tar.gz</param>
<param name="verifier">sha256</param>
- <param
name="checksum">c30bf2f94fb972403c4369abbbd98dcbbf2a0590b83b6a46aa18dbd85a861242</param>
+ <param
name="checksum">b2cc23ab8b96e9409ce3e7ed4a0e1aabea7f9b4e9d521f5ed23a99ea1c9ec37b</param>
</service>
</services>

++++++ _service:download_url:icinga-1.5.0.tar.gz ->
_service:download_url:icinga-1.5.1.tar.gz ++++++
icinga/_service:download_url:icinga-1.5.0.tar.gz
/mounts/work_src_done/STABLE/icinga/_service:download_url:icinga-1.5.1.tar.gz
differ: char 5, line 1

++++++ icinga-add-ifdefine-to-apache.patch ++++++
Index: icinga-1.2.1/sample-config/httpd.conf.in
===================================================================
--- icinga-1.2.1.orig/sample-config/httpd.conf.in
+++ icinga-1.2.1/sample-config/httpd.conf.in
@@ -5,6 +5,7 @@
# configuration file. Customize the paths, etc. as
# needed to fit your system.

+<IfDefine ICINGA>
ScriptAlias @cgiurl@ "@sbindir@"

<Directory "@sbindir@">
@@ -38,4 +39,4 @@ Alias @htmurl@ "@datadir@/"
AuthUserFile @sysconfdir@/htpasswd.users
Require valid-user
</Directory>
-
+</IfDefine>
++++++ icinga-remove-obsolete-api.patch ++++++
diff -rupN icinga-1.5.0.orig/Makefile.in icinga-1.5.0/Makefile.in
--- icinga-1.5.0.orig/Makefile.in 2011-08-24 15:57:57.000000000 +0200
+++ icinga-1.5.0/Makefile.in 2011-08-28 13:11:39.662070208 +0200
@@ -371,7 +371,6 @@ install:
cd $(SRC_CGI) && $(MAKE) $@
cd $(SRC_HTM) && $(MAKE) $@

- $(MAKE) install-api
$(MAKE) install-basic

install-unstripped:
@@ -379,7 +378,6 @@ install-unstripped:
cd $(SRC_CGI) && $(MAKE) $@
cd $(SRC_HTM) && $(MAKE) $@

- $(MAKE) install-api
$(MAKE) install-basic

install-basic:
++++++ icinga-rpmlintrc ++++++
--- /var/tmp/diff_new_pack.lWCQ1L/_old 2011-09-21 17:05:18.000000000 +0200
+++ /var/tmp/diff_new_pack.lWCQ1L/_new 2011-09-21 17:05:18.000000000 +0200
@@ -4,6 +4,7 @@
addFilter("incoherent-init-script-name.*ido2db");
# we download the file with _service anyway so pointless
addFilter("source-or-patch-not-bzipped");
+addFilter("source-or-patch-not-compressed");
# we need these packages to get the right database drivers
addFilter("explicit-lib-dependency.*libdbi-drivers-dbd-mysql");
addFilter("explicit-lib-dependency.*libdbi-drivers-dbd-oracle");


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread