From 979cbdd70c57ee44bf4e72e542c6d953ca82db03 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Sat, 26 May 2012 23:12:46 +0200 Subject: [PATCH] Updated RPM spec file. --- base/Makefile.am | 2 +- base/i2-base.h | 1 + configure.ac | 6 ++---- icinga2.spec => icinga2.spec.in | 8 ++++---- 4 files changed, 8 insertions(+), 9 deletions(-) rename icinga2.spec => icinga2.spec.in (96%) diff --git a/base/Makefile.am b/base/Makefile.am index f1edd61a8..0c358e249 100644 --- 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 c9795adb6..151488063 100644 --- a/base/i2-base.h +++ b/base/i2-base.h @@ -81,6 +81,7 @@ #include #include +#include #include #include #include diff --git a/configure.ac b/configure.ac index 3e0595dd8..0037666b6 100644 --- 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 f43795f07..d3fe40024 100644 --- 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