Skip to content
Snippets Groups Projects
Commit 2aaf36a9 authored by bigbes's avatar bigbes
Browse files

Fix for removing of tarantool-common in RPM

Also - remove 0*1.snap from RPM Spec
parent 7ff161f4
No related branches found
No related tags found
No related merge requests found
......@@ -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"
......
......@@ -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()
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment