Skip to content
Snippets Groups Projects
Commit f32ac8cb authored by Roman Tsisyk's avatar Roman Tsisyk
Browse files

Remove e2fs-tools/uuid-dev from dependencies

parent e84839ac
No related branches found
No related tags found
No related merge requests found
...@@ -23,7 +23,7 @@ before_script: ...@@ -23,7 +23,7 @@ before_script:
install: install:
- sudo apt-get update > /dev/null - sudo apt-get update > /dev/null
- sudo apt-get -q install binutils-dev python-daemon python-yaml uuid-dev - sudo apt-get -q install binutils-dev python-daemon python-yaml
- sudo apt-get -q install libmysqlclient-dev libpq-dev postgresql-server-dev-all - sudo apt-get -q install libmysqlclient-dev libpq-dev postgresql-server-dev-all
script: script:
......
...@@ -47,7 +47,6 @@ CMake is used for configuration management. ...@@ -47,7 +47,6 @@ CMake is used for configuration management.
The build depends on the following external libraries: The build depends on the following external libraries:
- libreadline and libreadline-dev - libreadline and libreadline-dev
- uuid and uuid-dev.
- GNU bfd (part of GNU binutils). - GNU bfd (part of GNU binutils).
Please follow these steps to compile Tarantool: Please follow these steps to compile Tarantool:
......
...@@ -7,8 +7,7 @@ Build-Depends: cdbs, debhelper (>= 8), ...@@ -7,8 +7,7 @@ Build-Depends: cdbs, debhelper (>= 8),
libncurses5-dev, libncurses5-dev,
libiberty-dev | binutils-dev, libiberty-dev | binutils-dev,
libmysqlclient-dev, libmysqlclient-dev,
libpq-dev, libpq-dev
uuid-dev
Section: database Section: database
Standards-Version: 3.9.5 Standards-Version: 3.9.5
Homepage: http://tarantool.org/ Homepage: http://tarantool.org/
......
...@@ -283,7 +283,6 @@ ones unless you intend to work on the documentation.</para> ...@@ -283,7 +283,6 @@ ones unless you intend to work on the documentation.</para>
<listitem><para>binutils-dev or binutils-devel # contains GNU bfd for printing stack traces</para></listitem> <listitem><para>binutils-dev or binutils-devel # contains GNU bfd for printing stack traces</para></listitem>
<listitem><para> gcc or clang # see above</para></listitem> <listitem><para> gcc or clang # see above</para></listitem>
<listitem><para> git # see above</para></listitem> <listitem><para> git # see above</para></listitem>
<listitem><para> uuid-dev # for uuid_* functions and replication</para></listitem>
<listitem><para> cmake # see above</para></listitem> <listitem><para> cmake # see above</para></listitem>
<listitem><para> libreadline-dev # for interactive mode</para></listitem> <listitem><para> libreadline-dev # for interactive mode</para></listitem>
<listitem><para> libncurses5-dev or ncurses-devel # see above</para></listitem> <listitem><para> libncurses5-dev or ncurses-devel # see above</para></listitem>
...@@ -459,7 +458,7 @@ the server (but not the documentation), and run tests after build. ...@@ -459,7 +458,7 @@ the server (but not the documentation), and run tests after build.
<para> <para>
To build with SUSE 13.1, the steps are as described above, except that the appropriate YaST2 package names are: To build with SUSE 13.1, the steps are as described above, except that the appropriate YaST2 package names are:
binutils-devel, libuuid-devel, cmake, ncurses-devel, lynx, jing, libxml2-devel, docbook_5, saxon, libxslt-devel. binutils-devel, cmake, ncurses-devel, lynx, jing, libxml2-devel, docbook_5, saxon, libxslt-devel.
The python connector can be installed with <code>sudo easy_install pip</code> and <code>sudo pip install tarantool</code>. The python connector can be installed with <code>sudo easy_install pip</code> and <code>sudo pip install tarantool</code>.
</para> </para>
......
...@@ -23,12 +23,6 @@ BuildRequires: gcc >= 4.5 ...@@ -23,12 +23,6 @@ BuildRequires: gcc >= 4.5
BuildRequires: binutils-devel BuildRequires: binutils-devel
%endif %endif
%if 0%{?rhel} < 6 && 0%{?rhel} > 0
BuildRequires: e2fsprogs-devel
%else
BuildRequires: libuuid-devel
%endif
%if 0%{?fedora} > 0 %if 0%{?fedora} > 0
BuildRequires: perl-podlators BuildRequires: perl-podlators
%endif %endif
...@@ -45,11 +39,6 @@ Vendor: tarantool.org ...@@ -45,11 +39,6 @@ Vendor: tarantool.org
License: BSD License: BSD
Requires: %{?scl_prefix}tarantool-debuginfo = @RPM_PACKAGE_VERSION@-@RPM_PACKAGE_RELEASE@ Requires: %{?scl_prefix}tarantool-debuginfo = @RPM_PACKAGE_VERSION@-@RPM_PACKAGE_RELEASE@
Requires: readline Requires: readline
%if 0%{?rhel} <= 5 && 0%{?rhel} > 0
Requires: e2fsprogs-libs
%else
Requires: libuuid
%endif
URL: http://tarantool.org URL: http://tarantool.org
Source0: @RPM_PACKAGE_SOURCE_FILE_NAME@ Source0: @RPM_PACKAGE_SOURCE_FILE_NAME@
%description %description
......
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