diff --git a/extra/rpm/tarantool.rpm.spec.in b/extra/rpm/tarantool.rpm.spec.in index 9df678ccf90e34ffe4275ffe1b55660cb7c83733..5391c16e0fc39ab5dc733107474a183c78b221ae 100644 --- a/extra/rpm/tarantool.rpm.spec.in +++ b/extra/rpm/tarantool.rpm.spec.in @@ -153,7 +153,7 @@ tarantool-sql-module. .. cmake_key_value('CMAKE_INSTALL_INFODIR', '%{_infodir}') .. cmake_key_value('CMAKE_INSTALL_MANDIR', '%{_mandir}') .. cmake_key_value('CMAKE_INSTALL_LOCALSTATEDIR', '%{_localstatedir}') - .. ' %{!?scl:-DCMAKE_INSTALL_SYSCONFDIR=%{_sysconfdir}}' + .. ' %{!?scl:-DCMAKE_INSTALL_SYSCONFDIR=%{_sysconfdir}}' .. ' %{!?scl:-DENABLE_RPM=ON}' .. ' %{?scl:-DENABLE_RPM_SCL=ON}' .. dev_with('postgresql', 'WITH_POSTGRESQL') @@ -169,18 +169,13 @@ tarantool-sql-module. make DESTDIR=%{buildroot} install %post -groupadd tarantool > /dev/null 2>&1 -useradd -r -g tarantool tarantool > /dev/null 2>&1 -# Performe a single instance setup -/usr/bin/tarantool_deploy.sh --yes --quiet 1.1 %preun %files %defattr(-,root,root,-) -%dir "%{_datadir}/tarantool" -%{!?scl:"%{_datadir}/tarantool/00000000000000000001.snap"} +"%{_bindir}/tarantool" %dir "%{_datadir}/doc/tarantool" "%{_datadir}/doc/tarantool/README.md" @@ -188,11 +183,6 @@ useradd -r -g tarantool tarantool > /dev/null 2>&1 "%{_datadir}/doc/tarantool/box-protocol.txt" "%{_mandir}/man1/tarantool.1.gz" -"%{_bindir}/tarantool" -# %{!?scl:"%{_bindir}/tarantool_multi.sh"} -# %{!?scl:"%{_bindir}/tarantool_deploy.sh"} -# %{!?scl:"%{_sysconfdir}/init.d/tarantool"} - %files sql-module %defattr(-,root,root,-) %dir "%{_datadir}/tarantool" diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 017e4998a5fda33e8afe4bc20930193caaa290e6..ad6576d4806507961cd2f2455bd649b6e0446679 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -13,13 +13,3 @@ add_custom_target(test-force add_subdirectory(unit) # Disable connector_c for 1.6 #add_subdirectory(connector_c) - -if (ENABLE_RPM) - install (FILES ${CMAKE_SOURCE_DIR}/src/box/bootstrap.snap - DESTINATION ${CMAKE_INSTALL_DATADIR}/tarantool - RENAME 00000000000000000001.snap) -elseif(NOT ENABLE_RPM_SCL) - install (FILES ${CMAKE_SOURCE_DIR}/src/box/bootstrap.snap - DESTINATION "${CMAKE_INSTALL_LOCALSTATEDIR}/lib/tarantool" - RENAME 00000000000000000001.snap) -endif()