[icinga-checkins] icinga.org: icinga-core/mfriedrich/core: fix forgotten leftovers from #1666 in icinga.spec

git at icinga.org git at icinga.org
Thu Apr 19 22:11:11 CEST 2012


Module: icinga-core
Branch: mfriedrich/core
Commit: 8f4a4cef8cbe415f9d831fd2e3d74f11e169e628
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=8f4a4cef8cbe415f9d831fd2e3d74f11e169e628

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Thu Apr 19 22:10:44 2012 +0200

fix forgotten leftovers from #1666 in icinga.spec

refs #1666

---

 Makefile.in                      |    2 +-
 configure                        |    4 ++--
 configure.in                     |    4 ++--
 html/main.html                   |    6 +++---
 icinga.spec                      |    2 +-
 include/common.h                 |    4 ++--
 module/idoutils/include/common.h |    4 ++--
 update-version                   |    4 ++--
 8 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 7fd3971..66399e1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -78,7 +78,7 @@ MKDIR=/bin/mkdir
 ###############################
 # Global
 ###############################
-ICINGA_VERSION=1.7.0-dev
+ICINGA_VERSION=1.7.0
 
 CP=@CP@
 
diff --git a/configure b/configure
index 763154d..86f671b 100755
--- a/configure
+++ b/configure
@@ -2439,9 +2439,9 @@ ac_config_headers="$ac_config_headers include/config.h"
 
 
 PKG_NAME=icinga-core
-PKG_VERSION="1.7.0-dev"
+PKG_VERSION="1.7.0"
 PKG_HOME_URL="http://www.icinga.org/"
-PKG_REL_DATE="02-29-2012"
+PKG_REL_DATE="04-19-2012"
 
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
diff --git a/configure.in b/configure.in
index 010b071..ad4bb65 100644
--- a/configure.in
+++ b/configure.in
@@ -9,9 +9,9 @@ AC_CONFIG_HEADER(include/config.h)
 AC_PREFIX_DEFAULT(/usr/local/icinga)
 
 PKG_NAME=icinga-core
-PKG_VERSION="1.7.0-dev"
+PKG_VERSION="1.7.0"
 PKG_HOME_URL="http://www.icinga.org/"
-PKG_REL_DATE="02-29-2012"
+PKG_REL_DATE="04-19-2012"
 
 dnl Figure out how to invoke "install" and what install options to use.
 AC_PROG_INSTALL
diff --git a/html/main.html b/html/main.html
index 495ebdd..0db3b7d 100644
--- a/html/main.html
+++ b/html/main.html
@@ -18,9 +18,9 @@
 </div>
 
 <div id="currentversioninfo">
-<div class="version">Version 1.7.0-dev</div>
-<div class="releasedate">February 29, 2012</div>
-<div class="whatsnew"><a href="docs/en/whatsnew.html">Read what's new in Icinga 1.7.0-dev</a></div>
+<div class="version">Version 1.7.0</div>
+<div class="releasedate">April 19, 2012</div>
+<div class="whatsnew"><a href="docs/en/whatsnew.html">Read what's new in Icinga 1.7.0</a></div>
 </div>
 
 <div id="developer">
diff --git a/icinga.spec b/icinga.spec
index b883b17..60811f0 100644
--- a/icinga.spec
+++ b/icinga.spec
@@ -263,6 +263,7 @@ fi
 %config(noreplace) %{_sysconfdir}/%{name}/objects/timeperiods.cfg
 %config(noreplace) %{_sysconfdir}/%{name}/objects/windows.cfg
 %config(noreplace) %attr(640,icinga,icinga) %{_sysconfdir}/%{name}/resource.cfg
+%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %attr(755,-,-) %{_bindir}/icinga
 %attr(755,-,-) %{_bindir}/icingastats
 %attr(755,-,-) %{_libdir}/icinga/p1.pl
@@ -270,7 +271,6 @@ fi
 %defattr(-,icinga,icinga,-)
 %{logdir}
 %{logdir}/archives
-%dir %{_localstatedir}/%{name}
 %dir %{_localstatedir}/spool/%{name}
 %dir %{_localstatedir}/spool/%{name}/checkresults
 %attr(2755,icinga,icingacmd) %{_localstatedir}/spool/%{name}/cmd
diff --git a/include/common.h b/include/common.h
index 11aa862..052d63b 100644
--- a/include/common.h
+++ b/include/common.h
@@ -27,8 +27,8 @@
 #define PROGRAM_NAME "Icinga"
 #define PROGRAM_NAME_UC "ICINGA"
 #define PROGRAM_NAME_LC "icinga"
-#define PROGRAM_VERSION "1.7.0-dev"
-#define PROGRAM_MODIFICATION_DATE "02-29-2012"
+#define PROGRAM_VERSION "1.7.0"
+#define PROGRAM_MODIFICATION_DATE "04-19-2012"
 
 /*#define DEBUG_CHECK_IPC 1 */
 /*#define DEBUG_CHECK_IPC2 1*/
diff --git a/module/idoutils/include/common.h b/module/idoutils/include/common.h
index 649bdb2..65b062f 100644
--- a/module/idoutils/include/common.h
+++ b/module/idoutils/include/common.h
@@ -22,8 +22,8 @@
 #define LOG2IDO_NAME 		"LOG2IDO"
 
 /* only one space for update-version matching */
-#define IDO_DATE "02-29-2012"
-#define IDO_VERSION "1.7.0-dev"
+#define IDO_DATE "04-19-2012"
+#define IDO_VERSION "1.7.0"
 
 #define IDO_SCHEMA_VERSION "1.7.0"
 
diff --git a/update-version b/update-version
index 1d7eafe..c9eb2e2 100755
--- a/update-version
+++ b/update-version
@@ -10,10 +10,10 @@ else
 fi
 
 # Current version number
-CURRENTVERSION=1.7.0-dev
+CURRENTVERSION=1.7.0
 
 # Last date
-LASTDATE=02-29-2012
+LASTDATE=04-19-2012
 
 if [ "x$1" = "x" ]
 then





More information about the icinga-checkins mailing list