From 9ba9d7a22457a59909a635b6ca2eb6e584cf3c0d Mon Sep 17 00:00:00 2001
From: Roman Tsisyk <roman@tsisyk.com>
Date: Thu, 24 Apr 2014 14:12:59 +0400
Subject: [PATCH] Fix a merge problem of
83882947a81b51234114031dc0acf310c606672d
---
extra/rpm.spec.in | 42 +++++++++++++++++++++---------------------
1 file changed, 21 insertions(+), 21 deletions(-)
diff --git a/extra/rpm.spec.in b/extra/rpm.spec.in
index 94046c3a43..34eb9e92fe 100644
--- a/extra/rpm.spec.in
+++ b/extra/rpm.spec.in
@@ -157,40 +157,40 @@ useradd -r -g tarantool tarantool > /dev/null 2>&1
%files sql-module
%defattr(-,root,root,-)
-%dir "%{_datadir}/tarantool/1.6"
-%dir "%{_datadir}/tarantool/1.6/box"
-%dir "%{_datadir}/tarantool/1.6/box/net"
-"%{_datadir}/tarantool/1.6/box/net/sql.lua"
+%dir "%{_datadir}/tarantool"
+%dir "%{_datadir}/tarantool/box"
+%dir "%{_datadir}/tarantool/box/net"
+"%{_datadir}/tarantool/box/net/sql.lua"
%files pg-module
%defattr(-,root,root,-)
-%dir "%{_libdir}/tarantool/1.6"
-%dir "%{_libdir}/tarantool/1.6/box"
-"%{_libdir}/tarantool/1.6/box/net/pg.so"
+%dir "%{_libdir}/tarantool"
+%dir "%{_libdir}/tarantool/box"
+"%{_libdir}/tarantool/box/net/pg.so"
%files mysql-module
%defattr(-,root,root,-)
-%dir "%{_libdir}/tarantool/1.6"
-%dir "%{_libdir}/tarantool/1.6/box"
-"%{_libdir}/tarantool/1.6/box/net/mysql.so"
+%dir "%{_libdir}/tarantool"
+%dir "%{_libdir}/tarantool/box"
+"%{_libdir}/tarantool/box/net/mysql.so"
%files sophia-module
%defattr(-,root,root,-)
-%dir "%{_libdir}/tarantool/1.6"
-%dir "%{_libdir}/tarantool/1.6/box"
-"%{_libdir}/tarantool/1.6/box/sophia.so"
+%dir "%{_libdir}/tarantool"
+%dir "%{_libdir}/tarantool/box"
+"%{_libdir}/tarantool/box/sophia.so"
%files dev
%defattr(-,root,root,-)
%dir "%{_includedir}/tarantool"
-%dir "%{_includedir}/tarantool/1.6"
-"%{_includedir}/tarantool/1.6/config.h"
-"%{_includedir}/tarantool/1.6/lauxlib.h"
-"%{_includedir}/tarantool/1.6/luaconf.h"
-"%{_includedir}/tarantool/1.6/lua.h"
-"%{_includedir}/tarantool/1.6/lua.hpp"
-"%{_includedir}/tarantool/1.6/luajit.h"
-"%{_includedir}/tarantool/1.6/lualib.h"
+%dir "%{_includedir}/tarantool"
+"%{_includedir}/tarantool/config.h"
+"%{_includedir}/tarantool/lauxlib.h"
+"%{_includedir}/tarantool/luaconf.h"
+"%{_includedir}/tarantool/lua.h"
+"%{_includedir}/tarantool/lua.hpp"
+"%{_includedir}/tarantool/luajit.h"
+"%{_includedir}/tarantool/lualib.h"
%changelog
* Wed Nov 13 2013 Tarantool Team <support@tarantool.org> 1.0-2
--
GitLab