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

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

7 files changed, 86 insertions, 16 deletions

diff --git a/redhat/applications/misc/bibletime/bibletime.spec b/redhat/applications/misc/bibletime/bibletime.spec
index ad1fe5dcb..edb5ff5c9 100644
--- a/redhat/applications/misc/bibletime/bibletime.spec
+++ b/redhat/applications/misc/bibletime/bibletime.spec
@@ -23,7 +23,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 bibletime
 %define tde_prefix /opt/trinity
@@ -120,7 +120,7 @@ unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
 export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
 
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
   %__mkdir_p build
   cd build
 fi
diff --git a/redhat/applications/misc/fusion-icon/fusion-icon.spec b/redhat/applications/misc/fusion-icon/fusion-icon.spec
index e3f8bf5cb..986dec31c 100644
--- a/redhat/applications/misc/fusion-icon/fusion-icon.spec
+++ b/redhat/applications/misc/fusion-icon/fusion-icon.spec
@@ -1,6 +1,6 @@
 # Default version for this component
 %define tde_pkg fusion-icon
-%define tde_version 14.1.0
+%define tde_version 14.1.2
 
 %if "%{?python2_sitelib}" == ""
 %define python2_sitelib    %(python2 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")
diff --git a/redhat/applications/misc/kcmldap/kcmldap.spec b/redhat/applications/misc/kcmldap/kcmldap.spec
index 68af31207..b44904f44 100644
--- a/redhat/applications/misc/kcmldap/kcmldap.spec
+++ b/redhat/applications/misc/kcmldap/kcmldap.spec
@@ -18,7 +18,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 kcmldap
 %define tde_prefix /opt/trinity
@@ -72,13 +72,21 @@ BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
 # ACL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}acl-devel
+%else
 BuildRequires:	libacl-devel
+%endif
 
 # IDN support
 BuildRequires:	libidn-devel
 
 # OPENSSL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}openssl-devel
+%else
 BuildRequires:	openssl-devel
+%endif
 
 # SUSE desktop files utility
 %if 0%{?suse_version}
@@ -92,8 +100,12 @@ BuildRequires:	brp-check-trinity
 
 # OPENLDAP support
 %if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
+%if 0%{?mdkver}
+BuildRequires:	lib64ldap-devel
+%else
 BuildRequires:	openldap-devel
 %endif
+%endif
 %if 0%{?suse_version}
 BuildRequires:	openldap2-devel
 %endif
@@ -115,8 +127,12 @@ BuildRequires:	libheimdal-devel
 # UDEV support
 %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
 %define with_tdehwlib 1
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires:	%{_lib}udev-devel
+%else
 BuildRequires:	libudev-devel
 %endif
+%endif
 
 # LIBCOM_ERR support
 %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 6
@@ -152,6 +168,7 @@ This is a TDE control center module to manage TDE connections to Kerberos realms
 %dir %{tde_datadir}/pixmaps
 %{tde_datadir}/pixmaps/kcmldapbonding_step1.png
 %{tde_datadir}/pixmaps/kcmldapbonding_step3.png
+%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/kcmldap.mo
 
 ##########
 
@@ -186,7 +203,7 @@ unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
 export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
 
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
   %__mkdir_p build
   cd build
 fi
diff --git a/redhat/applications/misc/kcmldapcontroller/kcmldapcontroller.spec b/redhat/applications/misc/kcmldapcontroller/kcmldapcontroller.spec
index c99c0b685..cacb6565a 100644
--- a/redhat/applications/misc/kcmldapcontroller/kcmldapcontroller.spec
+++ b/redhat/applications/misc/kcmldapcontroller/kcmldapcontroller.spec
@@ -18,7 +18,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 kcmldapcontroller
 %define tde_prefix /opt/trinity
@@ -79,8 +79,12 @@ BuildRequires:	brp-check-trinity
 
 # OPENLDAP support
 %if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
+%if 0%{?mdkver}
+BuildRequires:	lib64ldap-devel
+%else
 BuildRequires:	openldap-devel
 %endif
+%endif
 %if 0%{?mgaversion} >= 6
 BuildRequires:  openldap-servers-devel
 %endif
@@ -105,8 +109,12 @@ BuildRequires:	libheimdal-devel
 # UDEV support
 %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
 %define with_tdehwlib 1
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires:	%{_lib}udev-devel
+%else
 BuildRequires:	libudev-devel
 %endif
+%endif
 
 # LIBCOM_ERR support
 %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 6
@@ -117,13 +125,21 @@ BuildRequires:	%{_lib}ext2fs-devel
 %endif
 
 # ACL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}acl-devel
+%else
 BuildRequires:	libacl-devel
+%endif
 
 # IDN support
 BuildRequires:	libidn-devel
 
 # OPENSSL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}openssl-devel
+%else
 BuildRequires:	openssl-devel
+%endif
 
 Requires:		trinity-kcontrol-ldap-controller = %{?epoch:%{epoch}:}%{version}-%{release}
 
@@ -146,7 +162,7 @@ This is a TDE control center module to manage users, groups, and machines in Ker
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING
 %{tde_bindir}/primaryrccertupdater
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?rhel} >= 7
+%if 0%{?fedora} || 0%{?mdkver} || 0%{?mgaversion} || 0%{?rhel} >= 7
 %{tde_libdir}/slapi-acl-manager.la
 %{tde_libdir}/slapi-acl-manager.so
 %endif
@@ -157,6 +173,7 @@ This is a TDE control center module to manage users, groups, and machines in Ker
 %dir %{tde_datadir}/pixmaps
 %{tde_datadir}/pixmaps/kcmldapcontroller_step1.png
 %{tde_datadir}/pixmaps/kcmldapcontroller_step4.png
+%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/kcmldapcontroller.mo
 
 ##########
 
@@ -180,7 +197,7 @@ unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
 export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
 
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
   %__mkdir_p build
   cd build
 fi
diff --git a/redhat/applications/misc/kcmldapmanager/kcmldapmanager.spec b/redhat/applications/misc/kcmldapmanager/kcmldapmanager.spec
index bbe317e3d..06875f9c1 100644
--- a/redhat/applications/misc/kcmldapmanager/kcmldapmanager.spec
+++ b/redhat/applications/misc/kcmldapmanager/kcmldapmanager.spec
@@ -18,7 +18,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 kcmldapmanager
 %define tde_prefix /opt/trinity
@@ -79,8 +79,12 @@ BuildRequires:	brp-check-trinity
 
 # OPENLDAP support
 %if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
+%if 0%{?mdkver}
+BuildRequires:	lib64ldap-devel
+%else
 BuildRequires:	openldap-devel
 %endif
+%endif
 %if 0%{?suse_version}
 BuildRequires:	openldap2-devel
 %endif
@@ -102,8 +106,12 @@ BuildRequires:	libheimdal-devel
 # UDEV support
 %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
 %define with_tdehwlib 1
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires:	%{_lib}udev-devel
+%else
 BuildRequires:	libudev-devel
 %endif
+%endif
 
 # LIBCOM_ERR support
 %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 6
@@ -114,13 +122,21 @@ BuildRequires:	%{_lib}ext2fs-devel
 %endif
 
 # ACL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}acl-devel
+%else
 BuildRequires:	libacl-devel
+%endif
 
 # IDN support
 BuildRequires:	libidn-devel
 
 # OPENSSL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}openssl-devel
+%else
 BuildRequires:	openssl-devel
+%endif
 
 Requires:		trinity-kcontrol-ldap-manager = %{?epoch:%{epoch}:}%{version}-%{release}
 
@@ -164,7 +180,7 @@ unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
 export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
 
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
   %__mkdir_p build
   cd build
 fi
diff --git a/redhat/applications/misc/kerberostray/kerberostray.spec b/redhat/applications/misc/kerberostray/kerberostray.spec
index 38e159c48..10ea73152 100644
--- a/redhat/applications/misc/kerberostray/kerberostray.spec
+++ b/redhat/applications/misc/kerberostray/kerberostray.spec
@@ -18,7 +18,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 kerberostray
 %define tde_prefix /opt/trinity
@@ -79,8 +79,12 @@ BuildRequires:	brp-check-trinity
 
 # OPENLDAP support
 %if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion}
+%if 0%{?mdkver}
+BuildRequires:	lib64ldap-devel
+%else
 BuildRequires:	openldap-devel
 %endif
+%endif
 %if 0%{?suse_version}
 BuildRequires:	openldap2-devel
 %endif
@@ -102,8 +106,12 @@ BuildRequires:	libheimdal-devel
 # UDEV support
 %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
 %define with_tdehwlib 1
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires:	%{_lib}udev-devel
+%else
 BuildRequires:	libudev-devel
 %endif
+%endif
 
 # LIBCOM_ERR support
 %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 6
@@ -114,13 +122,21 @@ BuildRequires:	%{_lib}ext2fs-devel
 %endif
 
 # ACL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}acl-devel
+%else
 BuildRequires:	libacl-devel
+%endif
 
 # IDN support
 BuildRequires:	libidn-devel
 
 # OPENSSL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}openssl-devel
+%else
 BuildRequires:	openssl-devel
+%endif
 
 
 %description
@@ -143,7 +159,7 @@ unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
 export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
 
-if ! rpm -E %%cmake|grep -q "cd build"; then
+if ! rpm -E %%cmake|grep -e 'cd build\|cd ${CMAKE_BUILD_DIR:-build}'; then
   %__mkdir_p build
   cd build
 fi
diff --git a/redhat/applications/misc/krecipes/krecipes.spec b/redhat/applications/misc/krecipes/krecipes.spec
index e2f5fa46d..d457bfd82 100644
--- a/redhat/applications/misc/krecipes/krecipes.spec
+++ b/redhat/applications/misc/krecipes/krecipes.spec
@@ -18,7 +18,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 krecipes
 %define tde_prefix /opt/trinity
@@ -86,8 +86,12 @@ BuildRequires: postgresql-server-devel
 BuildRequires: postgresql-devel
 %endif
 
-# SQLITE support
-BuildRequires:	sqlite-devel
+# SQLITE3 support
+%if 0%{?mgaversion}
+BuildRequires: sqlite3-devel
+%else
+BuildRequires: sqlite-devel
+%endif
 
 
 %description
@@ -109,7 +113,7 @@ databases.
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
 %__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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
 %__make -f "admin/Makefile.common"