UniRec output: added SPEC file for RPM build, improved installation directories detection

Author: Lukas955

extra_plugins/output/unirec/CMakeLists.txt

@@ -1,20 +1,20 @@
 cmake_minimum_required(VERSION 2.8.8)
-project(unirec)
+project(ipfixcol2-unirec-output)
 
 # Description of the project
 set(UNIREC_DESCRIPTION
     "Output plugin for IPFIXcol2 that sends flow records in UniRec format into NEMEA modules."
 )
 
-set(UNIREC_VERSION_MAJOR 1)
+set(UNIREC_VERSION_MAJOR 2)
 set(UNIREC_VERSION_MINOR 0)
 set(UNIREC_VERSION_PATCH 0)
 set(UNIREC_VERSION
     ${UNIREC_VERSION_MAJOR}.${UNIREC_VERSION_MINOR}.${UNIREC_VERSION_PATCH})
 
+include(CMakeModules/install_dirs.cmake)
 include(CheckCCompilerFlag)
 include(CheckCXXCompilerFlag)
-include(GNUInstallDirs)
 # Include custom FindXXX modules
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMakeModules")
 
@@ -39,6 +39,12 @@ set(CMAKE_CXX_FLAGS          "${CMAKE_CXX_FLAGS} -fvisibility=hidden -std=gnu++1
 set(CMAKE_CXX_FLAGS_RELEASE  "-O2 -DNDEBUG")
 set(CMAKE_CXX_FLAGS_DEBUG    "-g -O0 -Wall -Wextra -pedantic")
 
+# Prepare SPEC file
+configure_file(
+    "${PROJECT_SOURCE_DIR}/ipfixcol2-unirec-output.spec.in"
+    "${PROJECT_BINARY_DIR}/ipfixcol2-unirec-output.spec"
+)
+
 # Header files for source code building
 include_directories(
     "${IPFIXCOL2_INCLUDE_DIRS}"  # IPFIXcol2 header files
@@ -67,11 +73,11 @@ target_link_libraries(unirec-output
 
 install(
     TARGETS unirec-output
-    LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/ipfixcol2/"
+    LIBRARY DESTINATION "${INSTALL_DIR_LIB}/ipfixcol2/"
 )
 install(
     FILES config/unirec-elements.txt
-    DESTINATION "${CMAKE_INSTALL_FULL_SYSCONFDIR}/ipfixcol2/"
+    DESTINATION "${INSTALL_DIR_SYSCONF}/ipfixcol2/"
 )
 
 if (ENABLE_DOC_MANPAGE)
@@ -92,6 +98,6 @@ if (ENABLE_DOC_MANPAGE)
 
     install(
         FILES "${DST_FILE}"
-        DESTINATION "${CMAKE_INSTALL_FULL_MANDIR}/man7"
+        DESTINATION "${INSTALL_DIR_MAN}/man7"
     )
 endif()

extra_plugins/output/unirec/CMakeModules/install_dirs.cmake

@@ -0,0 +1,44 @@
+# The purpose of this file is to automatically determine install directories
+#
+# If no directories are defined, use GNU install directories by default.
+# However, in case of RPM build, install directories are typically passed
+# to CMake as definitions that overwrites the default paths.
+#
+
+include(GNUInstallDirs)
+
+# Binary directories
+set(INSTALL_DIR_BIN ${CMAKE_INSTALL_FULL_BINDIR})
+
+# Library directories
+if (DEFINED LIB_INSTALL_DIR)
+    set(INSTALL_DIR_LIB ${LIB_INSTALL_DIR})
+else()
+    set(INSTALL_DIR_LIB ${CMAKE_INSTALL_FULL_LIBDIR})
+endif()
+
+# Include directories
+if (DEFINED INCLUDE_INSTALL_DIR)
+    set(INSTALL_DIR_INCLUDE ${INCLUDE_INSTALL_DIR})
+else()
+    set(INSTALL_DIR_INCLUDE ${CMAKE_INSTALL_FULL_INCLUDEDIR})
+endif()
+
+# System configuration
+if (DEFINED SYSCONF_INSTALL_DIR)
+    set(INSTALL_DIR_SYSCONF ${SYSCONF_INSTALL_DIR})
+else()
+    set(INSTALL_DIR_SYSCONF ${CMAKE_INSTALL_FULL_SYSCONFDIR})
+endif()
+
+# Share files (architecture independend data)
+if (DEFINED SHARE_INSTALL_PREFIX)
+    set(INSTALL_DIR_SHARE ${SHARE_INSTALL_PREFIX})
+else()
+    set(INSTALL_DIR_SHARE ${CMAKE_INSTALL_FULL_DATAROOTDIR})
+endif()
+
+set(INSTALL_DIR_INFO "${INSTALL_DIR_SHARE}/info/")
+set(INSTALL_DIR_MAN  "${INSTALL_DIR_SHARE}/man/")
+set(INSTALL_DIR_DOC  "${INSTALL_DIR_SHARE}/doc/${CMAKE_PROJECT_NAME}/")
+

extra_plugins/output/unirec/ipfixcol2-unirec-output.spec.in

@@ -0,0 +1,47 @@
+Name:           ipfixcol2-unirec-output
+Version:        @UNIREC_VERSION@
+Release:        1%{?dist}
+Summary:        Plugin for converting IPFIX data to UniRec format.
+
+License:        BSD
+URL:            http://www.liberouter.org/
+Source0:        %{name}-%{version}.tar.gz
+Group:          Liberouter
+Vendor:         CESNET, z.s.p.o.
+Packager:
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}
+BuildRequires:  gcc >= 4.8, cmake >= 2.8.8, make
+BuildRequires:  ipfixcol2-devel, libfds-devel, python2-docutils
+BuildRequires:  libtrap-devel, unirec >= 2.3.0
+Requires:       libtrap >= 0.12.0, ipfixcol2 >= 2.0.0, libfds >= 0.1.0
+
+%description
+Plugin for converting IPFIX data to UniRec format.
+
+%prep
+%autosetup
+
+#%post
+#/sbin/ldconfig
+
+#%postun
+#/sbin/ldconfig
+
+# Build source code
+%build
+%cmake .
+make %{?_smp_mflags}
+
+# Perform installation into build directory
+%install
+make install DESTDIR=%{buildroot}
+
+%files
+%{_libdir}/ipfixcol2/*.so*
+%{_mandir}/man7/*.7.gz
+%config(noreplace) %{_sysconfdir}/ipfixcol2/unirec-elements.txt
+
+%changelog
+* Wed Nov  21 2018 Lukas Hutak <[email protected]> 2.0.0-1
+- Initial RPM release