commit icinga for openSUSE:Factory
Hello community,
here is the log from the commit of package icinga for openSUSE:Factory checked in at 2014-11-29 08:39:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/icinga (Old)
and /work/SRC/openSUSE:Factory/.icinga.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "icinga"
Changes:
--------
--- /work/SRC/openSUSE:Factory/icinga/icinga.changes 2014-09-12 10:03:58.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.icinga.new/icinga.changes 2014-11-29 08:39:58.000000000 +0100
@@ -1,0 +2,16 @@
+Thu Nov 27 16:16:18 UTC 2014 - thardeck@suse.com
+
+- remove patch source condition
+
+-------------------------------------------------------------------
+Thu Nov 20 10:46:40 UTC 2014 - thardeck@suse.com
+
+- restrict apache conf patch only to openSUSE 13.1 since it seems to be the only affected version
+- renamed icinga-fix-apache-issues-by-using-old-conf.patch to icinga-workaround-131-apache-conf-issue.patch
+
+-------------------------------------------------------------------
+Fri Nov 14 16:41:37 UTC 2014 - thardeck@suse.com
+
+- use icinga-fix-apache-issues-by-using-old-conf.patch only for openSUSE 13.1 and older versions
+
+-------------------------------------------------------------------
Old:
----
icinga-fix-apache-issues-by-using-old-conf.patch
New:
----
icinga-workaround-131-apache-conf-issue.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ icinga.spec ++++++
--- /var/tmp/diff_new_pack.TrFJtd/_old 2014-11-29 08:39:59.000000000 +0100
+++ /var/tmp/diff_new_pack.TrFJtd/_new 2014-11-29 08:39:59.000000000 +0100
@@ -50,8 +50,8 @@
Source17: icinga-favicon.ico
Source18: icinga-exec-start-pre
Source19: ido2db-exec-start-pre
-# PATCH-FIX-OPENSUSE icinga-fix-apache-issues-by-using-old-conf.patch
-Patch0: icinga-fix-apache-issues-by-using-old-conf.patch
+# PATCH-FIX-OPENSUSE icinga-workaround-131-apache-conf-issue.patch
+Patch0: icinga-workaround-131-apache-conf-issue.patch
# PATCH-FIX-OPENSUSE icinga-fix-systemd-services.patch
Patch1: icinga-fix-systemd-services.patch
Provides: monitoring_daemon
@@ -280,7 +280,9 @@
%prep
%setup -q
+%if 0%{?suse_version} == 1310
%patch0 -p1
+%endif
%patch1 -p1
%build
++++++ icinga-workaround-131-apache-conf-issue.patch ++++++
--- icinga-1.10.3.old/sample-config/httpd.conf.in 2014-02-11 12:05:36.000000000 +0100
+++ icinga-1.10.3/sample-config/httpd.conf.in 2014-02-18 17:19:04.804017535 +0100
@@ -5,62 +5,38 @@
# configuration file. Customize the paths, etc. as
# needed to fit your system.
+<IfDefine ICINGA>
ScriptAlias @cgiurl@ "@sbindir@"
participants (1)
-
root@hilbert.suse.de