Some fixes for debian/rpm packages

cmake/systemd.cmake

-find_package(PkgConfig REQUIRED)
+find_package(PkgConfig QUIET)
+if (PKG_CONFIG_FOUND)
+    pkg_check_modules(SYSTEMD "systemd")
+    
+    if (SYSTEMD_FOUND AND "${SYSTEMD_SERVICES_INSTALL_DIR}" STREQUAL "")
+        execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE}
+            --variable=systemdsystemunitdir systemd
+            OUTPUT_VARIABLE SYSTEMD_SERVICES_INSTALL_DIR)
+        string(REGEX REPLACE "[ \t\n]+" "" SYSTEMD_SERVICES_INSTALL_DIR
+            "${SYSTEMD_SERVICES_INSTALL_DIR}")
+    elseif (NOT SYSTEMD_FOUND AND SYSTEMD_SERVICES_INSTALL_DIR)
+        message (FATAL_ERROR "Variable SYSTEMD_SERVICES_INSTALL_DIR is\
+            defined, but we can't find systemd using pkg-config")
+    endif()
 
-pkg_check_modules(SYSTEMD "systemd")
+    if (SYSTEMD_FOUND)
+        message(STATUS "SYSTEMD_SERVICES_INSTALL_DIR: ${SYSTEMD_SERVICES_INSTALL_DIR}")
+    else()
+        set(WITH_SYSTEMD "OFF")
+    endif (SYSTEMD_FOUND)
+else(PKG_CONFIG_FOUND)
+    set(WITH_SYSTEMD "OFF")
+endif(PKG_CONFIG_FOUND)
 
-if (SYSTEMD_FOUND AND NOT SYSTEMD_SERVICES_INSTALL_DIR)
-    execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=systemdsystemunitdir systemd OUTPUT_VARIABLE SYSTEMD_SERVICES_INSTALL_DIR)
-    string(REGEX REPLACE "[ \t\n]+" "" SYSTEMD_SERVICES_INSTALL_DIR "${SYSTEMD_SERVICES_INSTALL_DIR}")
-endif(SYSTEMD_FOUND AND NOT SYSTEMD_SERVICES_INSTALL_DIR)
-
-if (NOT SYSTEMD_FOUND AND SYSTEMD_SERVICES_INSTALL_DIR)
-    message (FATAL_ERROR "Variable SYSTEMD_SERVICES_INSTALL_DIR is defined,")
-    message (FATAL_ERROR "but we can't find systemd using pkg-config")
-endif(NOT SYSTEMD_FOUND AND SYSTEMD_SERVICES_INSTALL_DIR)
-
-if (SYSTEMD_FOUND)
-    message(STATUS "SYSTEMD_SERVICES_INSTALL_DIR: ${SYSTEMD_SERVICES_INSTALL_DIR}")
-endif (SYSTEMD_FOUND)
+file(APPEND "${_OptionalPackagesFile}" "-- WITH_SYSTEMD=${WITH_SYSTEMD}\n")

extra/dist/CMakeLists.txt

@@ -9,7 +9,7 @@ configure_file("tarantool.service.in" "tarantool.service")
 if (ENABLE_RPM)
     # chmod +x 655
     if (SYSTEMD_FOUND AND WITH_SYSTEMD)
-	message (STATUS "Building RPM with SYSTEMD")
+    message (STATUS "Building RPM with SYSTEMD")
         install (FILES tarantool.service DESTINATION ${SYSTEMD_SERVICES_INSTALL_DIR}
             PERMISSIONS
             OWNER_READ OWNER_WRITE
@@ -21,7 +21,7 @@ if (ENABLE_RPM)
             GROUP_READ GROUP_EXECUTE
             WORLD_READ WORLD_EXECUTE)
     else (SYSTEMD_FOUND AND WITH_SYSTEMD)
-	message (STATUS "Building RPM without SYSTEMD")
+    message (STATUS "Building RPM without SYSTEMD")
         install (FILES tarantool.init DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/init.d/
             RENAME tarantool
             PERMISSIONS
@@ -29,15 +29,16 @@ if (ENABLE_RPM)
             GROUP_READ GROUP_EXECUTE
             WORLD_READ WORLD_EXECUTE)
     endif(SYSTEMD_FOUND AND WITH_SYSTEMD)
-    install (FILES default.rpm/tarantool DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/sysconfig/
-	PERMISSIONS
-	OWNER_READ OWNER_WRITE
-	GROUP_READ GROUP_EXECUTE
-	WORLD_READ WORLD_EXECUTE)
+    install (FILES default.rpm/tarantool DESTINATION
+        ${CMAKE_INSTALL_SYSCONFDIR}/sysconfig/
+    PERMISSIONS
+    OWNER_READ OWNER_WRITE
+    GROUP_READ GROUP_EXECUTE
+    WORLD_READ WORLD_EXECUTE)
     install (FILES dist.lua DESTINATION ${CMAKE_INSTALL_BINDIR}
-	RENAME tarantool_ctl
-	PERMISSIONS
-	OWNER_READ OWNER_WRITE
-	GROUP_READ GROUP_EXECUTE
-	WORLD_READ WORLD_EXECUTE)
+    RENAME tarantool_ctl
+    PERMISSIONS
+    OWNER_READ OWNER_WRITE
+    GROUP_READ GROUP_EXECUTE
+    WORLD_READ WORLD_EXECUTE)
 endif()

extra/rpm/tarantool.rpm.spec.in

@@ -13,12 +13,12 @@
 %global __debug_install_post %{nil}
 %global __debug_package %{nil}
 
+%if (0%{?fedora} >= 15 || 0%{?rhel} >= 7) && %{undefined _with_systemd}
+%global _with_systemd 1
+%endif
+
 %bcond_without postgresql
 %bcond_without mysql
-
-%if 0%{?fedora} >= 15 || 0%{?rhel} >= 7
-%global   _with_systemd 1
-%endif
 %bcond_with    systemd
 
 BuildRequires: readline-devel
@@ -156,25 +156,17 @@ tarantool-sql-module.
     end
     local function dev_with (obj, flag)
         local status = "OFF"
-        if rpm.expand("%{with "..obj.."}") then
+        if tonumber(rpm.expand("%{with "..obj.."}")) ~= 0 then
             status = "ON"
         end
         return cmake_key_value(flag, status)
     end
     local function dev_with_kv (obj, key, value)
-        if rpm.expand("%{with "..obj.."}") then
+        if tonumber(rpm.expand("%{with "..obj.."}")) ~= 0 then
             return cmake_key_value(key, value)
         end
         return ""
     end
-    local function dev_without (obj, flag)
-        local status = "ON"
-        if rpm.expand("%{without "..obj.."}") then
-            status = "OFF"
-        end
-        return cmake_key_value(flag, status)
-    end
-
     local cmd = 'cmake'
     if is_rhel_old() then
         cmd = 'cmake28'
@@ -201,12 +193,9 @@ tarantool-sql-module.
         .. dev_with('systemd', 'WITH_SYSTEMD')
         .. dev_with_kv('systemd', 'SYSTEMD_SERVICES_INSTALL_DIR', '%{_unitdir}')
 
-    print(wrap_with_toolset(cmd))
-}
+    print(wrap_with_toolset(cmd))}
+%{lua:print(wrap_with_toolset('make %{?_smp_mflags}\n'))}
 
-%{lua:
-    print(wrap_with_toolset('make %{?_smp_mflags}\n'))
-}
 %install
 make VERBOSE=1 DESTDIR=%{buildroot} install