From 98dae64a8412c367191836513b0abd72e55f3d97 Mon Sep 17 00:00:00 2001
From: Gunnar Beutner <gunnar@beutner.name>
Date: Sun, 27 May 2012 16:21:50 +0200
Subject: [PATCH] Updated RPM packaging scripts.

---
 Makefile.am     |  2 +-
 README          |  3 +++
 configure.ac    | 13 +++++++++--
 icinga2.spec.in | 62 +++++++++++--------------------------------------
 4 files changed, 28 insertions(+), 52 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index f73047f0e..3b14e5578 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,7 +25,7 @@ icinga2doc_DATA = \
 	NEWS
 
 
-EXTRA_DIST = $(icinga2doc_DATA) git_version.sh
+EXTRA_DIST = $(icinga2doc_DATA) git_version.sh icinga2.spec
 
 
 # Remove doc directory on uninstall
diff --git a/README b/README
index a88ea5181..bd56b94a1 100644
--- a/README
+++ b/README
@@ -33,6 +33,9 @@ These components are only used on the target system if your C++ compiler does
 not at least support TR1 and there's no other system-wide installation of the
 Boost library.
 
+Debian Packages
+---------------
+
 This program comes with its own Debian packaging scripts which may or may not
 fully comply with the official Debian packaging requirements. These scripts can
 be found in the 'debian' sub-directory. Binary packages can be built using
diff --git a/configure.ac b/configure.ac
index 086f1c9d3..199e4556a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,6 +24,17 @@ AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE([1.11])
 AM_SILENT_RULES([yes])
 
+AC_PROG_CXX
+AC_LANG_CPLUSPLUS
+AC_PROG_CC
+AC_LANG_C
+
+AC_PROG_INSTALL
+AC_PROG_LIBTOOL
+AX_CXX_COMPILE_STDCXX_0X
+AX_CXX_GCC_ABI_DEMANGLE
+AX_PTHREAD
+
 LT_INIT([dlopen, disable-static])
 LT_CONFIG_LTDL_DIR([ltdl])
 LTDL_INIT
@@ -43,8 +54,6 @@ DX_INIT_DOXYGEN([icinga], [Doxyfile], [doc])
 
 AC_PROG_INSTALL
 AC_PROG_CC
-AC_PROG_CXX
-AC_LANG_CPLUSPLUS
 AC_PROG_LIBTOOL
 AX_CXX_COMPILE_STDCXX_0X
 AX_CXX_GCC_ABI_DEMANGLE
diff --git a/icinga2.spec.in b/icinga2.spec.in
index d3fe40024..88fcfd403 100644
--- a/icinga2.spec.in
+++ b/icinga2.spec.in
@@ -4,71 +4,35 @@ Version: @VERSION@
 Release: 1%{?dist}
 License: GPL
 Group: Applications/System
-Source: https://github.com/gunnarbeutner/strawberry/
+Source: %{name}-%{version}.tar.gz
 URL: http://www.icinga.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 BuildRequires: openssl-devel
 BuildRequires: gcc-c++
+BuildRequires: boost
+BuildRequires: boost-devel
+BuildRequires: boost-test
 
 %description
-Icinga 2 is a general-purpose network monitoring application.
+Icinga is a general-purpose network monitoring application.
 
 %prep
-%setup -n %{name}-%{version}
+%setup -q -n %{name}-%{version}
 
 %build
-./configure --prefix=/usr
-make %{?_smp_mflags} all
+%configure
+make %{?_smp_mflags}
 
 %install
-make DESTDIR=$RPM_BUILD_ROOT install
+[ "%{buildroot}" != "/" ] && [ -d "%{buildroot}" ] && rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
 
 %clean
-[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT;
-
-%define _sharedir %{_prefix}/share
-%define _libdir %{_prefix}/lib
+[ "%{buildroot}" != "/" ] && [ -d "%{buildroot}" ] && rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
 %{_bindir}/icinga
-%dir %{_libdir}/icinga
-%{_libdir}/icinga/discovery.so.0
-%{_libdir}/icinga/discovery.la
-%{_libdir}/icinga/configrpc.la
-%{_libdir}/icinga/demo.la
-%{_libdir}/icinga/configfile.so.0
-%{_libdir}/icinga/configrpc.so
-%{_libdir}/icinga/discovery.so.0.0.0
-%{_libdir}/icinga/libbase.so.0
-%{_libdir}/icinga/libicinga.so.0.0.0
-%{_libdir}/icinga/libjsonrpc.so.0
-%{_libdir}/icinga/configrpc.so.0.0.0
-%{_libdir}/icinga/libbase.so.0.0.0
-%{_libdir}/icinga/libicinga.so.0
-%{_libdir}/icinga/libbase.la
-%{_libdir}/icinga/configfile.so
-%{_libdir}/icinga/discovery.so
-%{_libdir}/icinga/libjsonrpc.so
-%{_libdir}/icinga/libbase.so
-%{_libdir}/icinga/demo.so.0
-%{_libdir}/icinga/configfile.la
-%{_libdir}/icinga/libjsonrpc.la
-%{_libdir}/icinga/demo.so.0.0.0
-%{_libdir}/icinga/configrpc.so.0
-%{_libdir}/icinga/libicinga.la
-%{_libdir}/icinga/libjsonrpc.so.0.0.0
-%{_libdir}/icinga/demo.so
-%{_libdir}/icinga/configfile.so.0.0.0
-%{_libdir}/icinga/libicinga.so
-%dir %{_sharedir}/doc
-%dir %{_sharedir}/doc/icinga2
-%{_sharedir}/doc/icinga2
-%{_sharedir}/doc/icinga2/ChangeLog
-%{_sharedir}/doc/icinga2/AUTHORS
-%{_sharedir}/doc/icinga2/INSTALL
-%{_sharedir}/doc/icinga2/NEWS
-%{_sharedir}/doc/icinga2/COPYING
-%{_sharedir}/doc/icinga2/README
-%{_sharedir}/doc/icinga2/COPYING.Exceptions
+%{_datadir}/doc/icinga2
+%{_libdir}/icinga2
-- 
2.40.0