Updated RPM spec file.

diff --git a/base/Makefile.am b/base/Makefile.am
index f1edd61a8e0ef93a28f615c26b251fbe80cf5005..0c358e249cfe749452504e7962a0ae9d47e9145d 100644 (file)
--- a/base/Makefile.am
+++ b/base/Makefile.am
@@ -56,7 +56,7 @@ libbase_la_CXXFLAGS = \
 
 libbase_la_LDFLAGS = \
        -no-undefined \
-       -version-info 0:0:0
+       -version-info PACKAGE_VERSION
 
 libbase_la_LIBADD = \
        $(LIBLTDL) \

diff --git a/base/i2-base.h b/base/i2-base.h
index c9795adb687ad3cd409683d846b35fd89ceb59de..15148806379ef81830b837354d0560ba0648b6fa 100644 (file)
--- a/base/i2-base.h
+++ b/base/i2-base.h
@@ -81,6 +81,7 @@
 
 #include <string>
 #include <exception>
+#include <stdexcept>
 #include <sstream>
 #include <vector>
 #include <set>

diff --git a/configure.ac b/configure.ac
index 3e0595dd83f55d84f7895603865478330970ad4c..0037666b6e4447783a7da527a6f6409cc7b854b0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -17,12 +17,10 @@
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ******************************************************************************/
 
-AC_INIT([icinga], [2.0])
+AC_INIT([icinga2], [2.0])
 AC_LANG(C++)
-
 AC_CONFIG_AUX_DIR([config])
 AC_CONFIG_HEADERS([config.h])
-
 AM_INIT_AUTOMAKE([1.11])
 AM_SILENT_RULES([yes])
 
@@ -63,7 +61,6 @@ AC_COMPILE_IFELSE(
        [],
        [AC_MSG_ERROR([You need the OpenSSL headers and libraries in order to build this application]) ])
 
-
 AC_OUTPUT([
 Makefile
 compat/Makefile
@@ -79,4 +76,5 @@ icinga-app/Makefile
 jsonrpc/Makefile
 mmatch/Makefile
 Doxyfile
+icinga2.spec
 ])

diff --git a/icinga2.spec b/icinga2.spec.in
similarity index 96%
rename from icinga2.spec
rename to icinga2.spec.in
index f43795f072376030be4a05a95c62cda60c063393..d3fe40024d28f46bac76f8b5b6fc89156d724e9c 100644 (file)
--- a/icinga2.spec
+++ b/icinga2.spec.in
@@ -1,9 +1,9 @@
 Summary: network monitoring application
-Name: icinga
-Version: 1.3beta6
-Release: 2
+Name: icinga2
+Version: @VERSION@
+Release: 1%{?dist}
 License: GPL
-Group: Productivity/Networking/IRC
+Group: Applications/System
 Source: https://github.com/gunnarbeutner/strawberry/
 URL: http://www.icinga.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build