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

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

1 files changed, 28 insertions, 3 deletions

diff --git a/redhat/libraries/kipi-plugins/kipi-plugins.spec b/redhat/libraries/kipi-plugins/kipi-plugins.spec
index a7fbe66a1..68bc75af8 100644
--- a/redhat/libraries/kipi-plugins/kipi-plugins.spec
+++ b/redhat/libraries/kipi-plugins/kipi-plugins.spec
@@ -22,7 +22,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 kipi-plugins
 %define tde_prefix /opt/trinity
@@ -79,7 +79,12 @@ BuildRequires: gettext
 BuildRequires: gcc-c++
 
 # JPEG support
-BuildRequires: libjpeg-devel
+%if 0%{?mdkver}
+%define libjpeg %{_lib}jpeg
+%else
+%define libjpeg libjpeg
+%endif
+BuildRequires: %{libjpeg}-devel
 
 # EXIV2
 %if 0%{?mgaversion} || 0%{?mdkversion}
@@ -95,8 +100,12 @@ BuildRequires:	libexiv2-devel
 # GPOD (ipod) support
 %if 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?rhel} == 8 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
 %define with_gpod 1
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}gpod-devel >= 0.4.2
+%else
 BuildRequires:	libgpod-devel >= 0.4.2
 %endif
+%endif
 
 # LCMS support
 %if 0%{?suse_version} || 0%{?rhel} >= 7
@@ -107,16 +116,28 @@ BuildRequires: lcms-devel
 
 # GPHOTO2 support
 %if 0%{?rhel} == 4 || 0%{?rhel} == 5 || 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}gphoto-devel
+%else
 BuildRequires:	gphoto2-devel
+%endif
 %else
 BuildRequires:	libgphoto2-devel
 %endif
 
 # TIFF support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}tiff-devel
+%else
 BuildRequires:	libtiff-devel
+%endif
 
 # XSLT support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}xslt-devel
+%else
 BuildRequires:	libxslt-devel
+%endif
 
 # MESA support
 %if 0%{?rhel} || 0%{?fedora}
@@ -127,9 +148,13 @@ BuildRequires: mesa-libGLU-devel
 %if 0%{?pclinuxos}
 BuildRequires: MesaGLU-devel
 %else
+%if 0%{?mdkver}
+BuildRequires: %{_lib}glu-devel
+%else
 BuildRequires: mesaglu-devel
 %endif
 %endif
+%endif
 %if 0%{?suse_version}
 BuildRequires: Mesa-libGL-devel
 BuildRequires: Mesa-libGLU-devel
@@ -201,7 +226,7 @@ PicasaWebExport:     Export pictures to Picasa web service
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
 %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
 %__make -f "admin/Makefile.common"