summaryrefslogtreecommitdiffstats
path: root/redhat/libraries
diff options
context:
space:
mode:
Diffstat (limited to 'redhat/libraries')
-rw-r--r--redhat/libraries/kipi-plugins/kipi-plugins.spec29
-rw-r--r--redhat/libraries/libkdcraw/libkdcraw.spec9
-rw-r--r--redhat/libraries/libkexiv2/libkexiv2.spec6
-rw-r--r--redhat/libraries/libkipi/libkipi.spec17
-rw-r--r--redhat/libraries/libksquirrel/libksquirrel.spec29
-rw-r--r--redhat/libraries/libtdeldap/libtdeldap.spec24
-rw-r--r--redhat/libraries/libtqt-perl/libtqt-perl.spec2
-rw-r--r--redhat/libraries/pytde/pytde.spec2
8 files changed, 104 insertions, 14 deletions
diff --git a/redhat/libraries/kipi-plugins/kipi-plugins.spec b/redhat/libraries/kipi-plugins/kipi-plugins.spec
index a134acca9..68bc75af8 100644
--- a/redhat/libraries/kipi-plugins/kipi-plugins.spec
+++ b/redhat/libraries/kipi-plugins/kipi-plugins.spec
@@ -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"
diff --git a/redhat/libraries/libkdcraw/libkdcraw.spec b/redhat/libraries/libkdcraw/libkdcraw.spec
index 49a4a8d6e..e881fc9b8 100644
--- a/redhat/libraries/libkdcraw/libkdcraw.spec
+++ b/redhat/libraries/libkdcraw/libkdcraw.spec
@@ -74,7 +74,12 @@ BuildRequires: lcms-devel
%endif
# JPEG support
-BuildRequires: libjpeg-devel
+%if 0%{?mdkver}
+%define libjpeg %{_lib}jpeg
+%else
+%define libjpeg libjpeg
+%endif
+BuildRequires: %{libjpeg}-devel
# AUTOTOOLS
%if 0%{?mgaversion} || 0%{?mdkversion}
@@ -168,7 +173,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/libraries/libkexiv2/libkexiv2.spec b/redhat/libraries/libkexiv2/libkexiv2.spec
index 8f7396530..c44f92c28 100644
--- a/redhat/libraries/libkexiv2/libkexiv2.spec
+++ b/redhat/libraries/libkexiv2/libkexiv2.spec
@@ -86,7 +86,11 @@ BuildRequires: libexiv2-devel
BuildRequires: libidn-devel
# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openssl-devel
+%else
BuildRequires: openssl-devel
+%endif
%description
@@ -149,7 +153,7 @@ Libkexif is a wrapper around Exiv2 library to manipulate pictures metadata.
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-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/libraries/libkipi/libkipi.spec b/redhat/libraries/libkipi/libkipi.spec
index 7beaeb1bb..38e0d979c 100644
--- a/redhat/libraries/libkipi/libkipi.spec
+++ b/redhat/libraries/libkipi/libkipi.spec
@@ -80,16 +80,29 @@ BuildRequires: lcms-devel
%endif
# JPEG support
-BuildRequires: libjpeg-devel
+%if 0%{?mdkver}
+%define libjpeg %{_lib}jpeg
+%else
+%define libjpeg libjpeg
+%endif
+BuildRequires: %{libjpeg}-devel
# 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
# CMAKE
BuildRequires: trinity-tde-cmake >= %{tde_version}
@@ -169,7 +182,7 @@ Homepage: http://www.kipi-plugins.org/
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
-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/libraries/libksquirrel/libksquirrel.spec b/redhat/libraries/libksquirrel/libksquirrel.spec
index ee02ee22e..8168d4711 100644
--- a/redhat/libraries/libksquirrel/libksquirrel.spec
+++ b/redhat/libraries/libksquirrel/libksquirrel.spec
@@ -92,20 +92,36 @@ BuildRequires: gettext
BuildRequires: gettext-devel
# OPENEXR support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}openexr-devel
+%else
BuildRequires: OpenEXR-devel
+%endif
# TIFF support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}tiff-devel
+%else
BuildRequires: libtiff-devel
+%endif
# GIF support
%if 0%{?suse_version} || 0%{?fedora} >= 28 || 0%{?rhel} >= 8
-BuildRequires: giflib-devel
+BuildRequires: giflib-devel
+%else
+%if 0%{?mdkver}
+BuildRequires: %{_lib}gif-devel
%else
-BuildRequires: libungif-devel
+BuildRequires: libungif-devel
+%endif
%endif
# MNG support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}mng-devel
+%else
BuildRequires: libmng-devel
+%endif
# DJVU support
%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
@@ -133,6 +149,9 @@ BuildRequires: librsvg2
BuildRequires: librsvg2-tools
%endif
%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mdkver}
+BuildRequires: %{_lib}rsvg2-devel
+%endif
BuildRequires: librsvg
%endif
%if 0%{?suse_version}
@@ -170,7 +189,11 @@ BuildRequires: freetype-devel
%endif
# WMF support
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
+BuildRequires: %{_lib}wmf-devel
+%else
BuildRequires: libwmf-devel
+%endif
# XML2 support
BuildRequires: libxml2-devel
@@ -554,7 +577,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/libraries/libtdeldap/libtdeldap.spec b/redhat/libraries/libtdeldap/libtdeldap.spec
index c3fe018b1..80c14f13b 100644
--- a/redhat/libraries/libtdeldap/libtdeldap.spec
+++ b/redhat/libraries/libtdeldap/libtdeldap.spec
@@ -77,17 +77,25 @@ BuildRequires: libtool-ltdl-devel
%endif
# SASL support
-%if 0%{?mageia} || 0%{?mandriva} || 0%{?pclinuxos}
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
+%if 0%{?mdkver}
+BuildRequires: %{_lib}sasl-devel
+%else
BuildRequires: %{_lib}sasl2-devel
%endif
+%endif
%if 0%{?suse_version}
BuildRequires: cyrus-sasl-devel
%endif
# 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
@@ -106,8 +114,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
@@ -118,13 +130,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
@@ -181,7 +201,7 @@ if [ -d "%{_libdir}/heimdal/lib/pkgconfig" ]; then
PKG_CONFIG_PATH="%{_libdir}/heimdal/lib/pkgconfig:${PKG_CONFIG_PATH}"
fi
-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/libraries/libtqt-perl/libtqt-perl.spec b/redhat/libraries/libtqt-perl/libtqt-perl.spec
index 3f7368276..38ad6cce6 100644
--- a/redhat/libraries/libtqt-perl/libtqt-perl.spec
+++ b/redhat/libraries/libtqt-perl/libtqt-perl.spec
@@ -122,7 +122,7 @@ It provides an object-oriented interface and is easy to use.
%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 -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"
diff --git a/redhat/libraries/pytde/pytde.spec b/redhat/libraries/pytde/pytde.spec
index bdef0096d..23c576859 100644
--- a/redhat/libraries/pytde/pytde.spec
+++ b/redhat/libraries/pytde/pytde.spec
@@ -93,7 +93,7 @@ from tdeio, tdejs, tdehtml and tdeprint.
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README
%{python_sitearch}/*.so
-%if 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version}
+%if 0%{?mdkver} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version}
%{python_sitearch}/dcopexport.py*
%{python_sitearch}/dcopext.py*
%{python_sitearch}/pytdeconfig.py*