[icinga-checkins] icinga.org: icinga-core/next: icinga.spec: fix double %{logdir}/gui/ definitions in icinga and icinga-gui ( thx René Koch )

[git at icinga.org]

Module: icinga-core
Branch: next
Commit: 843f8435c39f2f6bef71561fff7458e8d666b167
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=843f8435c39f2f6bef71561fff7458e8d666b167

Author: Michael Friedrich <michael.friedrich at netways.de>
Date:   Fri Mar  8 18:39:56 2013 +0100

icinga.spec: fix double %{logdir}/gui/ definitions in icinga and icinga-gui (thx René Koch)

refs #3802

Conflicts:
	icinga.spec

---

 Changelog   |    3 ++-
 icinga.spec |    7 +++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Changelog b/Changelog
index c038128..083d2cc 100644
--- a/Changelog
+++ b/Changelog
@@ -71,7 +71,8 @@ FIXES
 * docs: search_string as cgi GET param works also for status.cgi #3451 - MF
 * docs: fix typo pqsql -> pgsql #3461 - WN
 
-* icinga.spec: add idoutils as transitional package (thx Stefan Marx, Michael Grüner) #3640
+* icinga.spec: add idoutils as transitional package (thx Stefan Marx, Michael Grüner) #3640 - MF
+* icinga.spec: fix double %{logdir}/gui/ definitions in icinga and icinga-gui (thx René Koch) #3802 - MF
 
 CHANGES
 
diff --git a/icinga.spec b/icinga.spec
index de6a325..a9b0e2a 100644
--- a/icinga.spec
+++ b/icinga.spec
@@ -355,8 +355,8 @@ fi
 %attr(755,-,-) %{_libdir}/icinga/p1.pl
 %{_libdir}/%{name}/eventhandlers
 %defattr(-,icinga,icinga,-)
-%{logdir}
-%{logdir}/archives
+%dir %{logdir}
+%dir %{logdir}/archives
 %dir %{_localstatedir}/spool/%{name}
 %dir %{_localstatedir}/spool/%{name}/perfdata
 %dir %{_localstatedir}/spool/%{name}/checkresults
@@ -440,6 +440,9 @@ fi
 * Thu Apr 25 2013 Michael Friedrich <michael.friedrich at netways.de> - 1.9.0-1
 - bump 1.9.0
 
+* Tue Mar 05 2013 Rene Koch <r.koch at ovido.at> - 1.8.4-5
+- fixed double logdir/gui/ definitions in icinga and icinga-gui
+
 * Fri Feb 15 2013 Michael Friedrich <michael.friedrich at netways.de> - 1.8.4-4
 - fix rpmlint errors/warnings