Merge branch 'stable' of github.com:mailru/tarantool into stable

cmake/compiler.cmake

@@ -27,12 +27,12 @@ endif()
 if (CMAKE_COMPILER_IS_GNUCC)
     execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion
         OUTPUT_VARIABLE CC_VERSION)
-    if (CC_VERSION VERSION_GREATER 4.6 OR CC_VERSION VERSION_EQUAL 4.6)
+    if (CC_VERSION VERSION_GREATER 4.4.5 OR CC_VERSION VERSION_EQUAL 4.4.5)
         message(STATUS
-            "${CMAKE_C_COMPILER} version >= 4.6 -- ${CC_VERSION}")
+            "${CMAKE_C_COMPILER} version >= 4.4.5 -- ${CC_VERSION}")
     else()
         message (FATAL_ERROR
-            "${CMAKE_C_COMPILER} version should be >= 4.6 -- ${CC_VERSION}")
+            "${CMAKE_C_COMPILER} version should be >= 4.4.5 -- ${CC_VERSION}")
     endif()
 endif()
 

extra/tarantool.spec.in

@@ -75,6 +75,52 @@ mv "@CPACK_TOPLEVEL_DIRECTORY@/tmpBBroot" $RPM_BUILD_ROOT
 "/usr/local/bin/tarantool_multi.sh"
 "/usr/local/bin/tarantool_deploy.sh"
 "/etc/rc.d/init.d/tarantool_box"
+%dir "/usr/local/include/tarantool"
+"/usr/local/include/tarantool/tnt.h"
+"/usr/local/include/tarantool/tnt_buf.h"
+"/usr/local/include/tarantool/tnt_call.h"
+"/usr/local/include/tarantool/tnt_delete.h"
+"/usr/local/include/tarantool/tnt_dir.h"
+"/usr/local/include/tarantool/tnt_enc.h"
+"/usr/local/include/tarantool/tnt_insert.h"
+"/usr/local/include/tarantool/tnt_io.h"
+"/usr/local/include/tarantool/tnt_iob.h"
+"/usr/local/include/tarantool/tnt_iter.h"
+"/usr/local/include/tarantool/tnt_lex.h"
+"/usr/local/include/tarantool/tnt_log.h"
+"/usr/local/include/tarantool/tnt_mem.h"
+"/usr/local/include/tarantool/tnt_net.h"
+"/usr/local/include/tarantool/tnt_opt.h"
+"/usr/local/include/tarantool/tnt_ping.h"
+"/usr/local/include/tarantool/tnt_proto.h"
+"/usr/local/include/tarantool/tnt_queue.h"
+"/usr/local/include/tarantool/tnt_reply.h"
+"/usr/local/include/tarantool/tnt_request.h"
+"/usr/local/include/tarantool/tnt_rpl.h"
+"/usr/local/include/tarantool/tnt_select.h"
+"/usr/local/include/tarantool/tnt_snapshot.h"
+"/usr/local/include/tarantool/tnt_sql.h"
+"/usr/local/include/tarantool/tnt_stream.h"
+"/usr/local/include/tarantool/tnt_tuple.h"
+"/usr/local/include/tarantool/tnt_update.h"
+"/usr/local/include/tarantool/tnt_utf8.h"
+"/usr/local/include/tarantool/tnt_xlog.h"
+"/usr/local/lib/libtarantool.a"
+"/usr/local/lib/libtarantool.so"
+"/usr/local/lib/libtarantool.so.1"
+"/usr/local/lib/libtarantool.so.1.1"
+"/usr/local/lib/libtarantoolnet.a"
+"/usr/local/lib/libtarantoolnet.so"
+"/usr/local/lib/libtarantoolnet.so.1"
+"/usr/local/lib/libtarantoolnet.so.1.1"
+"/usr/local/lib/libtarantoolrpl.a"
+"/usr/local/lib/libtarantoolrpl.so"
+"/usr/local/lib/libtarantoolrpl.so.1"
+"/usr/local/lib/libtarantoolrpl.so.1.1"
+"/usr/local/lib/libtarantoolsql.a"
+"/usr/local/lib/libtarantoolsql.so"
+"/usr/local/lib/libtarantoolsql.so.1"
+"/usr/local/lib/libtarantoolsql.so.1.1"
 
 %config(noreplace) "/usr/local/etc/tarantool.cfg"
 

include/object.h

@@ -28,10 +28,11 @@
  * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-#include <objc/Object.h>
 #include <objc/runtime.h>
 
-@interface tnt_Object: Object
+@interface tnt_Object {
+	Class isa;
+}
 + (id) alloc;
 - (id) init;
 - (void) free;

test/unit/CMakeLists.txt

@@ -18,7 +18,7 @@ add_executable(bitset_index_test bitset_index.c)
 target_link_libraries(bitset_index_test bitset)
 
 add_executable(objc_finally objc_finally.m)
-include_directories(${LIBOBJC_INCLUDE_DIRS})
+include_directories(${LIBOBJC_INCLUDE_DIR})
 add_executable(objc_catchcxx objc_catchcxx.m)
 
 add_dependencies(objc_finally build_bundled_libs)