RPM: synchronize redhat directory with r14.1.x branch

Signed-off-by: François Andriot <albator78@libertysurf.fr>

1 files changed, 28 insertions, 8 deletions

diff --git a/redhat/core/tdebindings/tdebindings.spec b/redhat/core/tdebindings/tdebindings.spec
index 9f3bf5d1b..f194d330e 100644
--- a/redhat/core/tdebindings/tdebindings.spec
+++ b/redhat/core/tdebindings/tdebindings.spec
@@ -27,7 +27,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.1.0
+%define tde_version 14.1.2
 %endif
 %define tde_pkg tdebindings
 %define tde_prefix /opt/trinity
@@ -107,8 +107,12 @@ Requires:		evolution28-pango
 BuildRequires:	evolution28-atk-devel
 Requires:		evolution28-atk
 %else
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}gtk+2.0-devel
+%else
 BuildRequires:	gtk2-devel
 %endif
+%endif
 
 # XULRUNNER support
 %if 0%{?fedora} || 0%{?rhel} >= 5 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} >= 1220
@@ -119,7 +123,11 @@ BuildRequires: mozilla-xulrunner20-devel
 %endif
 
 # OPENSSL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}openssl-devel
+%else
 BuildRequires:	openssl-devel
+%endif
 
 # GTK1 support
 %if 0%{?fedora} || (0%{?rhel} >= 5 && 0%{?rhel} <= 7)
@@ -161,8 +169,12 @@ BuildRequires: mesa-libGL-devel
 BuildRequires: mesa-libGLU-devel
 %endif
 %if 0%{?mdkversion} || 0%{?mgaversion}
+%if 0%{?mdkver}
+BuildRequires: %{_lib}glu-devel
+%else
 BuildRequires: mesaglu-devel
 %endif
+%endif
 %if 0%{?suse_version}
 BuildRequires: Mesa-libGL-devel
 BuildRequires: Mesa-libGLU-devel
@@ -185,13 +197,13 @@ BuildRequires:	rubypick
 %endif
 
 # Check for Ruby library directory
-%if "%{?ruby_libarchdir}" != ""
+%if "%{?ruby_libarchdir}" != "" && "%{?ruby_libarchdir}" != "%{_libdir}/%{name}"
 %define ruby_arch %{?ruby_libarchdir}
 %else
 %if "%{?rb_archdir}" != ""
 %define ruby_arch %{?rb_archdir}
 %else
-%if "%{%ruby_archdir}" != ""
+%if "%{?ruby_archdir}" != ""
 %define ruby_arch %{?ruby_archdir}
 %else
 %{!?ruby_arch: %define ruby_arch %(ruby -rrbconfig -e 'puts Config::CONFIG["archdir"]' || ruby -rrbconfig -e 'puts RbConfig::CONFIG["archdir"]')}
@@ -686,7 +698,7 @@ This package is part of the official TDE bindings module.
 %defattr(-,root,root,-)
 %{python_sitearch}/pcop.la
 %{python_sitearch}/pcop.so
-%if 0%{?rhel} == 7 || 0%{?suse_version}
+%if 0%{?mdkver} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version}
 %{python_sitearch}/pydcop.py*
 %if 0%{?rhel} == 7
 %{python_sitearch}/__pycache__/pydcop.*.pyc
@@ -1076,6 +1088,10 @@ exit 2
 exit 3
 %endif
 
+%if 0%{?mdkver}
+touch config.h.in
+%endif
+
 # [tdebindings] Function 'rb_frame_this_func' does not exist in RHEL4/5
 %if 0%{?rhel} >= 4 && 0%{?rhel} <= 5
 %__sed -i "qtruby/rubylib/qtruby/Qt.cpp" \
@@ -1102,7 +1118,7 @@ exit 3
 %endif
 
 %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
 %__make -f "admin/Makefile.common"
 
 
@@ -1139,9 +1155,8 @@ EXTRA_INCLUDES="/usr/include/ruby-%{rb20_ver}:/usr/include/ruby-%{rb20_ver}/%{_t
 EXTRA_INCLUDES="/usr/include/ruby-%{rb_ver}:/usr/include/ruby-%{rb_ver}/%{_target}-gnu"
 %endif
 
-if [ -d "/usr/include/python3.6m" ]; then
-  EXTRA_INCLUDES="/usr/include/python3.6m:${EXTRA_INCLUDES}"
-fi
+# Force python version
+export PYTHON=%{__python}
 
 # Warning: GCC visibility causes FTBFS [Bug #1285]
 %configure \
@@ -1171,6 +1186,11 @@ fi
   %{?with_java:--with-java=%{java_home}} %{!?with_java:--without-java} \
   %{?with_qscintilla:--enable-qscintilla} %{!?with_qscintilla:--disable-qscintilla}
 
+# Ensure python was detected properly
+if grep "LIBPYTHON=''" "config.log"; then
+  exit 1
+fi
+
 # Build dcopperl with specific options
 pushd dcopperl
 CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL INSTALLDIRS=vendor INSTALLVENDORMAN3DIR=%{tde_mandir}/man3