diff -rud upp-x11-src-9251-OLD/upp.spec upp-x11-src-9251/upp.spec
--- upp-x11-src-9251-OLD/upp.spec	2015-12-01 11:20:21.000000000 +0100
+++ upp-x11-src-9251/upp.spec	2016-12-22 18:04:10.000000000 +0100
@@ -4,6 +4,7 @@
 #define		version 5431
 #define		date $(LC_TIME=En date '+%a %b %d %Y')      
 %define		release 1
+%define		debug_package %{nil}
 
 %define		title     Ultimate++
 %define 	longtitle C++ cross-platform rapid application development suite
@@ -79,8 +80,8 @@
 
 sed -e "s@-I((INCLUDES))@@g" uppsrc/Makefile.in >uppsrc/Makefile
 
-make %{?_smp_mflags} \
-     -C uppsrc \
+# make %{?_smp_mflags} \
+make -C uppsrc \
      -e LIBPATH=$(pkg-config --libs-only-L x11 freetype2 gtk+-2.0 glib-2.0 cairo pango atk)     \
      -e CINC=" -I. $(pkg-config --cflags x11 freetype2 gtk+-2.0 glib-2.0 cairo pango atk)" \
      -e UPPOUT="$PWD/out/" \
@@ -99,14 +100,14 @@
 rm -rf %{buildroot}
 
 install -d %{buildroot}/%{_bindir}
-install -d %{buildroot}/%{_desktopdir}
+install -d %{buildroot}/%{_datadir}/applications
 install -d %{buildroot}/%{_datadir}/icons/hicolor/48x48/apps
 install -d %{buildroot}/%{_datadir}/pixmaps
 install -d %{buildroot}/%{_datadir}/%{name}
 
 install out/ide.out %{buildroot}/%{_bindir}/theide
 
-cp -p uppsrc/ide/theide.desktop %{buildroot}/%{_desktopdir}/theide.desktop
+cp -p uppsrc/ide/theide.desktop %{buildroot}/%{_datadir}/applications/theide.desktop
 cp -p uppsrc/ide/theide-48.png %{buildroot}/%{_datadir}/icons/hicolor/48x48/apps/theide.png
 cp -p uppsrc/ide/theide-48.png %{buildroot}/%{_datadir}/pixmaps/theide.png
 
@@ -166,7 +167,7 @@
 # %doc COPYING README INSTALL
 %doc uppsrc/ide/Copying
 %{_bindir}/theide
-%{_desktopdir}/theide.desktop
+%{_datadir}/applications/theide.desktop
 %{_datadir}/icons/hicolor/48x48/apps/theide.png
 %{_datadir}/pixmaps/theide.png
 %dir %{_datadir}/%{name}
diff -rud upp-x11-src-9251-OLD/uppsrc/Core/Core.h upp-x11-src-9251/uppsrc/Core/Core.h
--- upp-x11-src-9251-OLD/uppsrc/Core/Core.h	2015-11-29 15:17:07.000000000 +0100
+++ upp-x11-src-9251/uppsrc/Core/Core.h	2016-12-22 18:21:02.802202474 +0100
@@ -343,11 +343,11 @@
 //some global definitions
 
 #if !defined(STLPORT) && _MSC_VER < 1600
-inline UPP::int64  abs(UPP::int64 x)          { return x < 0 ? -x : x; }
+// inline UPP::int64  abs(UPP::int64 x)          { return x < 0 ? -x : x; }
 #endif
 
 #ifdef COMPILER_GCC
-inline double abs(double x)                   { return fabs(x); }
+// inline double abs(double x)                   { return fabs(x); }
 #endif
 
 void      RegisterTopic__(const char *topicfile, const char *topic, const char *title, const UPP::byte *data, int len);
diff -rud upp-x11-src-9251-OLD/uppsrc/CtrlCore/GtkDrawText.cpp upp-x11-src-9251/uppsrc/CtrlCore/GtkDrawText.cpp
--- upp-x11-src-9251-OLD/uppsrc/CtrlCore/GtkDrawText.cpp	2015-11-12 01:00:03.000000000 +0100
+++ upp-x11-src-9251/uppsrc/CtrlCore/GtkDrawText.cpp	2016-12-22 16:50:14.000000000 +0100
@@ -4,7 +4,8 @@
 
 #include <cairo/cairo-ft.h>
 
-#include <plugin/FT_fontsys/ftoutln.h>
+//#include <plugin/FT_fontsys/ftoutln.h>
+#include <freetype/ftoutln.h>
 
 NAMESPACE_UPP