[check-mk/el6: 22/22] Fix the various conflicts with the master branch

[averi]

commit 8b7657f8300e4d4800b4ef145aefde57691d625d
Merge: 269089e 5ec4923
Author: Andrea Veri <av at gnome.org>
Date:   Wed Apr 2 18:05:23 2014 +0200

    Fix the various conflicts with the master branch

 .gitignore             |    2 +-
 First-Installation.txt |    8 ++++++++
 check-mk.spec          |   19 ++++++++++++++-----
 defaults               |    2 +-
 defaults.py            |    2 +-
 sources                |    2 +-
 6 files changed, 26 insertions(+), 9 deletions(-)
---
diff --cc .gitignore
index 95ae274,cb7e293..9b1ba61
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,4 +1,1 @@@
- /check_mk-1.2.4.tar.gz
 -/check_mk-1.2.2.tar.gz
 -/check_mk-1.2.2p2.tar.gz
 -/check_mk-1.2.4.tar.gz
+ /check_mk-1.2.4p1.tar.gz
diff --cc check-mk.spec
index 389aa7a,e7534c1..fe461c0
--- a/check-mk.spec
+++ b/check-mk.spec
@@@ -244,7 -249,14 +249,13 @@@ rmdir %{buildroot}%{_prefix}/lib/check_
  %{_bindir}/unixcat
  %{_libdir}/check_mk
  
 -
  %changelog
 -* Wed Apr 02 2014 Andrea Veri <averi at fedoraproject.org> - 1.2.4p1-1
++Wed Apr 02 2014 Andrea Veri <averi at fedoraproject.org> - 1.2.4p1-1
+ - New upstream release. Fixes the missing two CVEs that were still
+   left unfixed on 1.2.4:
+   - CVE-2014-2330
+   - CVE-2014-2331
+ 
  * Tue Mar 25 2014 Andrea Veri <averi at fedoraproject.org> - 1.2.4-1
  - New upstream release. Fixes the following CVEs:
    - CVE-2014-2329