Merge branch 'stable'

Conflicts: extra/rpm/tarantool.rpm.spec.in

Merge branch 'stable'
3a8f4ce4 · bigbes · 6d5d7e22 · 108319ef · 3a8f4ce4 · 3a8f4ce4
Commit 3a8f4ce4 authored 10 years ago by bigbes
--- a/.gitignore
+++ b/.gitignore
@@ -17,6 +17,9 @@ CPackConfig.cmake
 CPackSourceConfig.cmake
 Makefile
 RPM
+*.src.rpm
+*.i386.rpm
+*.x86_64.rpm
 tags
 extra/txt2c
 extra/bin2c

--- a/extra/rpm/tarantool.rpm.spec.in
+++ b/extra/rpm/tarantool.rpm.spec.in
@@ -30,6 +30,10 @@ BuildRequires: e2fsprogs-devel
 BuildRequires: libuuid-devel
 %endif

+%if 0%{?fedora} > 0
+BuildRequires: perl-podlators
+%endif
+
 Name: %{?scl_prefix}tarantool
 Version: @RPM_PACKAGE_VERSION@
 Release: @RPM_PACKAGE_RELEASE@