RPM: initial support for OpenMandriva

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

redhat/Makefile

@@ -4,7 +4,7 @@ TDE_VERSION := $(shell echo $${TDE_VERSION:-14.1.2})
 TDE_GIT_DIR := $(shell cd ../..; pwd)
 TDE_PACKAGING_DIR := $(shell [ -n "$${TDE_PACKAGING_DIR}" ] && cd "$${TDE_PACKAGING_DIR}" || cd ..; pwd)
 RPMDIR := "$(shell rpm -E %{_rpmdir}.tde-$(TDE_VERSION))"
-DIST := $(shell rpm -E %dist)
+DIST := $(shell rpmdist.sh --dist)
 
 buildpkg = \
   @echo "Now processing '$(1)' [from $(TDE_PACKAGING_DIR)]."; \
@@ -144,7 +144,7 @@ ifneq (,$(filter $(DIST), .oss151 .oss152 .oss153 .oss154 .oss155 .oss156 .osstw
 endif
 
 htdig:
-ifneq (,$(filter $(DIST), .el7 .el8 .el9 .fc38 .fc39 .fc40 .mga6 .mga7 .mga8 .mga9 ))
+ifneq (,$(filter $(DIST), .el7 .el8 .el9 .fc38 .fc39 .fc40 .mga6 .mga7 .mga8 .mga9 .omv2490 .omv5000 ))
 	$(call buildpkg,extras/htdig)
 endif
 
@@ -506,7 +506,7 @@ qalculate-tde:
 	$(call buildpkg,applications/utilities/qalculate-tde)
 
 qt4-tqt-theme-engine: tdebase
-ifeq (,$(filter $(DIST),.el5 .el6 .el8 .el9 .oss153 .oss154 .oss155 .oss156 .osstw))
+ifeq (,$(filter $(DIST),.el5 .el6 .el8 .el9 .omv2490 .omv5000 .oss153 .oss154 .oss155 .oss156 .osstw))
 	$(call buildpkg,applications/themes/qt4-tqt-theme-engine)
 endif
 
@@ -630,7 +630,9 @@ twin-style-suse2: tdebase
 	$(call buildpkg,applications/themes/twin-style-suse2)
 
 wlassistant: tdebase
+ifeq (,$(filter $(DIST), .omv2490 .omv5000 ))
 	$(call buildpkg,applications/settings/wlassistant)
+endif
 
 yakuake: tdebase
 	$(call buildpkg,applications/system/yakuake)
@@ -657,7 +659,7 @@ fileshareset:
 	$(call buildpkg,extras/fileshareset)
 
 pinentry-tqt: tqtinterface
-ifeq (,$(filter $(DIST), .el5 .el6 .el7 ))
+ifeq (,$(filter $(DIST), .el5 .el6 .el7 .omv2490 .omv5000 ))
 	$(call buildpkg,extras/pinentry-tqt)
 endif
 

redhat/applications/development/kdbg/kdbg.spec

@@ -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

redhat/applications/development/kdiff3/kdiff3.spec

@@ -71,13 +71,21 @@ BuildRequires:	update-desktop-files
 %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
@@ -106,7 +114,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

redhat/applications/development/kpicosim/kpicosim.spec

@@ -70,10 +70,18 @@ BuildRequires:	fdupes
 BuildRequires:	libidn-devel
 
 # ACL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}acl-devel
+%else
 BuildRequires:	libacl-devel
+%endif
 
 # OPENSSL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}openssl-devel
+%else
 BuildRequires:	openssl-devel
+%endif
 
 # SUSE desktop files utility
 %if 0%{?suse_version}
@@ -110,7 +118,7 @@ simulator and export functions to VHDL, HEX and MEM files.
 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

redhat/applications/development/kscope/kscope.spec

@@ -129,7 +129,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

redhat/applications/development/ktechlab/ktechlab.spec

@@ -106,7 +106,7 @@ Homepage: http://ktechlab.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

redhat/applications/development/kxmleditor/kxmleditor.spec

@@ -113,7 +113,7 @@ Development files for KXMLEditor.
 
 
 %build
-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

redhat/applications/development/piklab/piklab.spec

@@ -80,7 +80,7 @@ BuildRequires:	brp-check-trinity
 BuildRequires:	readline-devel
 
 # LIBUSB support
-%if 0%{?mageia} || 0%{?mandriva} || 0%{?pclinuxos}
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?mdkver} || 0%{?pclinuxos}
 BuildRequires:  %{_lib}usb1.0-devel
 BuildRequires:  %{_lib}usb-compat0.1-devel
 %else
@@ -116,7 +116,7 @@ are supported. A command-line programmer and debugger are also available.
 %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"
 
 %build

redhat/applications/development/tdesvn/tdesvn.spec

@@ -88,7 +88,11 @@ BuildRequires: sqlite-devel
 BuildRequires:	libtqt3-mt-sqlite3
 
 # ACL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}acl-devel
+%else
 BuildRequires:	libacl-devel
+%endif
 
 # IDN support
 BuildRequires:	libidn-devel
@@ -101,7 +105,11 @@ BuildRequires:	gamin-devel
 %endif
 
 # OPENSSL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}openssl-devel
+%else
 BuildRequires:	openssl-devel
+%endif
 
 
 Requires:		%{name}-tdeio-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -261,7 +269,7 @@ unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
 export CMAKE_INCLUDE_PATH="%{tde_tdeincludedir}"
 
-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

redhat/applications/games/knights/knights.spec

@@ -67,13 +67,21 @@ BuildRequires:	pkgconfig
 BuildRequires:	libtool
 
 # 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}
@@ -121,7 +129,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

redhat/applications/games/tdepacman/tdepacman.spec

@@ -93,7 +93,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

redhat/applications/graphics/digikam/digikam.spec

@@ -70,7 +70,13 @@ BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
 
+# TIFF support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}tiff-devel
+%else
 BuildRequires:	libtiff-devel
+%endif
+
 BuildRequires:	gettext
 
 # SUSE desktop files utility
@@ -92,7 +98,11 @@ 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
@@ -324,7 +334,7 @@ Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 %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"
 
 

redhat/applications/graphics/gwenview-i18n/gwenview-i18n.spec

@@ -112,7 +112,7 @@ KIPI image framework.
 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

redhat/applications/graphics/gwenview/gwenview.spec

@@ -119,7 +119,7 @@ KIPI image framework.
 %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"
 
 

redhat/applications/graphics/ksquirrel/ksquirrel.spec

@@ -85,8 +85,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
@@ -118,7 +122,7 @@ OpenGL and dynamic format support.
 %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"
 
 

redhat/applications/graphics/potracegui/potracegui.spec

@@ -66,13 +66,21 @@ BuildRequires:	pkgconfig
 BuildRequires:	fdupes
 
 # 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}
@@ -110,7 +118,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

redhat/applications/internet/kasablanca/kasablanca.spec

@@ -78,13 +78,21 @@ BuildRequires:	brp-check-trinity
 %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
 
 # UTEMPTER support
 %if 0%{?suse_version}
@@ -129,7 +137,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

redhat/applications/internet/kbiff/kbiff.spec

@@ -69,13 +69,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}
@@ -112,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

redhat/applications/internet/kftpgrabber/kftpgrabber.spec

@@ -76,7 +76,11 @@ BuildRequires:	brp-check-trinity
 %endif
 
 # OPENSSL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}openssl-devel
+%else
 BuildRequires:	openssl-devel
+%endif
 
 
 %description
@@ -129,7 +133,7 @@ Requires: 	%{name} = %{version}-%{release}
 unset QTDIR QTINC QTDIR
 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

redhat/applications/internet/knmap/knmap.spec

@@ -68,13 +68,21 @@ BuildRequires:	pkgconfig
 BuildRequires:	libtool
 
 # 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}
@@ -123,7 +131,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

redhat/applications/internet/konversation/konversation.spec

@@ -66,13 +66,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
 
 # PYTHON support
 %global python python3
@@ -93,7 +101,12 @@ BuildRequires:	brp-check-trinity
 %endif
 
 # XSLT support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}xslt-devel
+%else
 BuildRequires:	libxslt-devel
+%endif
+
 %if 0%{?suse_version}
 BuildRequires:	docbook-xsl-stylesheets
 %else
@@ -199,7 +212,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

redhat/applications/internet/kopete-otr/kopete-otr.spec

@@ -83,8 +83,11 @@ BuildRequires:	brp-check-trinity
 %endif
 
 # OTR support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}otr-devel
+%else
 BuildRequires:	libotr-devel
-
+%endif
 
 %description
 This plugin enables Off-The-Record encryption for the TDE instant
@@ -110,7 +113,7 @@ unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
 export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_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

redhat/applications/internet/kshowmail/kshowmail.spec

@@ -77,13 +77,21 @@ BuildRequires:	brp-check-trinity
 %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
@@ -108,7 +116,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

redhat/applications/internet/kstreamripper/kstreamripper.spec

@@ -103,7 +103,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

redhat/applications/internet/ktorrent/ktorrent.spec

@@ -123,7 +123,7 @@ enabling background downloading.
 %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"
 
 

redhat/applications/internet/kvirc/kvirc.spec

@@ -143,7 +143,7 @@ with the K Desktop Environment version 3.
 
 
 %__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"
 ./autogen.sh
 
 

redhat/applications/internet/kvpnc/kvpnc.spec

@@ -67,13 +67,28 @@ BuildRequires:	pkgconfig
 BuildRequires:	fdupes
 
 # ACL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}acl-devel
+%else
 BuildRequires:	libacl-devel
+%endif
+
+# GCRYPT support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}gcrypt-devel >= 1.2.0
+%else
+BuildRequires:	libgcrypt-devel >= 1.2.0
+%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}
@@ -85,9 +100,6 @@ BuildRequires:	update-desktop-files
 BuildRequires:	brp-check-trinity
 %endif
 
-BuildRequires:	libgcrypt-devel >= 1.2.0
-
-
 %description
 KVpnc is a TDE frontend for various vpn clients.
 
@@ -116,7 +128,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

redhat/applications/internet/smb4k/smb4k.spec

@@ -150,7 +150,7 @@ Requires:		%{name} = %{version}-%{release}
 unset QTDIR QTINC QTLIB
 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

redhat/applications/internet/tork/tork.spec

@@ -80,7 +80,11 @@ BuildRequires:	brp-check-trinity
 BuildRequires:	torsocks
 
 # OPENSSL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}openssl-devel
+%else
 BuildRequires:	openssl-devel
+%endif
 
 # GEOIP
 %if 0%{?suse_version}
@@ -116,7 +120,7 @@ on the Tor network.
 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

redhat/applications/misc/bibletime/bibletime.spec

@@ -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

redhat/applications/misc/kcmldap/kcmldap.spec

@@ -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
@@ -187,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

redhat/applications/misc/kcmldapcontroller/kcmldapcontroller.spec

@@ -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
@@ -181,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

redhat/applications/misc/kcmldapmanager/kcmldapmanager.spec

@@ -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

redhat/applications/misc/kerberostray/kerberostray.spec

@@ -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

redhat/applications/misc/krecipes/krecipes.spec

@@ -113,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"
 
 

redhat/applications/multimedia/amarok/amarok.spec

@@ -72,7 +72,11 @@ BuildRequires:	pkgconfig
 BuildRequires:	gettext
 
 # ACL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}acl-devel
+%else
 BuildRequires:	libacl-devel
+%endif
 
 # SUSE desktop files utility
 %if 0%{?suse_version}
@@ -84,8 +88,12 @@ BuildRequires:	update-desktop-files
 BuildRequires:	brp-check-trinity
 %endif
 
-# ALSA support
-BuildRequires:	alsa-lib-devel
+# ALSA supportl
+%if 0%{?mdkver}
+BuildRequires: %{_lib}asound-devel
+%else
+BuildRequires: alsa-lib-devel
+%endif
 
 # ESOUND support
 #BuildRequires:	esound-devel
@@ -106,9 +114,15 @@ BuildRequires:	libusb-compat-0.1-devel
 BuildRequires:	libusb-devel
 %endif
 BuildRequires:	mysql-devel
-BuildRequires:	SDL-devel
 BuildRequires:	taglib-devel
 
+# SDL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}SDL-devel
+%else
+BuildRequires:	SDL-devel
+%endif
+
 # SQLITE3 support
 %if 0%{?mgaversion}
 BuildRequires: sqlite3-devel
@@ -159,13 +173,13 @@ BuildRequires:	trinity-dbus-tqt-devel >= 1:0.63
 %if 0%{?pclinuxos} == 0
 %if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_ifp 1
-BuildRequires:	libifp-devel
+BuildRequires:	%{_lib}ifp-devel
 %endif
 %endif
 
 # KARMA support
 %if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?pclinuxos} == 0
+%if 0%{?pclinuxos} == 0 && 0%{?mdkver} == 0
 %define with_karma 1
 BuildRequires:	libkarma-devel
 BuildRequires:	karma-sharp
@@ -181,20 +195,32 @@ BuildRequires:	libgpod-devel >= 0.4.2
 # MTP players
 %if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
 %define with_mtp 1
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}mtp-devel
+%else
 BuildRequires:	libmtp-devel
 %endif
+%endif
 
 # Creative Nomad Jukebox
 %if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} >= 1220
 %define with_njb 1
-BuildRequires:	libnjb-devel
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}njb-devel
+%else
+BuildRequires:	libmtp-devel
+%endif
 %endif
 
 # VISUAL support
 %if 0%{?rhel} >= 4 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
 %define with_libvisual 1
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}visual-devel
+%else
 BuildRequires:	libvisual-devel
 %endif
+%endif
 
 # MUSICBRAINZ support
 %if 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version}
@@ -242,8 +268,12 @@ BuildRequires: xine-lib-devel
 %endif
 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
 %define with_xine 1
+%if 0%{?mdkver}
+BuildRequires: %{_lib}xine-devel
+%else
 BuildRequires: %{_lib}xine1.2-devel
 %endif
+%endif
 %if 0%{?sle_version} && 0%{?sle_version} <= 150000
 %define with_xine 1
 BuildRequires: libxine-devel
@@ -262,9 +292,11 @@ BuildRequires:	trinity-akode-devel
 
 # MP4V2 support
 %if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
+%if 0%{?mdkver} == 0
 %define with_mp4v2 1
 BuildRequires:	libmp4v2-devel
 %endif
+%endif
 
 # ruby
 BuildRequires:	ruby
@@ -481,7 +513,7 @@ if [ -d /usr/X11R6 ]; then
   export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
 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

redhat/applications/multimedia/codeine/codeine.spec

@@ -81,8 +81,12 @@ BuildRequires:	brp-check-trinity
 %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?rhel} || 0%{?suse_version}
 %define with_xine 1
 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
+%if 0%{?mdkver}
+BuildRequires: %{_lib}xine-devel
+%else
 BuildRequires: %{_lib}xine1.2-devel
 %endif
+%endif
 %if 0%{?fedora} || 0%{?rhel}
 BuildRequires: xine-lib-devel
 %endif
@@ -114,7 +118,7 @@ Features:
 
 
 %build
-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

redhat/applications/multimedia/k3b-i18n/k3b-i18n.spec

@@ -351,7 +351,7 @@ This package contains the Ukrainian translations for K3B.
 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

redhat/applications/multimedia/k3b/k3b.spec

@@ -77,13 +77,26 @@ BuildRequires:	update-desktop-files
 BuildRequires:	brp-check-trinity
 %endif
 
-BuildRequires:	alsa-lib-devel
+# ALSA supportl
+%if 0%{?mdkver}
+BuildRequires: %{_lib}asound-devel
+%else
+BuildRequires: alsa-lib-devel
+%endif
+
 BuildRequires:	audiofile-devel
 BuildRequires:	gettext
-BuildRequires:	libvorbis-devel
 BuildRequires:	taglib-devel
 BuildRequires:	zlib-devel
 
+# VORBIS support
+%if 0%{?mdkver} || 0%{?mgaversion}
+%define libvorbis_devel %{_lib}vorbis-devel
+%else
+%define libvorbis_devel libvorbis-devel
+%endif
+BuildRequires: %{libvorbis_devel}
+
 # IDN support
 BuildRequires:	libidn-devel
 
@@ -95,13 +108,26 @@ BuildRequires:	gamin-devel
 %endif
 
 # OPENSSL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}openssl-devel
+%else
 BuildRequires:	openssl-devel
+%endif
 
 # ACL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}acl-devel
+%else
 BuildRequires:	libacl-devel
+%endif
 
 # ATTR support
-BuildRequires:	libattr-devel
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%define libattr_devel %{_lib}attr-devel
+%else
+%define libattr_devel libattr-devel
+%endif
+BuildRequires: %{libattr_devel}
 
 Requires(post): coreutils
 Requires(postun): coreutils
@@ -125,8 +151,12 @@ Requires:		cdrdao
 
 # UDEV support
 %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires:	%{_lib}udev-devel
+%else
 BuildRequires:	libudev-devel
 %endif
+%endif
 
 # HAL support
 %if 0%{?rhel} == 5
@@ -148,13 +178,21 @@ Requires:		trinity-dbus-tqt >= 1:0.63
 # SNDFILE support
 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 4
 %define with_sndfile 1
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires:	%{_lib}sndfile-devel
+%else
 BuildRequires:	libsndfile-devel
 %endif
+%endif
 
 # SAMPLERATE support
 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 4
 %define with_samplerate 1
-BuildRequires:	libsamplerate-devel
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires: %{_lib}samplerate-devel
+%else
+BuildRequires: libsamplerate-devel
+%endif
 %endif
 
 # DVDREAD support
@@ -230,8 +268,12 @@ BuildRequires:	ffmpeg-devel
 %if 0%{?fedora} == 0 || 0%{?fedora} <= 37
 # Looking for mpc_decoder_setup in mpcdec - not found
 %define with_musepack 1
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires:	%{_lib}mpcdec-devel
+%else
 BuildRequires:	libmpcdec-devel
 %endif
+%endif
 
 
 %description
@@ -434,7 +476,7 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
 RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -std=c++11"
 %endif
 
-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

redhat/applications/multimedia/k9copy/k9copy.spec

@@ -94,8 +94,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
@@ -140,7 +144,7 @@ if [ -d /usr/include/ffmpeg ]; then
   RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/include/ffmpeg"
 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

redhat/applications/multimedia/kaffeine-mozilla/kaffeine-mozilla.spec

@@ -73,8 +73,12 @@ BuildRequires:	desktop-file-utils
 %if 0%{?suse_version}
 BuildRequires:	mozilla-nspr-devel
 %else
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}nspr-devel
+%else
 BuildRequires:	nspr-devel
 %endif
+%endif
 
 %if 0%{?mgaversion} || 0%{?mdkversion}
 BuildRequires:	%{_lib}xaw-devel
@@ -107,7 +111,7 @@ if [ -d "%{_includedir}/nspr4" ]; then
   RPM_OPT_FLAGS="-I%{_includedir}/nspr4 ${RPM_OPT_FLAGS}"
 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
@@ -124,11 +128,7 @@ fi
   -DCMAKE_PROGRAM_PATH="%{tde_bindir}" \
   -DWITH_GCC_VISIBILITY=ON \
   \
-  -DCMAKE_INSTALL_PREFIX=%{tde_prefix} \
-  -DBIN_INSTALL_DIR=%{tde_bindir} \
-  -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
-  -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-  -DSHARE_INSTALL_PREFIX=%{tde_datadir} \
+  -DCMAKE_INSTALL_PREFIX=%{_prefix} \
   \
   ..
 

redhat/applications/multimedia/kaffeine/kaffeine.spec

@@ -79,13 +79,22 @@ BuildRequires:	brp-check-trinity
 %endif
 
 # VORBIS support
-BuildRequires:	libvorbis-devel
+%if 0%{?mdkver} || 0%{?mgaversion}
+%define libvorbis_devel %{_lib}vorbis-devel
+%else
+%define libvorbis_devel libvorbis-devel
+%endif
+BuildRequires: %{libvorbis_devel}
 
 # CDDA support
 BuildRequires:	libcdio-devel
 %if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}cdda-devel
+%else
 BuildRequires:	libcdda-devel
 %endif
+%endif
 %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
 BuildRequires:	cdparanoia
 BuildRequires:	cdparanoia-devel
@@ -134,9 +143,14 @@ BuildRequires:	%{_lib}xcb-devel
 %if 0%{?rhel} >= 5 || 0%{?suse_version} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_gstreamer 1
 %if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}gstreamer-devel
+BuildRequires:	%{_lib}gst-plugins-base1.0-devel
+%else
 BuildRequires:	%{_lib}gstreamer1.0-devel
 BuildRequires:	%{_lib}gstreamer-plugins-base1.0-devel
 %endif
+%endif
 %if 0%{?rhel} == 4
 BuildRequires:	gstreamer-devel
 BuildRequires:	gstreamer-plugins-devel
@@ -155,8 +169,12 @@ BuildRequires:	gstreamer1-plugins-base-devel >= 1.0
 %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?rhel} || 0%{?suse_version}
 %define with_xine 1
 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
+%if 0%{?mdkver}
+BuildRequires: %{_lib}xine-devel
+%else
 BuildRequires: %{_lib}xine1.2-devel
 %endif
+%endif
 %if 0%{?fedora} || 0%{?rhel}
 BuildRequires: xine-lib-devel
 %endif
@@ -283,7 +301,7 @@ Requires:		%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 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

redhat/applications/multimedia/kmplayer/kmplayer.spec

@@ -84,9 +84,14 @@ BuildRequires:	trinity-dbus-tqt-devel >= %{tde_version}
 
 # GSTREAMER support
 %if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}gstreamer-devel
+BuildRequires:	%{_lib}gst-plugins-base1.0-devel
+%else
 BuildRequires:	%{_lib}gstreamer1.0-devel
 BuildRequires:	%{_lib}gstreamer-plugins-base1.0-devel
 %endif
+%endif
 %if 0%{?rhel} == 4
 BuildRequires:	gstreamer-devel
 BuildRequires:	gstreamer-plugins-devel
@@ -104,8 +109,12 @@ BuildRequires:	gstreamer1-plugins-base-devel >= 1.0
 %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?rhel} || 0%{?suse_version}
 %define with_xine 1
 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
+%if 0%{?mdkver}
+BuildRequires: %{_lib}xine-devel
+%else
 BuildRequires: %{_lib}xine1.2-devel
 %endif
+%endif
 %if 0%{?fedora} || 0%{?rhel}
 BuildRequires: xine-lib-devel
 %endif
@@ -130,7 +139,11 @@ BuildRequires:	xorg-x11-libXv-devel
 %endif
 
 # GTK2 stuff
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}gtk+2.0-devel
+%else
 BuildRequires:	gtk2-devel
+%endif
 
 # DBUS stuff
 %if 0%{?suse_version}
@@ -282,7 +295,7 @@ unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
 export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_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

redhat/applications/multimedia/kplayer/kplayer.spec

@@ -70,10 +70,18 @@ BuildRequires:	libtool
 BuildRequires:	libidn-devel
 
 # ACL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}acl-devel
+%else
 BuildRequires:	libacl-devel
+%endif
 
 # OPENSSL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}openssl-devel
+%else
 BuildRequires:	openssl-devel
+%endif
 
 # SUSE desktop files utility
 %if 0%{?suse_version}
@@ -121,7 +129,7 @@ unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
 export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_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

redhat/applications/multimedia/mplayerthumbs/mplayerthumbs.spec

@@ -69,7 +69,11 @@ BuildRequires:	fdupes
 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}
@@ -114,7 +118,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

redhat/applications/multimedia/rosegarden/rosegarden.spec

@@ -81,28 +81,51 @@ BuildRequires:	brp-check-trinity
 %endif
 
 BuildRequires:	fftw-devel
-BuildRequires:	liblo-devel
 BuildRequires:	fontconfig-devel
 
+# LO support
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires:	%{_lib}lo-devel
+%else
+BuildRequires:	liblo-devel
+%endif
+
 # DSSI support
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version}
+%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
 BuildRequires:	dssi-devel
 %endif
 
 # LRDF support
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version}
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires:	%{_lib}lrdf-devel
+%endif
+%if 0%{?fedora} || 0%{?suse_version}
 BuildRequires:	liblrdf-devel
 %endif
 
+# LADSPA support
+%if 0%{?mdkver}
+BuildRequires:	ladspa-devel
+%endif
+
+# RAPTOR support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}raptor-devel
+%endif
+
 # JACK support
-%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mdkversion} || 0%{?mgaversion}
 BuildRequires:	%{_lib}jack-devel
 %else
 BuildRequires:	jack-audio-connection-kit-devel
 %endif
 
 # ACL support
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires:	%{_lib}acl-devel
+%else
 BuildRequires:	libacl-devel
+%endif
 
 # LIRC support
 %if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6
@@ -134,7 +157,11 @@ Requires:		libsndfile-utils
 %endif
 
 # OPENSSL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}openssl-devel
+%else
 BuildRequires:	openssl-devel
+%endif
 
 
 Requires:		%{name}-data = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -177,7 +204,7 @@ This package provides the data files necessary for running Rosegarden
 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

redhat/applications/multimedia/soundkonverter/soundkonverter.spec

@@ -80,8 +80,12 @@ BuildRequires:	taglib-devel
 
 # CDDA support
 %if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}cdda-devel
+%else
 BuildRequires:	libcdda-devel
 %endif
+%endif
 %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
 BuildRequires:	cdparanoia-devel
 %endif
@@ -130,7 +134,7 @@ See the 'trinity-soundkonverter' package for more information.
 %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"
 
 

redhat/applications/multimedia/tderadio/tderadio.spec

@@ -80,7 +80,12 @@ BuildRequires:	update-desktop-files
 BuildRequires:	brp-check-trinity
 %endif
 
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires:	%{_lib}sndfile-devel
+%else
 BuildRequires:	libsndfile-devel
+%endif
+
 %{?with_lirc:BuildRequires:	lirc-devel}
 
 # LAME support
@@ -154,7 +159,7 @@ unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
 export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_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
@@ -187,8 +192,6 @@ export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 %__make install DESTDIR=%{buildroot} -C build
 
-%find_lang %{tde_pkg}
-
 # Updates applications categories for openSUSE
 %if 0%{?suse_version}
 %suse_update_desktop_file -G "Radio Tuner" %{tde_pkg} AudioVideo Tuner
@@ -206,7 +209,7 @@ export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
 
 
-%files -f %{tde_pkg}.lang
+%files
 %defattr(-,root,root,-)
 %{tde_bindir}/convert-presets
 %{tde_bindir}/tderadio
@@ -223,6 +226,7 @@ export PATH="%{tde_bindir}:${PATH}"
 %{tde_datadir}/icons/hicolor/*/*/tderadio*.png
 %{tde_datadir}/icons/locolor/*/*/tderadio*.png
 %lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/*.mo
+%lang(es) %{tde_datadir}/locale/es/LC_MESSAGES/*.mo
 %lang(nl) %{tde_datadir}/locale/nl/LC_MESSAGES/*.mo
 %lang(pl) %{tde_datadir}/locale/pl/LC_MESSAGES/*.mo
 %lang(pt) %{tde_datadir}/locale/pt/LC_MESSAGES/*.mo

redhat/applications/office/basket/basket.spec

@@ -107,7 +107,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

redhat/applications/office/kbibtex/kbibtex.spec

@@ -68,19 +68,31 @@ 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
 
 # XSLT support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}xslt-devel
+%else
 BuildRequires:	libxslt-devel
+%endif
 
 # YAZ support
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?suse_version}
+%if 0%{?fedora} || 0%{?mdkver} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?suse_version}
 BuildRequires:	libyaz-devel
 %endif
 
@@ -115,7 +127,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

redhat/applications/office/kbookreader/kbookreader.spec

@@ -67,13 +67,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}
@@ -109,7 +117,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

redhat/applications/office/keximdb/keximdb.spec

@@ -73,10 +73,18 @@ BuildRequires:	libtool
 BuildRequires:	libidn-devel
 
 # ACL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}acl-devel
+%else
 BuildRequires:	libacl-devel
+%endif
 
 # OPENSSL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}openssl-devel
+%else
 BuildRequires:	openssl-devel
+%endif
 
 # SUSE desktop files utility
 %if 0%{?suse_version}
@@ -115,7 +123,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

redhat/applications/office/kile/kile.spec

@@ -155,7 +155,7 @@ unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
 export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_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

redhat/applications/office/kmymoney/kmymoney.spec

@@ -86,7 +86,13 @@ BuildRequires:	brp-check-trinity
 
 BuildRequires:	html2ps
 BuildRequires:	recode
+
+# OFX support
+%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
+BuildRequires:	%{_lib}ofx-devel
+%else
 BuildRequires:	libofx-devel
+%endif
 
 # OPENSP support
 %if 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?mdkversion}
@@ -204,7 +210,7 @@ This package contains development files needed for KMyMoney plugins.
 unset QTDIR QTLIB QTINC
 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

redhat/applications/office/knowit/knowit.spec

@@ -70,10 +70,18 @@ BuildRequires:	libtool
 BuildRequires:	libidn-devel
 
 # ACL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}acl-devel
+%else
 BuildRequires:	libacl-devel
+%endif
 
 # OPENSSL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}openssl-devel
+%else
 BuildRequires:	openssl-devel
+%endif
 
 # SUSE desktop files utility
 %if 0%{?suse_version}
@@ -109,7 +117,7 @@ but TDE-based, and requires Trinity.
 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

redhat/applications/office/koffice-i18n/koffice-i18n.spec

@@ -587,7 +587,7 @@ for l in . %{TDE_LANGS}; do
     pushd ${l}
   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
@@ -910,7 +910,6 @@ done
 %if "%( grep -w lv <<< '%{TDE_LANGS}' )" != ""
 %files Latvian
 %defattr(-,root,root,-)
-%{tde_datadir}/locale/lv
 %{tde_datadir}/locale/lv/*
 %endif
 

redhat/applications/office/koffice/koffice.spec

@@ -96,22 +96,65 @@ BuildRequires:	brp-check-trinity
 
 BuildRequires:	fontconfig-devel
 BuildRequires:	libart_lgpl-devel
-BuildRequires:	libtiff-devel
-BuildRequires:	libjpeg-devel
-BuildRequires:	ImageMagick-devel
 BuildRequires:	zlib-devel
-BuildRequires:	openssl-devel
 BuildRequires:	pcre-devel
 BuildRequires:	gettext-devel
 BuildRequires:	mysql-devel
 BuildRequires:	perl
 BuildRequires:	doxygen
 BuildRequires:	aspell-devel
-BuildRequires:	libxslt-devel
-BuildRequires:	OpenEXR-devel
-BuildRequires:	libexif-devel
 BuildRequires:	readline-devel
 
+# EXIF support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}exif-devel
+%else
+BuildRequires:	libexif-devel
+%endif
+
+# IMAGEMAGICK support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}magick-devel
+%else
+BuildRequires:	ImageMagick-devel
+%endif
+
+# JPEG support
+%if 0%{?mdkver}
+%define libjpeg %{_lib}jpeg
+%else
+%define libjpeg libjpeg
+%endif
+BuildRequires: %{libjpeg}-devel
+
+# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}openssl-devel
+%else
+BuildRequires:	openssl-devel
+%endif
+
+# 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
+
+# XSLT support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}xslt-devel
+%else
+BuildRequires:	libxslt-devel
+%endif
+
 # PYTHON support
 #  lib/kross/configure.in.in :
 #   WARNING: Building Kross python plugin is now prohibited at all times,
@@ -164,10 +207,10 @@ BuildRequires:	freetype-devel
 %endif
 
 # LIBPNG support
-%if 0%{?mgaversion}
+%if 0%{?mdkver} || 0%{?mgaversion}
 BuildRequires:	%{_lib}png-devel
 %endif
-%if 0%{?mdkversion} && 0%{?pclinuxos} == 0
+%if 0%{?mdkversion} && 0%{?mdkver} == 0 && 0%{?pclinuxos} == 0
 BuildRequires:	%{_lib}png15-devel
 %endif
 %if 0%{?suse_version} || 0%{?fedora} || 0%{?rhel}
@@ -181,9 +224,13 @@ BuildRequires:	libpng-devel
 BuildRequires:	GraphicsMagick >= 1.1.0
 %endif
 %if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora} || 0%{?rhel} >= 5 || 0%{?suse_version}
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}graphicsmagick-devel
+%else
 BuildRequires:	GraphicsMagick-devel >= 1.1.0
 %endif
 %endif
+%endif
 
 # UTEMPTER support
 %if 0%{?suse_version}
@@ -226,31 +273,45 @@ BuildRequires:	postgresql-server-devel
 %else
 BuildRequires:	postgresql-devel
 %endif
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}pqxx-devel
+%else
 BuildRequires:	libpqxx-devel
 %endif
 %endif
+%endif
 Obsoletes:		trinity-libpqxx < %{?epoch:%{epoch}:}%{version}-%{release}
 
 # WPD support
 #  For chalk and filters
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}wpd-devel
+%else
 BuildRequires:	libwpd-devel
+%endif
 Obsoletes:		trinity-libwpd < %{?epoch:%{epoch}:}%{version}-%{release}
 
 # WV2 support
 %if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mdkver} == 0
 BuildRequires:	%{_lib}wv2-devel
 %endif
+%endif
 %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
 BuildRequires:	wv2-devel
 %endif
 
 # MESA support
 %if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?pclinuxos} == 0
+%if 0%{?mdkver} == 0 && 0%{?pclinuxos} == 0
 BuildRequires:	%{_lib}mesagl-devel
 %endif
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}glu-devel
+%else
 BuildRequires:	%{_lib}mesaglu1-devel
 %endif
+%endif
 %if 0%{?fedora} || 0%{?rhel}
 BuildRequires:	libGL-devel
 BuildRequires:	libGLU-devel
@@ -1074,8 +1135,12 @@ This package is part of the TDE Office Suite.
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
+%if 0%{?mdkver}
+touch config.h.in
+%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/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
 %__make -f "admin/Makefile.common"
 
 

redhat/applications/office/kpilot/kpilot.spec

@@ -69,16 +69,28 @@ BuildRequires:	pkgconfig
 BuildRequires:	fdupes
 
 # ACL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}acl-devel
+%else
 BuildRequires:	libacl-devel
+%endif
 
 # ICAL support
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires:	%{_lib}ical-devel
+%else
 BuildRequires:	libical-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}
@@ -130,7 +142,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

redhat/applications/office/tellico/tellico.spec

@@ -110,7 +110,12 @@ BuildRequires:	%{_lib}yaz-devel
 BuildRequires:  libxml2-devel
 
 # XSLT support
-BuildRequires:  libxslt-devel
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}xslt-devel
+%else
+BuildRequires:	libxslt-devel
+%endif
+
 %if 0%{?rhel} == 4
 # a bogus dep in libexslt.la file from EL-4 (WONTFIX bug http://bugzilla.redhat.com/142241)
 BuildRequires:  libgcrypt-devel
@@ -145,13 +150,26 @@ BuildRequires:	gamin-devel
 %endif
 
 # OPENSSL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}openssl-devel
+%else
 BuildRequires:	openssl-devel
+%endif
 
 # ACL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}acl-devel
+%else
 BuildRequires:	libacl-devel
+%endif
 
 # ATTR support
-BuildRequires:	libattr-devel
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%define libattr_devel %{_lib}attr-devel
+%else
+%define libattr_devel libattr-devel
+%endif
+BuildRequires: %{libattr_devel}
 
 # PYTHON support
 %global python python3
@@ -301,7 +319,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

redhat/applications/settings/kima/kima.spec

@@ -80,14 +80,22 @@ BuildRequires:	brp-check-trinity
 # 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
 
 # IDN support
 BuildRequires:	libidn-devel
 
 # OPENSSL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}openssl-devel
+%else
 BuildRequires:	openssl-devel
+%endif
 
 
 %description
@@ -114,7 +122,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

redhat/applications/settings/kiosktool/kiosktool.spec

@@ -69,13 +69,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}
@@ -112,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

redhat/applications/settings/kkbswitch/kkbswitch.spec

@@ -66,16 +66,28 @@ 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
 
 # XKBFILES support
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires:	%{_lib}xkbfile-devel
+%else
 BuildRequires:	libxkbfile-devel
+%endif
 
 # SUSE desktop files utility
 %if 0%{?suse_version}
@@ -119,7 +131,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

redhat/applications/settings/klcddimmer/klcddimmer.spec

@@ -69,7 +69,11 @@ BuildRequires:	pkgconfig
 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}
@@ -104,7 +108,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

redhat/applications/settings/kmyfirewall/kmyfirewall.spec

@@ -178,7 +178,7 @@ Requires:		%{name} = %{version}-%{release}
 %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"
 
 

redhat/applications/settings/tde-guidance/tde-guidance.spec

@@ -183,7 +183,7 @@ or can be run as standalone applications.
 %{tde_datadir}/apps/guidance/
 %{tde_tdeappdir}/*.desktop
 %{tde_datadir}/icons/crystalsvg/*/*/*.png
-%if 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version}
+%if 0%{?mdkver} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version}
 %{python_sitelib}/tde-guidance/SMBShareSelectDialog.py*
 %{python_sitelib}/tde-guidance/SimpleCommandRunner.py*
 %{python_sitelib}/tde-guidance/fuser.py*
@@ -249,7 +249,7 @@ Guidance configuration tools.
 %files backends
 %defattr(-,root,root,-)
 %dir %{python_sitelib}/tde-guidance
-%if 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version}
+%if 0%{?mdkver} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version}
 %{python_sitelib}/tde-guidance/MicroHAL.py*
 %if 0%{?rhel} == 7
 %{python_sitelib}/tde-guidance/__pycache__/MicroHAL.*.pyc
@@ -283,7 +283,7 @@ suspend using HAL.
 %files powermanager
 %defattr(-,root,root,-)
 %{tde_bindir}/guidance-power-manager
-%if 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version}
+%if 0%{?mdkver} ||0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version}
 %{python_sitelib}/tde-guidance/MicroHAL.py*
 %{python_sitelib}/tde-guidance/guidance-power-manager.py*
 %{python_sitelib}/tde-guidance/powermanage.py*
@@ -343,7 +343,7 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
 
 export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I%{tde_tdeincludedir} -I%{tde_includedir}"
 
-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

redhat/applications/settings/tde-systemsettings/tde-systemsettings.spec

@@ -110,7 +110,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

redhat/applications/settings/tdenetworkmanager/tdenetworkmanager.spec

@@ -107,29 +107,45 @@ BuildRequires:	%{_lib}nm-util-devel
 %if 0%{?fedora} >= 29 || 0%{?rhel} >= 8
 BuildRequires:	NetworkManager-libnm-devel
 %else
+%if 0%{?mdkver}
+BuildRequires: %{_lib}nm-devel
+%else
 BuildRequires:	NetworkManager-glib-devel
 %endif
 %endif
 %endif
+%endif
 %if 0%{?suse_version}
 BuildRequires:	NetworkManager-devel
 Requires:		NetworkManager
 %endif
 
 # ACL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}acl-devel
+%else
 BuildRequires:	libacl-devel
+%endif
 
 # DBUS support
 BuildRequires:	trinity-dbus-1-tqt-devel >= 1:0.9
 BuildRequires:	trinity-dbus-tqt-devel >= 1:0.63
 
 # ACL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}acl-devel
+%else
 BuildRequires:	libacl-devel
+%endif
 
 # UDEV support
 %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires:	%{_lib}udev-devel
+%else
 BuildRequires:	libudev-devel
 %endif
+%endif
 
 # IDN support
 BuildRequires:	libidn-devel
@@ -142,7 +158,11 @@ BuildRequires:	gamin-devel
 %endif
 
 # OPENSSL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}openssl-devel
+%else
 BuildRequires:	openssl-devel
+%endif
 
 
 %description
@@ -209,7 +229,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

redhat/applications/settings/tdesudo/tdesudo.spec

@@ -66,13 +66,21 @@ BuildRequires:	pkgconfig
 BuildRequires:	fdupes
 
 # 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}
@@ -113,7 +121,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

redhat/applications/settings/wlassistant/wlassistant.spec

@@ -110,7 +110,11 @@ BuildRequires:	%{python}
 BuildRequires:	%{python}-devel
 
 # OPENSSL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}openssl-devel
+%else
 BuildRequires:	openssl-devel
+%endif
 
 
 %description
@@ -143,7 +147,7 @@ if [ -d "/usr/X11R6" ]; then
   export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
 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

redhat/applications/system/dolphin/dolphin.spec

@@ -68,13 +68,21 @@ BuildRequires:	pkgconfig
 BuildRequires:	libtool
 
 # 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}
@@ -109,7 +117,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

redhat/applications/system/katapult/katapult.spec

@@ -66,13 +66,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}
@@ -110,7 +118,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

redhat/applications/system/kbfx/kbfx.spec

@@ -91,10 +91,18 @@ BuildRequires:	gamin-devel
 BuildRequires:	pcre-devel
 
 # ACL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}acl-devel
+%else
 BuildRequires:	libacl-devel
+%endif
 
 # OPENSSL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}openssl-devel
+%else
 BuildRequires:	openssl-devel
+%endif
 
 
 %description
@@ -137,7 +145,7 @@ if [ -d "/usr/X11R6" ]; then
   export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
 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

redhat/applications/system/kcmautostart/kcmautostart.spec

@@ -66,13 +66,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}
@@ -109,7 +117,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

redhat/applications/system/kdbusnotification/kdbusnotification.spec

@@ -75,7 +75,11 @@ BuildRequires:	brp-check-trinity
 %endif
 
 # GTK2 stuff
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}gtk+2.0-devel
+%else
 BuildRequires:	gtk2-devel
+%endif
 
 # DBUS stuff
 %if 0%{?suse_version}
@@ -85,13 +89,21 @@ BuildRequires:	dbus-glib-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
@@ -123,7 +135,7 @@ if [ -r "/usr/include/harfbuzz/hb.h" ]; then
   RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/include/harfbuzz"
 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

redhat/applications/system/klamav/klamav.spec

@@ -83,7 +83,11 @@ BuildRequires:  clamav-devel
 Requires:		clamav
 
 # OPENSSL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}openssl-devel
+%else
 BuildRequires:	openssl-devel
+%endif
 
 
 %description
@@ -102,7 +106,7 @@ A TDE front-end for the Clam AntiVirus antivirus toolkit.
 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

redhat/applications/system/knemo/knemo.spec

@@ -89,28 +89,44 @@ Requires:		net-tools-deprecated
 %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
 
 # Wireless support
-%define with_wifi 1
+# Wifi support
 %if 0%{?fedora} >= 6 || 0%{?rhel} >= 5
-BuildRequires: wireless-tools-devel
+%define wifi_devel wireless-tools-devel
 %endif
 %if 0%{?mgaversion} == 2 || 0%{?mdkversion}
-BuildRequires:	%{_lib}iw29-devel
+%define wifi_devel %{_lib}iw29-devel
 %endif
 %if 0%{?rhel} == 5 || 0%{?suse_version}
-BuildRequires: wireless-tools
+%define wifi_devel wireless-tools
 %endif
 %if 0%{?suse_version} || 0%{?mgaversion} >= 3
-BuildRequires:	libiw-devel
+%define wifi_devel libiw-devel
 %endif
+%if 0%{?mdkver}
+%define wifi_devel %nil
+%endif
+%if "%{wifi_devel}" != ""
+%define with_wifi 1
+BuildRequires:	%{wifi_devel}
+%endif
+
 
 
 %description
@@ -141,7 +157,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

redhat/applications/system/knetload/knetload.spec

@@ -67,13 +67,21 @@ BuildRequires:	pkgconfig
 BuildRequires:	libtool
 
 # 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}
@@ -114,7 +122,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

redhat/applications/system/knetstats/knetstats.spec

@@ -67,13 +67,21 @@ BuildRequires:	pkgconfig
 BuildRequires:	libtool
 
 # 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}
@@ -109,7 +117,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

redhat/applications/system/kooldock/kooldock.spec

@@ -71,10 +71,18 @@ BuildRequires:	libtool
 BuildRequires:	libidn-devel
 
 # ACL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}acl-devel
+%else
 BuildRequires:	libacl-devel
+%endif
 
 # OPENSSL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}openssl-devel
+%else
 BuildRequires:	openssl-devel
+%endif
 
 # SUSE desktop files utility
 %if 0%{?suse_version}
@@ -118,7 +126,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

redhat/applications/system/krusader/krusader.spec

@@ -110,7 +110,7 @@ great on your desktop.
 %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"
 
 

redhat/applications/system/kshutdown/kshutdown.spec

@@ -66,13 +66,21 @@ BuildRequires:	pkgconfig
 BuildRequires:	fdupes
 
 # 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}
@@ -115,7 +123,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

redhat/applications/system/ksystemlog/ksystemlog.spec

@@ -103,7 +103,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

redhat/applications/system/kvkbd/kvkbd.spec

@@ -66,13 +66,21 @@ BuildRequires:	pkgconfig
 BuildRequires:	fdupes
 
 # 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}
@@ -108,7 +116,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

redhat/applications/system/polkit-agent-tde/polkit-agent-tde.spec

@@ -89,7 +89,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

redhat/applications/system/smartcardauth/smartcardauth.spec

@@ -163,7 +163,7 @@ in addition to the PKCS certificate functionality
 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

redhat/applications/system/tastymenu/tastymenu.spec

@@ -68,13 +68,21 @@ BuildRequires:	pkgconfig
 BuildRequires:	libtool
 
 # 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}
@@ -107,7 +115,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

redhat/applications/system/tdebluez/tdebluez.spec

@@ -68,7 +68,11 @@ BuildRequires:	pkgconfig
 BuildRequires:	libtool
 
 # ACL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}acl-devel
+%else
 BuildRequires:	libacl-devel
+%endif
 
 # IDN support
 BuildRequires:	libidn-devel
@@ -208,7 +212,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

redhat/applications/system/tdedocker/tdedocker.spec

@@ -66,16 +66,28 @@ 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
 
 # XKBFILES support
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires:	%{_lib}xkbfile-devel
+%else
 BuildRequires:	libxkbfile-devel
+%endif
 
 # XMU support
 %if 0%{?suse_version} == 1140
@@ -85,7 +97,7 @@ BuildRequires:	xorg-x11-libXmu-devel
 BuildRequires: libXmu-devel
 %endif
 %if 0%{?mdkversion} || 0%{?mgaversion} >= 4
-BuildRequires: libxmu-devel
+BuildRequires: %{_lib}xmu-devel
 %endif
 %if 0%{?mgaversion} == 2 || 0%{?mgaversion} == 3
 BuildRequires:	%{_lib}xmu%{?mgaversion:6}-devel
@@ -136,7 +148,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
@@ -190,7 +202,6 @@ export PATH="%{tde_bindir}:${PATH}"
 %{tde_tdeappdir}/tdedocker.desktop
 %{tde_datadir}/apps/tdedocker/
 %{tde_datadir}/icons/hicolor/*/apps/tdedocker.png
-%{tde_datadir}/apps/tdedocker/icons/question.png
 %{tde_mandir}/man1/tdedocker.1*
 
 

redhat/applications/system/tdepowersave/tdepowersave.spec

@@ -82,8 +82,12 @@ BuildRequires:	brp-check-trinity
 # 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
 
 # XSCREENSAVER support
 #  Disabled on RHEL4
@@ -111,7 +115,11 @@ BuildRequires:	xscreensaver
 %endif
 
 # ACL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}acl-devel
+%else
 BuildRequires:	libacl-devel
+%endif
 
 # IDN support
 BuildRequires:	libidn-devel
@@ -124,7 +132,11 @@ BuildRequires:	gamin-devel
 %endif
 
 # OPENSSL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}openssl-devel
+%else
 BuildRequires:	openssl-devel
+%endif
 
 
 Obsoletes:		trinity-kpowersave < %{?epoch:%{epoch}:}%{version}-%{release}
@@ -179,7 +191,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

redhat/applications/system/tdesshaskpass/tdesshaskpass.spec

@@ -66,13 +66,21 @@ BuildRequires:	pkgconfig
 BuildRequires:	fdupes
 
 # 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}
@@ -110,7 +118,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

redhat/applications/system/yakuake/yakuake.spec

@@ -66,13 +66,21 @@ BuildRequires:	pkgconfig
 BuildRequires:	fdupes
 
 # 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}
@@ -105,7 +113,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

redhat/applications/tdeio/tdeio-appinfo/tdeio-appinfo.spec

@@ -67,13 +67,21 @@ BuildRequires:	pkgconfig
 BuildRequires:	fdupes
 
 # 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}
@@ -110,7 +118,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

redhat/applications/tdeio/tdeio-apt/tdeio-apt.spec

@@ -66,7 +66,11 @@ BuildRequires:	pkgconfig
 BuildRequires:	fdupes
 
 # ACL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}acl-devel
+%else
 BuildRequires:	libacl-devel
+%endif
 
 # IDN support
 BuildRequires:	libidn-devel
@@ -108,7 +112,7 @@ browsing the packages easier. It provides:
 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

redhat/applications/tdeio/tdeio-ftps/tdeio-ftps.spec

@@ -67,13 +67,21 @@ BuildRequires:	pkgconfig
 BuildRequires:	fdupes
 
 # 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}
@@ -111,7 +119,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

redhat/applications/tdeio/tdeio-gopher/tdeio-gopher.spec

@@ -67,7 +67,11 @@ BuildRequires:	pkgconfig
 BuildRequires:	fdupes
 
 # ACL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}acl-devel
+%else
 BuildRequires:	libacl-devel
+%endif
 
 # IDN support
 BuildRequires:	libidn-devel
@@ -107,7 +111,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

redhat/applications/tdeio/tdeio-locate/tdeio-locate.spec

@@ -77,7 +77,11 @@ BuildRequires:	brp-check-trinity
 %endif
 
 # ACL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}acl-devel
+%else
 BuildRequires:	libacl-devel
+%endif
 
 # IDN support
 BuildRequires:	libidn-devel
@@ -90,7 +94,11 @@ BuildRequires:	gamin-devel
 %endif
 
 # OPENSSL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}openssl-devel
+%else
 BuildRequires:	openssl-devel
+%endif
 
 Obsoletes:		trinity-kio-locate < %{?epoch:%{epoch}:}%{version}-%{release}
 Provides:		trinity-kio-locate = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -123,7 +131,7 @@ unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
 export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_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

redhat/applications/tdeio/tdeio-sword/tdeio-sword.spec

@@ -72,13 +72,21 @@ BuildRequires:	pkgconfig
 BuildRequires:	fdupes
 
 # 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}
@@ -121,7 +129,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

redhat/applications/tdeio/tdeio-umountwrapper/tdeio-umountwrapper.spec

@@ -71,13 +71,21 @@ BuildRequires:	pkgconfig
 BuildRequires:	fdupes
 
 # 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}
@@ -113,7 +121,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

redhat/applications/themes/gtk-qt-engine/gtk-qt-engine.spec

@@ -79,9 +79,13 @@ BuildRequires:	%{_lib}gtk+2.0-devel
 %if 0%{?pclinuxos}
 BuildRequires:	%{_lib}gtk+2.0_0-devel
 %else
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}gtk+2.0-devel
+%else
 BuildRequires:	gtk+2.0-devel
 %endif
 %endif
+%endif
 
 # SUSE desktop files utility
 %if 0%{?suse_version}
@@ -122,7 +126,7 @@ unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
 export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_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

redhat/applications/themes/gtk3-tqt-engine/gtk3-tqt-engine.spec

@@ -131,7 +131,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

redhat/applications/themes/kgtk-qt3/kgtk-qt3.spec

@@ -84,8 +84,12 @@ BuildRequires:	libidn-devel
 %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
 BuildRequires:	gtk2-devel
 %else
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}gtk+2.0-devel
+%else
 BuildRequires:	gtk+2.0-devel
 %endif
+%endif
 
 # GAMIN support
 #  Not on openSUSE.
@@ -95,10 +99,18 @@ BuildRequires:	gamin-devel
 %endif
 
 # ACL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}acl-devel
+%else
 BuildRequires:	libacl-devel
+%endif
 
 # OPENSSL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}openssl-devel
+%else
 BuildRequires:	openssl-devel
+%endif
 
 
 %description
@@ -128,7 +140,7 @@ unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
 export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_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

redhat/applications/themes/ksplash-engine-moodin/ksplash-engine-moodin.spec

@@ -70,7 +70,11 @@ BuildRequires:	fdupes
 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}
@@ -119,7 +123,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

redhat/applications/themes/tde-style-baghira/tde-style-baghira.spec

@@ -67,8 +67,14 @@ BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
 
+# JPEG support
+%if 0%{?mdkver}
+%define libjpeg %{_lib}jpeg
+%else
+%define libjpeg libjpeg
+%endif
 %if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version}
-BuildRequires:          libjpeg-devel
+BuildRequires:          %{libjpeg}-devel
 %else
 BuildRequires:          jpeg-devel
 %endif
@@ -92,7 +98,7 @@ Panther and Jaguar looks, and also includes its own 'Baghira' look
 
 
 %build
-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

redhat/applications/themes/tde-style-domino/tde-style-domino.spec

@@ -67,10 +67,16 @@ BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
 
+# JPEG support
+%if 0%{?mdkver}
+%define libjpeg %{_lib}jpeg
+%else
+%define libjpeg libjpeg
+%endif
 %if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version}
-BuildRequires:          libjpeg-devel
+BuildRequires:	%{libjpeg}-devel
 %else
-BuildRequires:          jpeg-devel
+BuildRequires:	jpeg-devel
 %endif
 
 %description
@@ -88,7 +94,7 @@ of the widgets by customizable color gradients.
 
 
 %build
-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

redhat/applications/themes/tde-style-ia-ora/tde-style-ia-ora.spec

@@ -66,13 +66,21 @@ BuildRequires:	pkgconfig
 BuildRequires:	libtool
 
 # 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-twin
 
@@ -96,7 +104,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

redhat/applications/themes/tde-style-lipstik/tde-style-lipstik.spec

@@ -84,7 +84,11 @@ BuildRequires:	brp-check-trinity
 BuildRequires:	libidn-devel
 
 # OPENSSL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}openssl-devel
+%else
 BuildRequires:	openssl-devel
+%endif
 
 
 %description
@@ -111,7 +115,7 @@ Lipstik also provides Lipstik-color-schemes
 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

redhat/applications/themes/tde-style-polyester/tde-style-polyester.spec

@@ -67,10 +67,16 @@ BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
 
+# JPEG support
+%if 0%{?mdkver}
+%define libjpeg %{_lib}jpeg
+%else
+%define libjpeg libjpeg
+%endif
 %if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version}
-BuildRequires:          libjpeg-devel
+BuildRequires:	%{libjpeg}-devel
 %else
-BuildRequires:          jpeg-devel
+BuildRequires:	jpeg-devel
 %endif
 
 %description
@@ -88,7 +94,7 @@ of the widgets by customizable color gradients.
 
 
 %build
-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

redhat/applications/themes/tde-style-qtcurve/tde-style-qtcurve.spec

@@ -81,7 +81,11 @@ BuildRequires:	brp-check-trinity
 BuildRequires:	libidn-devel
 
 # ACL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}acl-devel
+%else
 BuildRequires:	libacl-devel
+%endif
 
 # GAMIN support
 #  Not on openSUSE.
@@ -91,7 +95,11 @@ BuildRequires:	gamin-devel
 %endif
 
 # OPENSSL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}openssl-devel
+%else
 BuildRequires:	openssl-devel
+%endif
 
 
 Obsoletes:		trinity-kde-style-qtcurve < %{?epoch:%{epoch}:}%{version}-%{release}
@@ -137,7 +145,7 @@ fi
 %__rm -f "po/tr.po"
 %endif
 
-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

redhat/applications/themes/tdmtheme/tdmtheme.spec

@@ -67,13 +67,21 @@ BuildRequires:	pkgconfig
 BuildRequires:	fdupes
 
 # 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}
@@ -110,7 +118,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

redhat/applications/themes/twin-style-crystal/twin-style-crystal.spec

@@ -105,7 +105,7 @@ And it is of course nice to look at. Upstream says:
 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

redhat/applications/themes/twin-style-dekorator/twin-style-dekorator.spec

@@ -103,7 +103,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

redhat/applications/themes/twin-style-fahrenheit/twin-style-fahrenheit.spec

@@ -102,7 +102,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

redhat/applications/themes/twin-style-machbunt/twin-style-machbunt.spec

@@ -100,7 +100,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

redhat/applications/themes/twin-style-suse2/twin-style-suse2.spec

@@ -102,7 +102,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

redhat/applications/utilities/abakus/abakus.spec

@@ -68,7 +68,11 @@ BuildRequires:	bison
 BuildRequires:	flex
 
 # ACL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}acl-devel
+%else
 BuildRequires:	libacl-devel
+%endif
 
 # IDN support
 BuildRequires:	libidn-devel
@@ -81,7 +85,11 @@ BuildRequires:	gamin-devel
 %endif
 
 # OPENSSL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}openssl-devel
+%else
 BuildRequires:	openssl-devel
+%endif
 
 # SUSE desktop files utility
 %if 0%{?suse_version}
@@ -121,7 +129,7 @@ if [ -d "/usr/X11R6" ]; then
   export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
 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

redhat/applications/utilities/filelight/filelight.spec

@@ -76,13 +76,26 @@ BuildRequires:	gamin-devel
 %endif
 
 # OPENSSL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}openssl-devel
+%else
 BuildRequires:	openssl-devel
+%endif
 
 # ACL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}acl-devel
+%else
 BuildRequires:	libacl-devel
+%endif
 
 # ATTR support
-BuildRequires:	libattr-devel
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%define libattr_devel %{_lib}attr-devel
+%else
+%define libattr_devel libattr-devel
+%endif
+BuildRequires: %{libattr_devel}
 
 # SUSE desktop files utility
 %if 0%{?suse_version}
@@ -117,7 +130,7 @@ directories on your computer.
 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

redhat/applications/utilities/kbarcode/kbarcode.spec

@@ -69,13 +69,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
 
 # PCRE support
 BuildRequires:	pcre-devel
@@ -163,7 +171,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

redhat/applications/utilities/kchmviewer/kchmviewer.spec

@@ -84,13 +84,21 @@ BuildRequires:	chmlib-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
 KchmViewer is a chm (MS HTML help file format) viewer, written in C++.
@@ -131,7 +139,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

redhat/applications/utilities/kcpuload/kcpuload.spec

@@ -70,7 +70,11 @@ BuildRequires:	pkgconfig
 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}
@@ -110,7 +114,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

redhat/applications/utilities/kdirstat/kdirstat.spec

@@ -67,13 +67,21 @@ BuildRequires:	pkgconfig
 BuildRequires:	libtool
 
 # 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}
@@ -115,7 +123,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

redhat/applications/utilities/keep/keep.spec

@@ -78,13 +78,21 @@ BuildRequires:	brp-check-trinity
 %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:		rdiff-backup
 
@@ -114,7 +122,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

redhat/applications/utilities/knutclient/knutclient.spec

@@ -67,13 +67,21 @@ BuildRequires:	pkgconfig
 BuildRequires:	fdupes
 
 # 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}
@@ -114,7 +122,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
@@ -171,8 +179,7 @@ fi
 %doc AUTHORS ChangeLog COPYING README.md
 %{tde_bindir}/knutclient
 %{tde_tdeappdir}/knutclient.desktop
-%{tde_datadir}/apps/knutclient/knutclientui.rc
-%{tde_datadir}/apps/knutclient
+%{tde_datadir}/apps/knutclient/
 %{tde_tdedocdir}/HTML/cs/knutclient
 %{tde_tdedocdir}/HTML/en/knutclient
 %{tde_datadir}/icons/hicolor/*/apps/*.png

redhat/applications/utilities/kommando/kommando.spec

@@ -103,7 +103,7 @@ if [ -d "/usr/X11R6" ]; then
   export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
 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

redhat/applications/utilities/kompose/kompose.spec

@@ -103,7 +103,7 @@ by a scaled screen shot of it. It appears as a panel applet.
 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

redhat/applications/utilities/krename/krename.spec

@@ -69,10 +69,18 @@ BuildRequires:	fdupes
 BuildRequires:	libidn-devel
 
 # ACL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}acl-devel
+%else
 BuildRequires:	libacl-devel
+%endif
 
 # OPENSSL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}openssl-devel
+%else
 BuildRequires:	openssl-devel
+%endif
 
 # SUSE desktop files utility
 %if 0%{?suse_version}
@@ -108,7 +116,7 @@ or Exif informations of an image.
 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

redhat/applications/utilities/ksensors/ksensors.spec

@@ -70,7 +70,11 @@ BuildRequires:	fdupes
 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}
@@ -116,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

redhat/applications/utilities/mathemagics/mathemagics.spec

@@ -78,7 +78,7 @@ Mathemagics is a RPN Calculator.
 
 
 %build
-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

redhat/applications/utilities/qalculate-tde/qalculate-tde.spec

@@ -66,7 +66,11 @@ BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
 
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires:	%{_lib}qalculate-devel >= 0.9.6
+%else
 BuildRequires:	libqalculate-devel >= 0.9.6
+%endif
 
 %if 0%{?suse_version} == 1330 || 0%{?suse_version} >= 1500 || 0%{?rhel}
 BuildRequires:	cln-devel
@@ -114,7 +118,7 @@ This package contains the TDE user interface of qalculate.
 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

redhat/build/build_rpm_package.sh

@@ -25,6 +25,11 @@ LOGFILE="${TMPPATH}/log.${PKGNAME##*/}"
 
 export TEMPDIR="$(mktemp -d)"
 gather_rpm_sources.sh "${PKGNAME}" "${TDE_VERSION}" "${TEMPDIR}"
+specfile="${TEMPDIR}/${SPECFILE##*/}"
+
+if [ "${DIST}" = ".omv2490" ]; then
+  sed -i "${specfile}" -e "s|^%patch|%patch |"
+fi
 
 [ -d "${BUILDDIR}" ] || mkdir -p "${BUILDDIR}"
 
@@ -47,7 +52,7 @@ rpmbuild -ba \
   --define "prevers${PREVERSION:+ion} ${PREVERSION:-0}" \
   --define "tde_patch 1" \
   --define "with_mpeg 1" \
-  "${TEMPDIR}/${SPECFILE##*/}"
+  "${specfile}"
 RET=$?
 
 # Removes BUILDDIR if build succeeded

redhat/build/configure_repository.sh

@@ -8,7 +8,7 @@ RPMDIR=$(rpm -E %{_rpmdir}.tde-${TDE_VERSION})
 [ -d "${RPMDIR}/${ARCH}" ] || mkdir -p "${RPMDIR}/${ARCH}"
 
 # RHEL / CentOS / Fedora
-if [ -x /usr/bin/yum ]; then
+if [ -x "/usr/bin/dnf" ] || [ -x "/usr/bin/yum" ]; then
   cat <<EOF >/tmp/rpmbuild-tde.repo
 [rpmbuild.${ARCH}]
 name=rpmbuild.${ARCH}

redhat/build/gather_rpm_sources.sh

@@ -7,7 +7,7 @@ PKGNAME="${1%/}"
 PKGNAME="${PKGNAME##*/}"
 TDE_VERSION="${2:-${TDE_VERSION:-14.1.2}}"
 TARGETDIR="${3:-/tmp/${PKGNAME}-${TDE_VERSION}}"
-DIST="$4"
+DIST="$(rpmdist.sh --dist)"
 
 SPECFILE=$(get_specfile.sh ${PKGNAME} ${TDE_VERSION})
 [ -z "${SPECFILE}" ] && exit 1
@@ -17,7 +17,6 @@ TARBALL=$(get_latest_tarball_filename.sh ${PKGNAME} ${TDE_VERSION} || :)
 VERSION=$(get_latest_tarball_version.sh ${PKGNAME} ${TDE_VERSION} || :)
 case "${VERSION}" in *~pre*) PREVERSION="${VERSION#*~}";; esac
 
-DIST="$(rpmdist.sh --dist)"
 [ -z "${TMPPATH}" ] && TMPPATH="/dev/shm"
 BUILDDIR="${TMPPATH}/BUILD${DIST}.$(uname -i)"
 BUILDROOTDIR="${TMPPATH}/BUILDROOT${DIST}.$(uname -i)"

redhat/build/get_source_files.sh

@@ -31,7 +31,7 @@ while read var val; do
                      --define "tde_version ${TDE_VERSION}" \
                      --define "name ${name}" \
                      --define "version ${VERSION}" \
-                     --define "dist ${DIST:-$(rpm -E %dist)}" \
+                     --define "dist ${DIST:-$(rpmdist.sh --dist)}" \
                      -E "${FILE}")
           [ -r "${file}" ] && break
         done

redhat/build/install_requires.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 
-PKGFILE="packages$(rpm -E %dist)"
+DIST="$(rpmdist.sh --dist)"
+PKGFILE="packages${DIST}"
 
 # Under Mageia/Mandriva, do not forget to enable "Tainted" and "Nonfree" repositories !
 if [ -x /usr/sbin/urpmi ]; then

redhat/build/is_latest_package_installed.sh

@@ -6,6 +6,7 @@ TDE_VERSION="${2:-${TDE_VERSION:-14.1.2}}"
 INSTALLED=$(get_installed_package_version.sh ${PKGNAME} ${TDE_VERSION})
 TARBALL=$(get_latest_tarball_version.sh ${PKGNAME} ${TDE_VERSION})
 SPEC=$(get_spec_version.sh ${PKGNAME} ${TDE_VERSION})
+DIST="$(rpmdist.sh --dist)"
 
 # Package containing "~" (e.g. R14 preversion tarballs):
 if [ "${TARBALL/\~/}" != "${TARBALL}" ]; then
@@ -22,7 +23,7 @@ else
   fi
 
   # Other package (e.g. QT3)
-  if [ "${INSTALLED}" = "${SPEC}" ] || [ "${INSTALLED}$(rpm -E %dist)" = "${SPEC}" ]; then
+  if [ "${INSTALLED}" = "${SPEC}" ] || [ "${INSTALLED}${DIST}" = "${SPEC}" ]; then
     echo "Latest package '${PKGNAME}' version '${INSTALLED}' is already built and installed."
     exit 0
   fi

redhat/build/rpmdist.sh

@@ -5,7 +5,9 @@ RHEL=0
 MGA=0
 DIST=""
 
-if [ -r /etc/redhat-release ]; then
+if [ -r /etc/openmandriva-release ]; then
+  a="openmandriva"
+elif [ -r /etc/redhat-release ]; then
   read a b c d e f g < /etc/redhat-release
 elif [ -r /etc/SuSE-release ] || [ -r /etc/SUSE-brand ] || grep -q "opensuse" "/etc/os-release"; then
   a="opensuse"
@@ -14,13 +16,13 @@ fi
 case $a in
   # Mageia release 1 (Official) for x86_64
   Mageia*)
-	DIST=".mga${c}"
-#	MDKVERSION="201002"
+    DIST=".mga${c}"
+    #MDKVERSION="201002"
   ;;
   # Mandriva Linux release 2011.0 (Official) for x86_64
   Mandriva*)
-	DIST=".mdv${d}"
-	MDKVERSION="201100"
+    DIST=".mdv${d}"
+    MDKVERSION="201100"
   ;;
   # CentOS release 5.7 (Final)
   # CentOS Linux release 6.0 (Final)
@@ -49,6 +51,15 @@ case $a in
       DIST=".oss"
     fi
   ;;
+  # openmandriva
+  openmandriva)
+    . /etc/os-release
+    if [ "${VERSION_ID}" = "5.0" ]; then
+      DIST=".omv5000" # 5.0 (Rock)
+    else
+      DIST=".omv2490" # Cooker
+    fi
+  ;;
   # PCLinuxOS
   PCLinuxOS) PCLINUXOS="${c}"; DIST=".pclos${c}";;
   #PCLinuxOS) PCLINUXOS="${c}"; DIST=".pclos";;

redhat/build/update_repository.sh

@@ -11,23 +11,29 @@ done
 
 ARCH="$(rpm -E %{_target_cpu})"
 RPMDIR=$(rpm -E %{_rpmdir}.tde-${TDE_VERSION})
-dist="$(rpm -E %dist)"
+DIST="$(rpmdist.sh --dist)"
 
 [ -d "${RPMDIR}/noarch" ] || mkdir -p "${RPMDIR}/noarch"
 [ -d "${RPMDIR}/${ARCH}" ] || mkdir -p "${RPMDIR}/${ARCH}"
 
+if [ -x "/usr/bin/createrepo_c" ]; then
+  createrepo="/usr/bin/createrepo_c"
+else
+  createrepo="/usr/bin/createrepo"
+fi
+
 if [ -x /usr/sbin/urpmi ]; then
   REPOUPDATE='(cd ${RPMDIR}; genhdlist2 --clean --allow-empty noarch & genhdlist2 --clean --allow-empty ${ARCH} & wait; sudo urpmi.update rpmbuild.${ARCH} rpmbuild.noarch)'
 elif [ -x /usr/bin/dnf ]; then
-  REPOUPDATE='(cd ${RPMDIR}; createrepo --workers=${WORKERS} ${ARCH} & createrepo --workers=${WORKERS} noarch & wait; sudo dnf --repo="rpmbuild*" clean expire-cache)'
+  REPOUPDATE='(cd ${RPMDIR}; ${createrepo} --workers=${WORKERS} ${ARCH} & ${createrepo} --workers=${WORKERS} noarch & wait; sudo dnf --repo="rpmbuild*" clean expire-cache)'
 elif [ -x /usr/bin/zypper ]; then
-  REPOUPDATE='(cd ${RPMDIR}; createrepo --workers=${WORKERS} ${ARCH} & createrepo --workers=${WORKERS} noarch & wait; sudo zypper refresh rpmbuild.${ARCH} rpmbuild.noarch)'
-  #REPOUPDATE='(rsync -av ${RPMDIR}/ /tmp/rpm${dist}/ && cd /tmp/rpm${dist}; umask 0000; createrepo --workers=${WORKERS} ${ARCH} & createrepo --workers=${WORKERS} noarch & wait; rsync -av /tmp/rpm${dist}/ ${RPMDIR}/; sudo zypper refresh rpmbuild.${ARCH} rpmbuild.noarch)'
+  REPOUPDATE='(cd ${RPMDIR}; ${createrepo} --workers=${WORKERS} ${ARCH} & ${createrepo} --workers=${WORKERS} noarch & wait; sudo zypper refresh rpmbuild.${ARCH} rpmbuild.noarch)'
+  #REPOUPDATE='(rsync -av ${RPMDIR}/ /tmp/rpm${DIST}/ && cd /tmp/rpm${DIST}; umask 0000; ${createrepo} --workers=${WORKERS} ${ARCH} & ${createrepo} --workers=${WORKERS} noarch & wait; rsync -av /tmp/rpm${DIST}/ ${RPMDIR}/; sudo zypper refresh rpmbuild.${ARCH} rpmbuild.noarch)'
 elif [ -x /usr/bin/yum ]; then
-  if [ "${dist}" = ".el5" ]; then
-    REPOUPDATE='(cd ${RPMDIR}; createrepo ${ARCH} & createrepo noarch & wait; sudo yum clean metadata --disablerepo="*" --enablerepo="rpmbuild*")'
+  if [ "${DIST}" = ".el5" ]; then
+    REPOUPDATE='(cd ${RPMDIR}; ${createrepo} ${ARCH} & ${createrepo} noarch & wait; sudo yum clean metadata --disablerepo="*" --enablerepo="rpmbuild*")'
   else
-    REPOUPDATE='(cd ${RPMDIR}; createrepo --workers=${WORKERS} ${ARCH} & createrepo --workers=${WORKERS} noarch & wait; sudo yum clean metadata --disablerepo="*" --enablerepo="rpmbuild*")'
+    REPOUPDATE='(cd ${RPMDIR}; ${createrepo} --workers=${WORKERS} ${ARCH} & ${createrepo} --workers=${WORKERS} noarch & wait; sudo yum clean metadata --disablerepo="*" --enablerepo="rpmbuild*")'
   fi
 elif [ -x /usr/bin/apt-get ]; then
   REPOUPDATE='(cd ${RPMDIR}; genpkglist $PWD noarch & genpkglist $PWD ${ARCH} & wait; genbasedir --topdir=$PWD i586 x86_64 noarch; sudo apt-get update)'

redhat/core/tde-i18n/tde-i18n.spec

@@ -1432,7 +1432,7 @@ for l in %{TDE_LANGS}; do
         ln -s ../cmake cmake
       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

redhat/core/tdeaccessibility/tdeaccessibility.spec

@@ -95,11 +95,23 @@ BuildRequires: trinity-akode-devel
 %endif
 
 # ALSA support
-BuildRequires:	alsa-lib-devel
+%if 0%{?mdkver}
+BuildRequires: %{_lib}asound-devel
+%else
+BuildRequires: alsa-lib-devel
+%endif
 
 # GLIB2 support
 BuildRequires:	glib2-devel
 
+# JPEG support
+%if 0%{?mdkver}
+%define libjpeg %{_lib}jpeg
+%else
+%define libjpeg libjpeg
+%endif
+BuildRequires: %{libjpeg}-devel
+
 # XCB support
 %if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?pclinuxos}
 BuildRequires:	libxcb-devel
@@ -401,7 +413,7 @@ Summary:	Development files for tdeaccessibility
 Group:		Development/Libraries/X11
 Requires:	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:	trinity-tdelibs-devel >= %{version}
-Requires:	libjpeg-devel
+Requires:	%{libjpeg}-devel
 Requires:	libpng-devel
 
 Obsoletes:		trinity-kdeaccessibility-devel < %{?epoch:%{epoch}:}%{version}-%{release}
@@ -439,7 +451,7 @@ unset QTDIR QTLIB QTINC
 export PATH="%{tde_bindir}:${PATH}"
 export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_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

redhat/core/tdeaddons/tdeaddons.spec

@@ -87,13 +87,25 @@ BuildRequires:	brp-check-trinity
 %endif
 
 # SDL support
-BuildRequires: SDL-devel
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}SDL-devel
+%else
+BuildRequires:	SDL-devel
+%endif
 
-# ALSA support
+# ALSA supportl
+%if 0%{?mdkver}
+BuildRequires: %{_lib}asound-devel
+%else
 BuildRequires: alsa-lib-devel
+%endif
 
 # OPENSSL support
-BuildRequires: openssl-devel
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}openssl-devel
+%else
+BuildRequires:	openssl-devel
+%endif
 
 # IDN support
 BuildRequires:	libidn-devel
@@ -112,7 +124,11 @@ BuildRequires:	pcre-devel
 %endif
 
 # ACL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}acl-devel
+%else
 BuildRequires:	libacl-devel
+%endif
 
 # DB4/DB5 support
 %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} >= 1220 || 0%{?mdkversion} || 0%{?mgaversion}
@@ -692,7 +708,7 @@ unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
 export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_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

redhat/core/tdeadmin/tdeadmin.spec

@@ -88,13 +88,21 @@ BuildRequires:	brp-check-trinity
 %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
 
 # RPM support
 BuildRequires: rpm-devel
@@ -351,7 +359,7 @@ touch /etc/lilo.conf
 unset QTDIR QTLIB QTINC
 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
@@ -387,7 +395,7 @@ fi
   -DBUILD_SECPOLICY=ON \
   -DBUILD_TDEFILE_PLUGINS=ON \
   \
-%if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7 || 0%{?mageia} >= 4
+%if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7 || 0%{?mgaversion} >= 4
   -DKU_FIRSTUID="1000" \
   -DKU_FIRSTGID="1000" \
 %endif

redhat/core/tdeartwork/tdeartwork.spec

@@ -78,7 +78,11 @@ BuildRequires:	libidn-devel
 #BuildRequires:	esound-devel
 
 # ACL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}acl-devel
+%else
 BuildRequires:	libacl-devel
+%endif
 
 # MESA support
 %if 0%{?rhel} || 0%{?fedora}
@@ -86,8 +90,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
@@ -172,7 +180,11 @@ BuildRequires:	gamin-devel
 %endif
 
 # OPENSSL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}openssl-devel
+%else
 BuildRequires:	openssl-devel
+%endif
 
 
 # Metapackage
@@ -740,7 +752,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

redhat/core/tdebase/pamd.tde.omv5000

@@ -0,0 +1,10 @@
+#%PAM-1.0
+auth       required    pam_env.so
+auth       sufficient  pam_succeed_if.so user ingroup nopasswdlogin
+auth       include     system-auth
+account    include     system-auth
+password   include     system-auth
+session    optional    pam_keyinit.so force revoke
+session    required    pam_namespace.so
+session    include     system-auth
+session    required    pam_loginuid.so

redhat/core/tdebase/tdebase.spec

@@ -63,10 +63,14 @@ Source1:		%{name}-rpmlintrc
 
 # Pam configuration files for RHEL / Fedora
 %if 0%{?suse_version} == 0
-Source2:		pamd.kdm-trinity%{?dist}
-Source3:		pamd.kdm-trinity-np%{?dist}
-Source4:		pamd.kcheckpass-trinity%{?dist}
-Source5:		pamd.kscreensaver-trinity%{?dist}
+%if 0%{?mdkver}
+Source2:		pamd.tde.omv5000
+%else
+Source2:		pamd.kdm-trinity%{?pamd_suffix}
+Source3:		pamd.kdm-trinity-np%{?pamd_suffix}
+Source4:		pamd.kcheckpass-trinity%{?pamd_suffix}
+Source5:		pamd.kscreensaver-trinity%{?pamd_suffix}
+%endif
 %endif
 
 # openSUSE: configuration file for TDM
@@ -187,6 +191,12 @@ Requires:	mandriva-theme
 %define tde_starticon /usr/share/icons/mandriva.png
 %endif
 
+# OpenMandriva
+%if 0%{?mdkver}
+Requires:	distro-release-theme
+%define tde_bg /usr/share/wallpapers/default.png
+%endif
+
 # PCLINUXOS
 %if 0%{?pclinuxos}
 Requires:	desktop-common-data
@@ -221,19 +231,36 @@ BuildRequires:	fdupes
 BuildRequires:	htdig
 
 # OPENSSL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}openssl-devel
+%else
 BuildRequires:	openssl-devel
+%endif
 
 # AUDIOFILE support
 BuildRequires:	audiofile-devel
 
 # ALSA supportl
-BuildRequires:	alsa-lib-devel
+%if 0%{?mdkver}
+BuildRequires: %{_lib}asound-devel
+%else
+BuildRequires: alsa-lib-devel
+%endif
 
 # RAW1394 support
+%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
+BuildRequires:	%{_lib}raw1394-devel
+%else
 BuildRequires:	libraw1394-devel
+%endif
 
 # VORBIS support
-BuildRequires:	libvorbis-devel
+%if 0%{?mdkver} || 0%{?mgaversion}
+%define libvorbis_devel %{_lib}vorbis-devel
+%else
+%define libvorbis_devel libvorbis-devel
+%endif
+BuildRequires: %{libvorbis_devel}
 
 # GLIB2 support
 BuildRequires:	glib2-devel
@@ -242,9 +269,13 @@ BuildRequires:	glib2-devel
 BuildRequires:	pcre-devel
 
 # 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
@@ -283,8 +314,12 @@ BuildRequires:	gamin-devel
 
 # 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
@@ -306,13 +341,21 @@ BuildRequires:	libsensors4-devel
 %if 0%{?suse_version} >= 1310
 BuildRequires:	udev
 %endif
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires:	%{_lib}udev-devel
+%else
 BuildRequires:	libudev-devel
+%endif
 %define with_tsak 1
 %define with_tdehwlib 1
 %endif
 
 # ACL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}acl-devel
+%else
 BuildRequires:	libacl-devel
+%endif
 
 # XRANDR support
 #  On RHEL5, xrandr library is too old.
@@ -337,8 +380,12 @@ BuildRequires:	hal-devel >= 0.5
 #  Disabled on RHEL4
 %if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
 %define with_exr 1
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}openexr-devel
+%else
 BuildRequires:	OpenEXR-devel
 %endif
+%endif
 
 # XSCREENSAVER support
 #  RHEL 4: disabled
@@ -396,8 +443,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
@@ -428,8 +479,12 @@ BuildRequires:	libart_lgpl-devel
 BuildRequires:	samba-common
 %endif
 %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}smbclient-devel
+%else
 BuildRequires:	libsmbclient-devel
 %endif
+%endif
 
 # IMAKE
 %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} >= 1220
@@ -441,8 +496,12 @@ BuildRequires:	imake
 BuildRequires:	xorg-x11-libxkbfile-devel
 %endif
 %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} >= 1210
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires:	%{_lib}xkbfile-devel
+%else
 BuildRequires:	libxkbfile-devel
-%if 0%{?fedora} || 0%{?rhel} >= 7
+%endif
+%if 0%{?fedora} || 0%{?mdkver} || 0%{?rhel} >= 7
 BuildRequires:	xkeyboard-config-devel
 %endif
 %endif
@@ -517,16 +576,22 @@ BuildRequires:	font-util
 BuildRequires:	bdftopcf
 %endif
 
+%if 0%{?mdkver} == 0
 %if 0%{?mdkversion} || 0%{?mgaversion}
 BuildRequires:	drakconf
 %endif
+%endif
 
 # LIBCONFIG support
 # Needed for "compton" stuff
 %if 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora}
 %define with_libconfig 1
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}config-devel
+%else
 BuildRequires:	libconfig-devel
 %endif
+%endif
 
 # KBDLEDSYNC support
 %if 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?fedora}
@@ -556,7 +621,12 @@ BuildRequires:		libnsl-devel
 %endif
 
 # ATTR support
-BuildRequires:	libattr-devel
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%define libattr_devel %{_lib}attr-devel
+%else
+%define libattr_devel libattr-devel
+%endif
+BuildRequires: %{libattr_devel}
 
 # SELINUX support
 %if 0%{?rhel} >= 6 || 0%{?fedora}
@@ -2113,10 +2183,10 @@ already. Most users won't need this.
 %if 0%{?suse_version} >= 1210
 /usr/lib/X11/displaymanagers/
 %endif
-%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 || 0%{?mgaversion} >= 6
+%if 0%{?fedora} >= 18 || 0%{?mdkver} || 0%{?mgaversion} >= 6 || 0%{?rhel} >= 7
 /usr/lib/systemd/system/tdm.service
 %endif
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} || 0%{?mgaversion} >= 6
+%if 0%{?fedora} || 0%{?mdkver} || 0%{?mgaversion} >= 6 || 0%{?rhel} || 0%{?suse_version}
 %{_datadir}/xsessions/tde.desktop
 %endif
 
@@ -2613,8 +2683,10 @@ ever launching another application.
 %exclude %{tde_datadir}/apps/konqueror/servicemenus/kdesktopSetAsBackground.desktop
 %exclude %{tde_datadir}/apps/konqueror/servicemenus/installfont.desktop
 %{tde_datadir}/apps/konqueror/servicemenus/*.desktop
+%if 0%{?mdkver} == 0
 %ghost %{_sysconfdir}/alternatives/media_safelyremove.desktop
 %{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase
+%endif
 %{tde_datadir}/apps/konqueror/tiles/
 %{tde_datadir}/autostart/konqy_preload.desktop
 %{tde_datadir}/config.kcfg/keditbookmarks.kcfg
@@ -2633,6 +2705,8 @@ ever launching another application.
 %{tde_mandir}/man1/kfmclient.1*
 %{tde_mandir}/man1/konqueror.1*
 
+%if 0%{?mdkver} == 0
+
 %post -n trinity-konqueror
 if [ $1 -eq 1 ]; then
   update-alternatives --install \
@@ -2649,6 +2723,8 @@ if [ $1 -eq 0 ]; then
     %{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase || :
 fi
 
+%endif
+
 ##########
 
 %package -n trinity-konqueror-devel
@@ -2830,8 +2906,10 @@ update-alternatives --install /usr/share/xsessions/default.desktop default-xsess
 
 %postun -n trinity-ksmserver
 %if 0%{?mdkversion} || 0%{?mgaversion}
+%if 0%{?mdkver} == 0
 fndSession
 %endif
+%endif
 
 # openSUSE 15.0 alternatives
 %if 0%{?suse_version} >= 1500
@@ -3257,7 +3335,7 @@ if [ -d "/usr/include/tirpc" ]; then
   RPM_OPT_FLAGS="$(pkg-config --cflags --libs libtirpc) ${RPM_OPT_FLAGS}"
 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
@@ -3329,7 +3407,7 @@ fi
 %if 0%{?fedora} >= 22 || 0%{?suse_version} >= 1320
   -DHTDIG_SEARCH_BINARY="/usr/bin/htdig" \
 %endif
-%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 || 0%{?mgaversion} >= 6
+%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 || 0%{?mgaversion} >= 6 || 0%{?mdkver}
   -DBUILD_TDM_SYSTEMD_UNIT_FILE="ON" \
 %endif
   ..
@@ -3348,7 +3426,7 @@ fi
 # Adds a GDM/KDM/XDM session called 'TDE'
 
 # Under RHEL/Fedora/Suse, static 'xsessions' files go to '/usr/share/xsessions'.
-%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} || 0%{?mgaversion} >= 6
+%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} || 0%{?mdkver} || 0%{?mgaversion} >= 6
 %__install -D -m 644 \
 	"%{?buildroot}%{tdm_datadir}/sessions/tde.desktop" \
 	"%{?buildroot}%{_datadir}/xsessions/tde.desktop"
@@ -3378,24 +3456,29 @@ FNDSESSION_EXEC="/usr/sbin/chksession -k"
 %else
 %if 0%{?mgaversion} >= 6
 FNDSESSION_EXEC="/usr/sbin/chksession -l"
-%else
-FNDSESSION_EXEC="/usr/sbin/chksession --generate=/usr/share/xsessions"
-%endif
 %endif
 EOF
 %endif
+%endif
 
 # PAM configuration files (except openSUSE)
 %if 0%{?suse_version} == 0
+%if 0%{?mdkver}
+%__install -D -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pam.d/tdm-trinity"
+%__install -D -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pam.d/tdm-trinity-np"
+%__install -D -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pam.d/kcheckpass-trinity"
+%__install -D -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pam.d/tdescreensaver-trinity"
+%else
 %__install -D -m 644 "%{SOURCE2}" "%{?buildroot}%{_sysconfdir}/pam.d/tdm-trinity"
 %__install -D -m 644 "%{SOURCE3}" "%{?buildroot}%{_sysconfdir}/pam.d/tdm-trinity-np"
 %__install -D -m 644 "%{SOURCE4}" "%{?buildroot}%{_sysconfdir}/pam.d/kcheckpass-trinity"
 %__install -D -m 644 "%{SOURCE5}" "%{?buildroot}%{_sysconfdir}/pam.d/tdescreensaver-trinity"
 %endif
+%endif
 
 # TDM configuration
 %__sed -i "%{?buildroot}%{tde_confdir}/%{tdm}/%{tdm}rc" \
-%if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7 || 0%{?mageia} >= 4
+%if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7 || 0%{?mgaversion} >= 4 || 0%{?mdkver}
 	-e "s/^#*MinShowUID=.*/MinShowUID=1000/"
 %else
 	-e "s/^#*MinShowUID=.*/MinShowUID=500/"
@@ -3410,11 +3493,13 @@ elif [ -r "/usr/share/hwdata/usb.ids" ]; then
   %__ln_s -f "/usr/share/hwdata/usb.ids" "%{?buildroot}%{tde_datadir}/apps/usb.ids"
 fi
 
+%if 0%{?mdkver} == 0
 # Makes 'media_safelyremove.desktop' an alternative.
 # This allows the use of 'tdeio-umountwrapper' package.
 %__mv -f "%{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop" "%{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase"
 %__mkdir_p "%{buildroot}%{_sysconfdir}/alternatives"
 %__ln_s "media_safelyremove.desktop_tdebase" "%{buildroot}%{_sysconfdir}/alternatives/media_safelyremove.desktop"
+%endif
 
 # SUSE >= 12 : creates DM config file, used by '/etc/init.d/xdm'
 #  You must set 'DISPLAYMANAGER=tdm' in '/etc/sysconfig/displaymanager'

redhat/core/tdebindings/tdebindings.spec

@@ -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%{?pclinuxos} || 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"
 
 

redhat/core/tdeedu/tdeedu.spec

@@ -81,13 +81,21 @@ BuildRequires:	fdupes
 BuildRequires:	doxygen
 
 # 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
 
 # LIBUSB support
 %if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
@@ -1157,7 +1165,7 @@ sed -i "kig/pykig/pykig.py" \
 export PATH="%{tde_bindir}:${PATH}"
 export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_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

redhat/core/tdegames/tdegames.spec

@@ -97,13 +97,26 @@ BuildRequires:	gamin-devel
 %endif
 
 # OPENSSL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}openssl-devel
+%else
 BuildRequires:	openssl-devel
+%endif
 
 # ACL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}acl-devel
+%else
 BuildRequires:	libacl-devel
+%endif
 
 # ATTR support
-BuildRequires:	libattr-devel
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%define libattr_devel %{_lib}attr-devel
+%else
+%define libattr_devel libattr-devel
+%endif
+BuildRequires: %{libattr_devel}
 
 # SUSE desktop files utility
 %if 0%{?suse_version}
@@ -1183,7 +1196,7 @@ if [ -d "/usr/X11R6" ]; then
   export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
 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

redhat/core/tdegraphics/tdegraphics.spec

@@ -95,29 +95,49 @@ BuildRequires:	libusb-devel
 %endif
 
 # MNG support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}mng-devel
+%else
 BuildRequires: libmng-devel
+%endif
 
 # TIFF support
-BuildRequires: libtiff-devel
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}tiff-devel
+%else
+BuildRequires:	libtiff-devel
+%endif
 
 # PCRE support
 BuildRequires: pcre-devel
 
 # ACL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}acl-devel
+%else
 BuildRequires:	libacl-devel
+%endif
 
 # GIF support
 %if 0%{?suse_version} || 0%{?fedora} >= 28 || 0%{?rhel} >= 8
 BuildRequires: giflib-devel
 %else
+%if 0%{?mdkver}
+BuildRequires: %{_lib}gif-devel
+%else
 BuildRequires: libungif-devel
 %endif
+%endif
 
 # GPHOTO2 support
-%if 0%{?suse_version}
-BuildRequires: libgphoto2-devel
+%if 0%{?rhel} == 4 || 0%{?rhel} == 5 || 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}gphoto-devel
 %else
-BuildRequires: gphoto2-devel
+BuildRequires:	gphoto2-devel
+%endif
+%else
+BuildRequires:	libgphoto2-devel
 %endif
 
 # PAPER support
@@ -169,7 +189,7 @@ BuildRequires:	xorg-x11-libXmu-devel
 BuildRequires: libXmu-devel
 %endif
 %if 0%{?mdkversion} || 0%{?mgaversion} >= 4
-BuildRequires: libxmu-devel
+BuildRequires: %{_lib}xmu-devel
 %endif
 %if 0%{?mgaversion} == 2 || 0%{?mgaversion} == 3
 BuildRequires:	%{_lib}xmu%{?mgaversion:6}-devel
@@ -181,8 +201,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
@@ -195,11 +219,19 @@ BuildRequires:	xorg-x11-Mesa-libGLU
 %if 0%{?rhel} == 4
 BuildRequires:	xorg-x11-devel
 %else
+%if 0%{?mdkver}
+BuildRequires: %{_lib}drm-devel
+%else
 BuildRequires: libdrm-devel
 %endif
+%endif
 
 # OPENEXR support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}openexr-devel
+%else
 BuildRequires:	OpenEXR-devel
+%endif
 
 # POPPLER support
 %define with_pdf 1
@@ -231,7 +263,11 @@ BuildRequires: lcms-devel
 BuildRequires: fribidi-devel
 
 # OPENSSL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}openssl-devel
+%else
 BuildRequires:	openssl-devel
+%endif
 
 # kamera
 %if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version}
@@ -1058,7 +1094,7 @@ if [ -d /usr/X11R6 ]; then
   export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
 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

redhat/core/tdelibs/tdelibs.spec

@@ -105,25 +105,49 @@ BuildRequires:	brp-check-trinity
 BuildRequires:	krb5-devel
 
 # XSLT support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}xslt-devel
+%else
 BuildRequires:	libxslt-devel
+%endif
 
 # ALSA support
-BuildRequires:	alsa-lib-devel
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires: %{_lib}asound-devel
+%else
+BuildRequires: alsa-lib-devel
+%endif
 
 # IDN support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}idn-devel
+%else
 BuildRequires:	libidn-devel
+%endif
 
 # CUPS support
 BuildRequires:	cups-devel
 
 # TIFF support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}tiff-devel
+%else
 BuildRequires:	libtiff-devel
+%endif
 
 # OPENSSL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}openssl-devel
+%else
 BuildRequires:	openssl-devel
+%endif
 
 # ACL support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}acl-devel
+%else
 BuildRequires:	libacl-devel
+%endif
 
 # GLIB2 support
 BuildRequires:	glib2-devel
@@ -218,7 +242,12 @@ Requires:		avahi
 # OPENEXR support
 %if 0%{?rhel} >=6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
 %define with_openexr 1
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}openexr-devel
+%else
 BuildRequires:	OpenEXR-devel
+%endif
+
 %if 0%{?pclinuxos}
 BuildRequires:  libpthread-stubs
 %endif
@@ -282,8 +311,8 @@ Requires:		ca-certificates
 %define	cacert	%{_sysconfdir}/ssl/certs/ca-certificates.crt
 %endif
 %endif
-%if 0%{?mgaversion} || 0%{?mdkversion}
-%if 0%{?pclinuxos} || 0%{?mgaversion} >= 8
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?mdkver}
+%if 0%{?pclinuxos} || 0%{?mgaversion} >= 8 || 0%{?mdkver}
 Requires:		rootcerts
 %define	cacert	%{_sysconfdir}/pki/tls/certs/ca-bundle.crt
 %else
@@ -328,16 +357,20 @@ Requires:		%{cacert}
 %define xt_devel libXt-devel
 %endif
 %if 0%{?mgaversion} || 0%{?mdkversion}
-%define xt_devel libxt-devel
+%define xt_devel %{_lib}xt-devel
 %endif
 %{?xt_devel:BuildRequires: %{xt_devel}}
 
 ### New features in TDE R14
 
 # LIBMAGIC support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}magic-devel
+%else
 %if 0%{?rhel} != 5
 BuildRequires:	file-devel
 %endif
+%endif
 
 # NETWORKMANAGER support
 %if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?suse_version}
@@ -362,8 +395,12 @@ BuildRequires:	NetworkManager-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
 
 # HAL support
 %if 0%{?rhel} == 5
@@ -383,15 +420,23 @@ Requires:		udisks
 %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 7
 %define with_udisks2 1
 %if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
-BuildRequires:	libudisks2-devel
-%else
+%define udisks2 udisks2
+%define udisks2_devel libudisks2-devel
+%endif
 %if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150300
-BuildRequires:	libudisks2-0-devel
-%else
-BuildRequires:	udisks2-devel
+%define udisks2 udisks2
+%define udisks2_devel libudisks2-0-devel
+%endif
+%if 0%{?mdkversion} || 0%{?mgaversion}
+%define udisks2 udisks2
+%define udisks2_devel udisks2-devel
 %endif
+%if 0%{?mdkver}
+%define udisks2 udisks
+%define udisks2_devel %{_lib}udisks-devel
 %endif
-Requires:		udisks2
+Requires: %{udisks2}
+BuildRequires: %{udisks2_devel}
 %endif
 
 # DEVICEKIT POWER support
@@ -449,7 +494,12 @@ BuildRequires:		libr-devel >= 0.6.0
 %endif
 
 # ATTR support
-BuildRequires:	libattr-devel
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%define libattr_devel %{_lib}attr-devel
+%else
+%define libattr_devel libattr-devel
+%endif
+BuildRequires: %{libattr_devel}
 
 # INTLTOOL support
 BuildRequires:	intltool
@@ -599,7 +649,7 @@ Requires:	libtqt3-mt-devel >= 3.5.0
 Requires:	libtqt4-devel = %{tde_epoch}:4.2.0
 Requires:	trinity-arts-devel >= %{tde_epoch}:1.5.10
 Requires:	libart_lgpl-devel
-Requires:	libattr-devel
+Requires:	%{libattr_devel}
 Requires:	intltool
 %{?xcomposite_devel:Requires: %{xcomposite_devel}}
 %{?xt_devel:Requires: %{xt_devel}}
@@ -653,7 +703,7 @@ fi
 
 export TDEDIR="%{tde_prefix}"
 
-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

redhat/core/tdemultimedia/tdemultimedia.spec

@@ -111,17 +111,40 @@ BuildRequires:	zlib-devel
 #BuildRequires: libmusicbrainz-devel libtunepimp-devel
 
 # Audio libraries
-BuildRequires:	libvorbis-devel
 BuildRequires:	audiofile-devel
-BuildRequires:	libtheora-devel
-BuildRequires:	alsa-lib-devel 
 BuildRequires:	cdparanoia
 #BuildRequires:	libmpg123-devel
 
+# VORBIS support
+%if 0%{?mdkver} || 0%{?mgaversion}
+%define libvorbis_devel %{_lib}vorbis-devel
+%else
+%define libvorbis_devel libvorbis-devel
+%endif
+BuildRequires: %{libvorbis_devel}
+
+# THEORA
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}theora-devel
+%else
+BuildRequires:	libtheora-devel
+%endif
+
+# ALSA support
+%if 0%{?mdkver}
+BuildRequires: %{_lib}asound-devel
+%else
+BuildRequires: alsa-lib-devel
+%endif
+
 # CDDA support
 %if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}cdda-devel
+%else
 BuildRequires:	libcdda-devel
 %endif
+%endif
 %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
 BuildRequires:	cdparanoia-devel
 %endif
@@ -144,9 +167,14 @@ BuildRequires:	flac-devel
 
 # GSTREAMER support
 %if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}gstreamer-devel
+BuildRequires:	%{_lib}gst-plugins-base1.0-devel
+%else
 BuildRequires:	%{_lib}gstreamer1.0-devel
 BuildRequires:	%{_lib}gstreamer-plugins-base1.0-devel
 %endif
+%endif
 %if 0%{?rhel} == 4
 BuildRequires:	gstreamer-devel
 BuildRequires:	gstreamer-plugins-devel
@@ -182,8 +210,12 @@ BuildRequires:	libXxf86vm-devel
 %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos} || 0%{?rhel} || 0%{?suse_version}
 %define with_xine 1
 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?pclinuxos}
+%if 0%{?mdkver}
+BuildRequires: %{_lib}xine-devel
+%else
 BuildRequires: %{_lib}xine1.2-devel
 %endif
+%endif
 %if 0%{?fedora} || 0%{?rhel}
 BuildRequires: xine-lib-devel
 %endif
@@ -216,13 +248,26 @@ BuildRequires:		libmp3lame-devel
 BuildRequires:	libidn-devel
 
 # OPENSSL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}openssl-devel
+%else
 BuildRequires:	openssl-devel
+%endif
 
 # ACL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}acl-devel
+%else
 BuildRequires:	libacl-devel
+%endif
 
 # ATTR support
-BuildRequires:	libattr-devel
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%define libattr_devel %{_lib}attr-devel
+%else
+%define libattr_devel libattr-devel
+%endif
+BuildRequires: %{libattr_devel}
 
 %if 0%{?fedora} || 0%{?rhel}
 BuildRequires:		lame-devel
@@ -1073,7 +1118,7 @@ unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
 export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_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

redhat/core/tdenetwork/tdenetwork.spec

@@ -114,7 +114,11 @@ Requires:		avahi
 %endif
 
 # OPENSSL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}openssl-devel
+%else
 BuildRequires:	openssl-devel
+%endif
 
 # TLS support
 BuildRequires:	gnutls-devel
@@ -129,8 +133,12 @@ BuildRequires:	sqlite-devel
 # GADU support
 %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
 %define with_gadu 1
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}gadu-devel
+%else
 BuildRequires:	libgadu-devel
 %endif
+%endif
 
 # PCRE support
 BuildRequires:	pcre-devel
@@ -158,7 +166,7 @@ BuildRequires:	xorg-x11-libXmu-devel
 BuildRequires: libXmu-devel
 %endif
 %if 0%{?mdkversion} || 0%{?mgaversion} >= 4
-BuildRequires: libxmu-devel
+BuildRequires: %{_lib}xmu-devel
 %endif
 %if 0%{?mgaversion} == 2 || 0%{?mgaversion} == 3
 BuildRequires:	%{_lib}xmu%{?mgaversion:6}-devel
@@ -177,18 +185,24 @@ BuildRequires:	libXxf86vm-devel
 #define _with_xmms --with-xmms
 
 # Wifi support
-%define with_wifi 1
 %if 0%{?fedora} >= 6 || 0%{?rhel} >= 5
-BuildRequires: wireless-tools-devel
+%define wifi_devel wireless-tools-devel
 %endif
 %if 0%{?mgaversion} == 2 || 0%{?mdkversion}
-BuildRequires:	%{_lib}iw29-devel
+%define wifi_devel %{_lib}iw29-devel
 %endif
 %if 0%{?rhel} == 5 || 0%{?suse_version}
-BuildRequires: wireless-tools
+%define wifi_devel wireless-tools
 %endif
 %if 0%{?suse_version} || 0%{?mgaversion} >= 3
-BuildRequires:	libiw-devel
+%define wifi_devel libiw-devel
+%endif
+%if 0%{?mdkver}
+%define wifi_devel %nil
+%endif
+%if "%{wifi_devel}" != ""
+%define with_wifi 1
+BuildRequires:	%{wifi_devel}
 %endif
 
 # OpenSLP support
@@ -217,7 +231,13 @@ BuildRequires:	kernel-headers
 
 # XML support
 BuildRequires:	libxml2-devel
+
+# XSLT support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}xslt-devel
+%else
 BuildRequires:	libxslt-devel
+%endif
 
 #jabber
 BuildRequires:	libidn-devel
@@ -234,7 +254,11 @@ BuildRequires:	speex-devel
 #Requires:		jasper
 
 # ACL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}acl-devel
+%else
 BuildRequires:	libacl-devel
+%endif
 
 # MEANWHILE support
 %if 0%{?rhel} == 6 || 0%{?rhel} == 7 || 0%{?fedora} >= 15 || 0%{?suse_version}
@@ -1100,7 +1124,7 @@ if [ -d /usr/X11R6 ]; then
   export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
 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

redhat/core/tdepim/tdepim.spec

@@ -75,15 +75,38 @@ BuildRequires:	desktop-file-utils
 BuildRequires:	make
 
 BuildRequires:	gpgme-devel
-BuildRequires:	libgpg-error-devel
 BuildRequires:	flex
-BuildRequires:	libical-devel
 BuildRequires:	boost-devel
 BuildRequires:	pcre-devel
 BuildRequires:	libidn-devel
 
+# ICAL support
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires:	%{_lib}ical-devel
+%else
+BuildRequires:	libical-devel
+%endif
+
+# GPG-ERROR support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}gpg-error-devel
+%else
+BuildRequires:	libgpg-error-devel
+%endif
+
 # OPENSSL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}openssl-devel
+%else
 BuildRequires:	openssl-devel
+%endif
+
+# ACL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}acl-devel
+%else
+BuildRequires:	libacl-devel
+%endif
 
 # SUSE desktop files utility
 %if 0%{?suse_version}
@@ -126,8 +149,12 @@ BuildRequires:	curl-devel
 BuildRequires:	glib2-devel
 
 # SASL support
-%if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos}
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}sasl-devel
+%else
 BuildRequires:	%{_lib}sasl2-devel
+%endif
 %else
 BuildRequires:	cyrus-sasl-devel
 %endif
@@ -187,9 +214,6 @@ BuildRequires:	xscreensaver-gl
 %endif
 %endif
 
-# ACL support
-BuildRequires:	libacl-devel
-
 
 Requires:	trinity-libtdepim = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:	%{name}-kfile-plugins = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -835,8 +859,12 @@ Requires:	gnupg2
 
 %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
 Requires:	pinentry
+%if 0%{?mdkver}
+Requires:	gnupg
+%else
 Requires:	dirmngr
 %endif
+%endif
 
 %description -n trinity-kleopatra
 Kleopatra is the TDE tool for managing X.509 certificates in the gpgsm
@@ -1845,7 +1873,7 @@ if [ -d "/usr/X11R6" ]; then
   export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
 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

redhat/core/tdesdk/tdesdk.spec

@@ -80,7 +80,11 @@ BuildRequires:	brp-check-trinity
 %endif
 
 # ACL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}acl-devel
+%else
 BuildRequires:	libacl-devel
+%endif
 
 # IDN support
 BuildRequires:	libidn-devel
@@ -117,12 +121,21 @@ BuildRequires:	libdb-4_8-devel
 
 # kbabel,  F-7+: flex >= 2.5.33-9
 BuildRequires:	flex
+%if 0%{?mdkver}
+BuildRequires:	flex-devel
+%endif
 # umbrello
-BuildRequires:	libxslt-devel
 BuildRequires:	libxml2-devel
 BuildRequires:	subversion-devel
 BuildRequires:	neon-devel
 
+# XSLT support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}xslt-devel
+%else
+BuildRequires:	libxslt-devel
+%endif
+
 # PERL support
 BuildRequires:	perl
 %if 0%{?fedora} >= 19
@@ -130,7 +143,11 @@ BuildRequires:	perl-podlators
 %endif
 
 # OPENSSL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}openssl-devel
+%else
 BuildRequires:	openssl-devel
+%endif
 
 # PYTHON support
 %if 0%{?rhel} >= 8 || 0%{?fedora} >= 30 || 0%{?mgaversion} >= 8
@@ -1092,7 +1109,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

redhat/core/tdetoys/tdetoys.spec

@@ -93,13 +93,21 @@ BuildRequires:	gamin-devel
 %endif
 
 # ACL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}acl-devel
+%else
 BuildRequires:	libacl-devel
+%endif
 
 # PCRE support
 BuildRequires:	pcre-devel
 
 # OPENSSL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}openssl-devel
+%else
 BuildRequires:	openssl-devel
+%endif
 
 
 Obsoletes:		trinity-kdetoys < %{?epoch:%{epoch}:}%{version}-%{release}
@@ -399,7 +407,7 @@ This package is part of Trinity, and a component of the TDE toys module.
 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

redhat/core/tdeutils/tdeutils.spec

@@ -141,7 +141,11 @@ BuildRequires:	pcre-devel
 %endif
 
 # ACL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}acl-devel
+%else
 BuildRequires:	libacl-devel
+%endif
 
 # XSCREENSAVER support
 #  RHEL 8: available in EPEL
@@ -161,7 +165,11 @@ BuildRequires:	%{_lib}xscrnsaver%{?mgaversion:1}-devel
 %endif
 
 # OPENSSL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}openssl-devel
+%else
 BuildRequires:	openssl-devel
+%endif
 
 # CONSOLEHELPER (usermode) support
 %if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
@@ -897,7 +905,7 @@ if [ -d "/usr/X11R6" ]; then
   export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
 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

redhat/core/tdevelop/tdevelop.spec

@@ -137,8 +137,12 @@ BuildRequires:	neon-devel
 
 # 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
@@ -148,11 +152,20 @@ BuildRequires:	openldap24-libs-devel
 
 # LIBACL support
 %if 0%{?suse_version} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+# ACL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}acl-devel
+%else
 BuildRequires:	libacl-devel
 %endif
+%endif
 
 # OPENSSL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}openssl-devel
+%else
 BuildRequires:	openssl-devel
+%endif
 
 # PYTHON support
 %global python python3
@@ -517,7 +530,6 @@ individual needs.
 %{tde_libdir}/libkinterfacedesigner.so.0.0.0
 %{tde_tdelibdir}/libkdevvisualboyadvance.la
 %{tde_tdelibdir}/libkdevvisualboyadvance.so
-%{tde_datadir}/apps/kdevdesignerpart/pics/
 %{tde_datadir}/apps/kdevvisualboyadvance/
 %{tde_tdedocdir}/HTML/en/tde_app_devel/
 %{tde_datadir}/mimelnk/text/x-fortran.desktop
@@ -622,7 +634,7 @@ if [ -d "/usr/include/openldap24" ]; then
 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

redhat/core/tdewebdev/tdewebdev.spec

@@ -82,7 +82,12 @@ BuildRequires:	update-desktop-files
 BuildRequires:	brp-check-trinity
 %endif
 
+# XSLT support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}xslt-devel
+%else
 BuildRequires:	libxslt-devel
+%endif
 
 %if 0%{?rhel} == 4
 # a bogus dep in libexslt.la file from EL-4 (WONTFIX bug http://bugzilla.redhat.com/142241)
@@ -99,7 +104,11 @@ BuildRequires:	libxml2-devel
 #endif
 
 # ICU support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}icu-devel
+%else
 BuildRequires:	libicu-devel
+%endif
 
 # Readline support
 BuildRequires:	readline-devel
@@ -458,7 +467,7 @@ Requires:	trinity-kommander-devel = %{?epoch:%{epoch}:}%{version}-%{release}
 unset QTDIR QTLIB QTINC
 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

redhat/dependencies/akode/akode.spec

@@ -73,7 +73,7 @@ BuildRequires:	trinity-filesystem >= %{tde_version}
 # FLAC support
 %define _with_flac --with-flac
 %if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: libflac-devel
+BuildRequires: %{_lib}flac-devel
 %endif
 %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
 BuildRequires: flac-devel
@@ -93,14 +93,18 @@ BuildRequires: jack-audio-connection-kit-devel
 # SAMPLERATE support
 %if 0%{?rhel} >= 4 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
 %define _with_libsamplerate --with-libsamplerate
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires: %{_lib}samplerate-devel
+%else
 BuildRequires: libsamplerate-devel
 %endif
+%endif
 
 # PULSEAUDIO support
 %if 0%{?fedora} >= 15 || 0%{?rhel} >= 6 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
 %define _with_pulseaudio --with-pulseaudio
 %if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: libpulseaudio-devel
+BuildRequires: %{_lib}pulseaudio-devel
 %endif
 %if 0%{?rhel} || 0%{?fedora}
 BuildRequires: pulseaudio-libs-devel
@@ -114,18 +118,33 @@ BuildRequires: pulseaudio-devel
 %ifarch %{ix86} x86_64
 %if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel}
 %define _with_libmad --with-libmad
+%if 0%{?mdkver}
+BuildRequires:		%{_lib}mad-devel
+%else
 BuildRequires:		libmad-devel
 %endif
 %endif
+%endif
 
 # ALSA support
 %if 0%{?suse_version}
 BuildRequires: alsa-devel
 %else
+%if 0%{?mdkver}
+BuildRequires: %{_lib}asound-devel
+%else
 BuildRequires: alsa-lib-devel
 %endif
+%endif
+
+# VORBIS support
+%if 0%{?mdkver} || 0%{?mgaversion}
+%define libvorbis_devel %{_lib}vorbis-devel
+%else
+%define libvorbis_devel libvorbis-devel
+%endif
+BuildRequires: %{libvorbis_devel}
 
-BuildRequires: libvorbis-devel
 BuildRequires: speex-devel
 
 
@@ -314,7 +333,7 @@ This package contains the mad decoder for Akode.
 %build
 unset QTDIR QTINC QTLIB
 
-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

redhat/dependencies/arts/arts.spec

@@ -72,10 +72,24 @@ BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
 BuildRequires:	audiofile-devel
-BuildRequires:	alsa-lib-devel
 BuildRequires:	glib2-devel
 BuildRequires:	gsl-devel
-BuildRequires:	libvorbis-devel
+
+# VORBIS support
+%if 0%{?mdkver} || 0%{?mgaversion}
+%define libvorbis_devel %{_lib}vorbis-devel
+%else
+%define libvorbis_devel libvorbis-devel
+%endif
+BuildRequires: %{libvorbis_devel}
+
+# ALSA support
+%if 0%{?mdkver}
+%define alsa_devel %{_lib}asound-devel
+%else
+%define alsa_devel alsa-lib-devel
+%endif
+BuildRequires: %{alsa_devel}
 
 # ESOUND support
 #define with_esound 1
@@ -117,6 +131,9 @@ BuildRequires:	libtool
 %if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} || 0%{?mdkversion} || 0%{?mgaversion}
 %define mad_devel libmad-devel
 %endif
+%if 0%{?mdkver}
+%define mad_devel %{_lib}mad-devel
+%endif
 BuildRequires:		%{mad_devel}
 %endif
 %endif
@@ -177,10 +194,10 @@ Requires:	%{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 Obsoletes:	arts-devel < %{?epoch:%{epoch}:}%{version}-%{release}
 %endif
 
-Requires:	alsa-lib-devel
+Requires:	%{alsa_devel}
 Requires:	audiofile-devel
-Requires:	libvorbis-devel
-%{?with_esound:Requires:	esound-devel}
+%{?libvorbis_devel:Requires: %{libvorbis_devel}}
+%{?with_esound:Requires: esound-devel}
 %{?with_libmad:Requires: %{mad_devel}}
 %{?with_jack:Requires: %{jack_devel}}
 
@@ -244,7 +261,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

redhat/dependencies/avahi-tqt/avahi-tqt.spec

@@ -68,7 +68,7 @@ BuildRequires:	gettext-devel
 BuildRequires:	xorg-x11-devel
 %endif
 %if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	libxi-devel
+BuildRequires:	%{_lib}xi-devel
 %endif
 %if 0%{?suse_version} >= 1220 || 0%{?rhel} >= 5 || 0%{?fedora}
 BuildRequires:	libXi-devel
@@ -86,11 +86,15 @@ BuildRequires:	dbus-devel
 %endif
 
 # PCAP support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires:	%{_lib}cap-devel
+%else
 BuildRequires:	libcap-devel
+%endif
 
 # AVAHI support
 %if 0%{?mgaversion} || 0%{?mdkversion}
-%define avahi_devel libavahi-client-devel
+%define avahi_devel %{_lib}avahi-client-devel
 %endif
 %if 0%{?suse_version} || 0%{?rhel} || 0%{?fedora}
 %define avahi_devel avahi-devel
@@ -101,9 +105,12 @@ BuildRequires:	libcap-devel
 %if 0%{?rhel} || 0%{?fedora}
 BuildRequires:	expat-devel
 %endif
-%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?suse_version}
 BuildRequires:	libexpat-devel
 %endif
+%if 0%{?mdkversion} || 0%{?mgaversion}
+BuildRequires:	%{_lib}expat-devel
+%endif
 
 # NAS support
 %if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
@@ -210,7 +217,7 @@ into a TQt main loop application.
 %build
 unset QTDIR QTINC QTLIB
 
-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
@@ -222,6 +229,8 @@ fi
   -DCMAKE_SKIP_RPATH=ON \
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DLIB_INSTALL_DIR="%{_libdir}" \
   ..
 
 %__make %{?_smp_mflags} || %__make

redhat/dependencies/dbus-1-tqt/dbus-1-tqt.spec

@@ -158,7 +158,7 @@ See the dbus description for more information about D-BUS in general.
 %build
 unset QTDIR QTINC QTLIB
 
-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

redhat/dependencies/dbus-tqt/dbus-tqt.spec

@@ -159,7 +159,7 @@ See the dbus description for more information about D-BUS in general.
 %build
 unset QTDIR QTINC QTLIB
 
-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

redhat/dependencies/libart-lgpl/libart-lgpl.spec

@@ -184,7 +184,7 @@ especially suitable for embedded applications.
 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
@@ -199,6 +199,7 @@ fi
   -DWITH_GCC_VISIBILITY=OFF \
   \
   -DCMAKE_INSTALL_PREFIX="%{_prefix}" \
+  -DLIB_INSTALL_DIR="%{_libdir}" \
   -DSHARE_INSTALL_PREFIX="%{_datadir}" \
   \
   -DWITH_ALL_OPTIONS=ON \
@@ -222,5 +223,4 @@ fi
 %__rm -rf $RPM_BUILD_ROOT
 
 
-
 %changelog

redhat/dependencies/libcaldav/libcaldav.spec

@@ -60,16 +60,24 @@ BuildRequires:	libtool
 BuildRequires:	fdupes
 
 # GTK2 support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}gtk+2.0-devel
+%else
 %if 0%{?rhel} == 4
 BuildRequires:	evolution28-gtk2-devel
 %else
 BuildRequires:	glib2-devel
 BuildRequires:	gtk2-devel
 %endif
+%endif
 
 # CURL support
 %if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%define libcurl_devel %{_lib}curl-devel >= 7.15.5
+%else
 %define libcurl_devel libcurl-devel >= 7.15.5
+%endif
 %else
 %define libcurl_devel curl-devel >= 7.15.5
 %endif
@@ -156,7 +164,7 @@ This package includes the development files.
 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
@@ -171,6 +179,7 @@ fi
   -DWITH_GCC_VISIBILITY=OFF \
   \
   -DCMAKE_INSTALL_PREFIX="%{_prefix}" \
+  -DLIB_INSTALL_DIR="%{_libdir}" \
   -DSHARE_INSTALL_PREFIX="%{_datadir}" \
   \
   -DWITH_ALL_OPTIONS=ON \

redhat/dependencies/libcarddav/libcarddav.spec

@@ -61,7 +61,11 @@ BuildRequires:	libtool
 
 # CURL support
 %if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%define libcurl_devel %{_lib}curl-devel >= 7.15.5
+%else
 %define libcurl_devel libcurl-devel >= 7.15.5
+%endif
 %else
 # Specific CURL version for TDE on RHEL 5 (and older)
 %define libcurl_devel curl-devel >= 7.15.5
@@ -69,12 +73,16 @@ BuildRequires:	libtool
 %{?libcurl_devel:BuildRequires: %{libcurl_devel}}
 
 # GTK2 support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}gtk+2.0-devel
+%else
 %if 0%{?rhel} == 4
 BuildRequires:	evolution28-gtk2-devel
 %else
 BuildRequires:	glib2-devel
 BuildRequires:	gtk2-devel
 %endif
+%endif
 
 %description
 Libcarddav is a portable CardDAV client implementation originally developed for the Trinity PIM suite. 
@@ -158,7 +166,7 @@ This package contains the development files.
 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
@@ -173,6 +181,7 @@ fi
   -DWITH_GCC_VISIBILITY=OFF \
   \
   -DCMAKE_INSTALL_PREFIX="%{_prefix}" \
+  -DLIB_INSTALL_DIR="%{_libdir}" \
   -DSHARE_INSTALL_PREFIX="%{_datadir}" \
   \
   -DWITH_ALL_OPTIONS=ON \

redhat/dependencies/polkit-tqt/polkit-tqt.spec

@@ -59,7 +59,11 @@ BuildRequires:	desktop-file-utils
 BuildRequires:	gcc-c++
 BuildRequires:	gettext
 
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}polkit1-devel
+%else
 BuildRequires:	polkit-devel
+%endif
 
 %description
 PolicyKit is an application-level toolkit for defining and handling the policy
@@ -195,7 +199,7 @@ This package contains example files and applications.
 %build
 unset QTDIR QTINC QTLIB
 
-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
@@ -208,6 +212,8 @@ fi
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=ON \
   \
+  -DLIB_INSTALL_DIR="%{_libdir}" \
+  \
   -DBUILD_ALL="ON" \
   -DWITH_ALL_OPTIONS="ON" \
   ..

redhat/dependencies/pytqt/pytqt.spec

@@ -88,8 +88,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
@@ -103,7 +107,7 @@ BuildRequires:	xorg-x11-libXmu-devel
 BuildRequires: libXmu-devel
 %endif
 %if 0%{?mdkversion} || 0%{?mgaversion} >= 4
-BuildRequires: libxmu-devel
+BuildRequires: %{_lib}xmu-devel
 %endif
 %if 0%{?mgaversion} == 2 || 0%{?mgaversion} == 3
 BuildRequires:	%{_lib}xmu%{?mgaversion:6}-devel
@@ -142,7 +146,7 @@ same way in both languages (with syntax differences, of course)
 %defattr(-,root,root,-)
 %doc NEWS README
 %dir %{python_sitearch}/PyTQt
-%if 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version}
+%if 0%{?mdkver} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version}
 %{python_sitearch}/PyTQt/__init__.py*
 %if 0%{?rhel} == 7
 %{python_sitearch}/PyTQt/__pycache__/__init__.*.pyc
@@ -232,7 +236,7 @@ packages based on them, like PyTDE.
 
 %files -n pytqt-devel
 %defattr(-,root,root,-)
-%if 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version}
+%if 0%{?mdkver} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version}
 %{python_sitearch}/PyTQt/pytqtconfig.py*
 %if 0%{?rhel} == 7
 %{python_sitearch}/PyTQt/__pycache__/pytqtconfig.*.pyc

redhat/dependencies/sip4-tqt/sip4-tqt.spec

@@ -113,7 +113,7 @@ specificity towards C++ and Python.
 %files -n sip4-tqt
 %defattr(-,root,root,-)
 %{python_sitearch}/sip_tqt.so
-%if 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version}
+%if 0%{?mdkver} || 0%{?pclinuxos} || 0%{?rhel} == 7 || 0%{?suse_version}
 %{python_sitearch}/sip_tqt_config.py*
 %{python_sitearch}/sip_tqt_distutils.py*
 %if 0%{?rhel} == 7

redhat/dependencies/tde-cmake/tde-cmake.spec

@@ -73,7 +73,7 @@ intltool-merge used to merge translations into desktop files.
 %build
 unset QTDIR QTINC QTLIB
 
-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

redhat/dependencies/tqca-tls/tqca-tls.spec

@@ -59,7 +59,13 @@ BuildRequires:	libtqca-devel >= %{tde_epoch}:1.0
 
 BuildRequires:	trinity-tde-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
-BuildRequires:	openssl-devel >= 0.9.8
+
+# OPENSSL support
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}openssl-devel
+%else
+BuildRequires:	openssl-devel
+%endif
 
 
 %description
@@ -101,7 +107,7 @@ contains the TLS plugin.
 %build
 unset QTDIR QTINC QTLIB
 
-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

redhat/dependencies/tqca/tqca.spec

@@ -67,7 +67,12 @@ Provides:		%{libtqt3}-mt-tqca-tls = %{version}-%{release}
 BuildRequires:  libtqt4-devel >= %{tde_epoch}:4.2.0
 BuildRequires:	trinity-tde-cmake >= %{tde_version}
 BuildRequires:	gcc-c++
+
+%if 0%{?mdkver}
+BuildRequires:	%{_lib}openssl-devel
+%else
 BuildRequires:	openssl-devel >= 0.9.8
+%endif
 
 %description
 Taking a hint from the similarly-named Java Cryptography Architecture,
@@ -160,7 +165,7 @@ perl -pi -e 's,target\.path=\$PREFIX/lib,target.path=\$PREFIX/%{_lib},g' qcextra
 %build
 unset QTDIR QTINC QTLIB
 
-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

redhat/dependencies/tqscintilla/tqscintilla.spec

@@ -184,7 +184,7 @@ This package contains the documentation for tqscintilla.
 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
@@ -197,6 +197,8 @@ fi
   -DCMAKE_VERBOSE_MAKEFILE=ON \
   -DWITH_GCC_VISIBILITY=ON \
   \
+  -DLIB_INSTALL_DIR="%{_libdir}" \
+  \
   -DBUILD_ALL="ON" \
   -DWITH_ALL_OPTIONS="ON" \
   ..

redhat/dependencies/tqt3/tqt3.spec

@@ -64,13 +64,28 @@ BuildRequires: tar
 BuildRequires: zlib-devel
 
 # JPEG support
-BuildRequires: libjpeg-devel
+%if 0%{?mdkver} || 0%{?mgaversion}
+%define libjpeg %{_lib}jpeg
+%else
+%define libjpeg libjpeg
+%endif
+%{?libjpeg:BuildRequires: %{libjpeg}-devel}
 
 # MNG support
-BuildRequires: libmng-devel
+%if 0%{?mdkver} || 0%{?mgaversion}
+%define libmng %{_lib}mng
+%else
+%define libmng libmng
+%endif
+%{?libmng:BuildRequires: %{libmng}-devel}
 
 # PNG support
-BuildRequires: libpng-devel
+%if 0%{?mdkver} || 0%{?mgaversion}
+%define libpng %{_lib}png
+%else
+%define libpng libpng
+%endif
+%{?libpng:BuildRequires: %{libpng}-devel}
 
 # GIF support
 BuildRequires: giflib-devel
@@ -97,9 +112,12 @@ BuildRequires: cups-devel
 %{?glib2_devel:BuildRequires: %{glib2_devel}}
 
 # UUID support
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} || 0%{?rhel} >= 6
+%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 6
 %define uuid_devel libuuid-devel
 %endif
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%define uuid_devel %{_lib}uuid-devel
+%endif
 %if 0%{?rhel} == 5
 %define uuid_devel e2fsprogs-devel
 %endif
@@ -108,8 +126,12 @@ BuildRequires: cups-devel
 # LIBAUDIO support
 %if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
 %define with_nas 1
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%define libaudio_devel %{_lib}audio-devel nas-devel
+%else
 %define libaudio_devel nas-devel
 %endif
+%endif
 %{?libaudio_devel:BuildRequires: %{libaudio_devel}}
 
 # Xrender support
@@ -117,7 +139,7 @@ BuildRequires: cups-devel
 %define xrender_devel libXrender-devel
 %endif
 %if 0%{?mdkversion} || 0%{?mgaversion}
-%define xrender_devel libxrender-devel
+%define xrender_devel %{_lib}xrender-devel
 %endif
 %{?xrender_devel:BuildRequires: %{xrender_devel}}
 
@@ -126,11 +148,10 @@ BuildRequires: cups-devel
 %define xrandr_devel libXrandr-devel
 %endif
 %if 0%{?mdkversion} || 0%{?mgaversion}
+%define xrandr_devel %{_lib}xrandr-devel
+%endif
 %if 0%{?pclinuxos}
 %define xrandr_devel %{_lib}xrandr2-devel
-%else
-%define xrandr_devel libxrandr-devel
-%endif
 %endif
 %{?xrandr_devel:BuildRequires: %{xrandr_devel}}
 
@@ -139,7 +160,7 @@ BuildRequires: cups-devel
 %define xcursor_devel libXcursor-devel
 %endif
 %if 0%{?mdkversion} || 0%{?mgaversion}
-%define xcursor_devel libxcursor-devel
+%define xcursor_devel %{_lib}xcursor-devel
 %endif
 %{?xcursor_devel:BuildRequires: %{xcursor_devel}}
 
@@ -148,7 +169,7 @@ BuildRequires: cups-devel
 %define xinerama_devel libXinerama-devel
 %endif
 %if 0%{?mdkversion} || 0%{?mgaversion}
-%define xinerama_devel libxinerama-devel
+%define xinerama_devel %{_lib}xinerama-devel
 %endif
 %{?xinerama_devel:BuildRequires: %{xinerama_devel}}
 
@@ -157,7 +178,7 @@ BuildRequires: cups-devel
 %define xft_devel libXft-devel
 %endif
 %if 0%{?mdkversion} || 0%{?mgaversion}
-%define xft_devel libxft-devel
+%define xft_devel %{_lib}xft-devel
 %endif
 %{?xft_devel:BuildRequires: %{xft_devel}}
 
@@ -166,7 +187,7 @@ BuildRequires: cups-devel
 %define xext_devel libXext-devel
 %endif
 %if 0%{?mdkversion} || 0%{?mgaversion}
-%define xext_devel libxext-devel
+%define xext_devel %{_lib}xext-devel
 %endif
 %{?xext_devel:BuildRequires: %{xext_devel}}
 
@@ -175,7 +196,7 @@ BuildRequires: cups-devel
 %define x11_devel libX11-devel
 %endif
 %if 0%{?mdkversion} || 0%{?mgaversion}
-%define x11_devel libx11-devel
+%define x11_devel %{_lib}x11-devel
 %endif
 %{?x11_devel:BuildRequires: %{x11_devel}}
 
@@ -184,7 +205,7 @@ BuildRequires: cups-devel
 %define sm_devel libSM-devel
 %endif
 %if 0%{?mdkversion} || 0%{?mgaversion}
-%define sm_devel libsm-devel
+%define sm_devel %{_lib}sm-devel
 %endif
 %{?sm_devel:BuildRequires: %{sm_devel}}
 
@@ -193,7 +214,7 @@ BuildRequires: cups-devel
 %define ice_devel libICE-devel
 %endif
 %if 0%{?mdkversion} || 0%{?mgaversion}
-%define ice_devel libice-devel
+%define ice_devel %{_lib}ice-devel
 %endif
 %{?ice_devel:BuildRequires: %{ice_devel}}
 
@@ -210,7 +231,7 @@ BuildRequires:	xorg-x11-libXmu-devel
 BuildRequires: libXmu-devel
 %endif
 %if 0%{?mdkversion} || 0%{?mgaversion} >= 4
-BuildRequires: libxmu-devel
+BuildRequires: %{_lib}xmu-devel
 %endif
 %if 0%{?mgaversion} == 2 || 0%{?mgaversion} == 3
 BuildRequires:	%{_lib}xmu%{?mgaversion:6}-devel
@@ -221,7 +242,7 @@ BuildRequires:	%{_lib}xmu%{?mgaversion:6}-devel
 %define xi_devel xorg-x11-devel
 %endif
 %if 0%{?mgaversion} || 0%{?mdkversion}
-%define xi_devel libxi-devel
+%define xi_devel %{_lib}xi-devel
 %endif
 %if 0%{?suse_version} >= 1220 || 0%{?rhel} >= 5 || 0%{?fedora}
 %define xi_devel libXi-devel
@@ -245,9 +266,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
@@ -281,7 +306,7 @@ BuildRequires:	firebird-devel
 %endif
 
 # FBCLIENT support
-%if 0%{?mgaversion} >= 6
+%if 0%{?mdkver} || 0%{?mgaversion} >= 6
 BuildRequires:	%{_lib}fbclient-devel
 %endif
 
@@ -297,7 +322,7 @@ BuildRequires:		libtirpc-devel
 BuildRequires:		libnsl-devel
 BuildRequires:		libtirpc-devel
 %endif
-%if 0%{?mgaversion}
+%if 0%{?mdkver} || 0%{?mgaversion}
 BuildRequires:		%{_lib}nsl-devel
 BuildRequires:		%{_lib}tirpc-devel
 %endif
@@ -378,8 +403,8 @@ Requires:	%{libtqt3}-mt = %{version}-%{release}
 Requires: glibc-devel
 Requires: fontconfig-devel
 Requires: freetype-devel
-Requires: libjpeg-devel
-Requires: libpng-devel
+Requires: %{libjpeg}-devel
+Requires: %{libpng}-devel
 Requires: zlib-devel
 
 %{?glib2_devel:Requires: %{glib2_devel}}

redhat/dependencies/tqtinterface/tqtinterface.spec

@@ -62,18 +62,20 @@ BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 
 # UUID support
-%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} || 0%{?rhel} >= 6
+%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 6
 %define uuid_devel libuuid-devel
 %endif
+%if 0%{?mgaversion} || 0%{?mdkversion}
+%define uuid_devel %{_lib}uuid-devel
+%endif
 %if 0%{?rhel} == 5
 %define uuid_devel e2fsprogs-devel
 %endif
 %{?uuid_devel:BuildRequires: %{uuid_devel}}
 
-
 # PTHREAD support
 %if 0%{?mdkversion} || 0%{?mgaversion}
-%if 0%{?mgaversion} >= 7
+%if 0%{?mgaversion} >= 7 || 0%{?mdkver}
 BuildRequires:	%{_lib}npth-devel
 %else
 BuildRequires:	pth-devel
@@ -95,8 +97,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
@@ -107,7 +113,7 @@ BuildRequires: Mesa-libGLU-devel
 BuildRequires:	xorg-x11-devel
 %endif
 %if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	libxi-devel
+BuildRequires:	%{_lib}xi-devel
 %endif
 %if 0%{?suse_version} >= 1220 || 0%{?rhel} >= 5 || 0%{?fedora}
 BuildRequires:	libXi-devel
@@ -213,7 +219,7 @@ although some code has been added for useful functions that are no longer part o
 %build
 unset QTDIR QTINC QTLIB
 
-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

redhat/docker/omv5000/Dockerfile.x86_64

@@ -0,0 +1,73 @@
+FROM openmandriva:5.0
+
+ARG TDE_VERSION=14.1.2
+ARG ARCH=x86_64
+
+COPY packages /packages
+RUN set -x \
+ && echo "proxy=http://proxy:3128" >>"/etc/dnf/dnf.conf" \
+ && dnf -y update \
+ && dnf -y install --skip-broken $(</packages)
+
+# Fix utempter detection
+RUN set -x \
+ && chmod a+r /usr/libexec/utempter/utempter
+
+# Prefer GCC over clang
+#RUN set -x \
+# && ln -sfv ld.bfd /usr/bin/ld \
+# && ln -sfv g++ /usr/bin/c++ \
+# && ln -sfv gcc /usr/bin/cc
+
+# Add non-root user to build packages
+RUN set -x \
+ && rm -rf /home/trinity \
+ && useradd -m -s /bin/bash -u 1000 trinity \
+ && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers" \
+ && echo "export QA_RPATHS=\$(( 0x0001|0x0002 ))" >>/home/trinity/.bashrc \
+ && chown -R trinity /home/trinity
+
+# Configure user trinity
+USER trinity
+COPY rpmmacros /home/trinity/.rpmmacros
+
+RUN set -x \
+ && rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/development/rawhide/Everything/source/tree/Packages/r/rdesktop-1.9.0-15.fc40.src.rpm --nodeps \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/rdesktop-1*.rpm
+
+RUN set -x \
+ && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/cauldron/SRPMS/core/release/sword-1.9.0-11.mga10.src.rpm \
+ && sed -i ${HOME}/rpmbuild/SPECS/sword.spec -e "/pycache/d" \
+ && rpmbuild -bb ${HOME}/rpmbuild/SPECS/sword.spec --define "cmake_build %__make %{?_smp_mflags}" --define "cmake_install %__make -C build install DESTDIR=%{?buildroot}" --define "__cc /usr/bin/gcc" --define "__cxx /usr/bin/g++" --define "_disable_ld_no_undefined 1" --define "python3_ext_suffix .cpython-311-x86_64-linux-gnu.so" --define "_unpackaged_files_terminate_build %nil" --nodeps \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/{lib64sword{1.9,-devel},sword}-1.9.0-*.rpm
+
+RUN set -x \
+ && rpmbuild --rebuild http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/yaz-5.34.0-1.mga9.src.rpm --nodeps \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/{lib64yaz{5,-devel},yaz}-5*.rpm
+
+RUN set -x \
+ && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/rdiff-backup-2.2.2-1.mga9.src.rpm \
+ && sed -i ${HOME}/rpmbuild/SPECS/rdiff-backup.spec -e "/pycache/d" \
+ && rpmbuild -bb ${HOME}/rpmbuild/SPECS/rdiff-backup.spec --define "_unpackaged_files_terminate_build %nil" \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/rdiff-backup-2*.rpm
+
+RUN set -x \
+ && rpmbuild --rebuild http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/cscope-15.9-3.mga9.src.rpm \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/cscope-15*.rpm
+
+RUN set -x \
+ && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/perl-Getopt-ArgvFile-1.110.0-10.mga9.src.rpm \
+ && rpmbuild -bb ${HOME}/rpmbuild/SPECS/perl-Getopt-ArgvFile.spec \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-Getopt-ArgvFile-1*.rpm
+
+RUN set -x \
+ && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/perl-PAR-1.18.0-1.mga9.src.rpm \
+ && sed -i ${HOME}/rpmbuild/SPECS/perl-PAR.spec -e "s/MYMETA.yml//" \
+ && rpmbuild -bb ${HOME}/rpmbuild/SPECS/perl-PAR.spec \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-1*.rpm
+
+RUN set -x \
+ && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/perl-PAR-Packer-1.57.0-1.mga9.src.rpm \
+ && sed -i ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec -e "s/MYMETA.yml//" \
+ && rpmbuild -bb ${HOME}/rpmbuild/SPECS/perl-PAR-Packer.spec \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/perl-PAR-Packer-1*.rpm

redhat/docker/omv5000/packages

@@ -0,0 +1,255 @@
+aspell
+aspell-devel
+aspell-en
+audiofile-devel
+bind-devel
+bison
+boost-devel
+bzip2-devel
+ccache
+cdparanoia
+chmlib-devel
+chrpath
+clamav
+clamav-devel
+cmake
+createrepo_c
+ctags
+cups-devel
+curl-devel
+db5-devel
+dbus-devel
+dbus-glib
+dbus-glib-devel
+djvulibre
+docbook2x
+docbook-dtd412-xml
+docbook-style-xsl
+docbook-utils
+doxygen
+dssi-devel
+exempi-devel
+expat-devel
+fdupes
+fftw-devel
+firebird-devel
+flex
+flex-devel
+fontconfig-devel
+freetype-devel
+fribidi-devel
+gamin-devel
+gettext-devel
+glib2-devel
+glibc-i18ndata
+gmime-devel
+gnokii-devel
+gperf
+gpgme-devel
+gsl-devel
+gtk+3.0-devel
+gtk-doc
+hspell-devel
+html2ps
+iceauth
+imake
+imlib2-devel
+intltool
+java-1.8.0-openjdk
+java-1.8.0-openjdk-devel
+java-devel
+kde-dev-scripts
+less
+lib64acl-devel
+lib64alsa-oss-devel
+lib64apr-devel
+lib64apr-util-devel
+lib64asound-devel
+lib64attr-devel
+lib64audio-devel
+lib64binutils-devel
+lib64cap-devel
+lib64cdda-devel
+lib64cdio-devel
+lib64cdio_paranoia-devel
+lib64cln-devel
+lib64clucene-devel
+lib64config-devel
+lib64cryptsetup-devel
+lib64curl-devel
+lib64drm-devel
+lib64dvdread-devel
+lib64exif-devel
+lib64exiv2-devel
+lib64expat-devel
+lib64ext2fs-devel
+lib64fbclient-devel
+lib64ffmpeg-devel
+lib64flac++-devel
+lib64flac-devel
+lib64fluidsynth-devel
+lib64fontenc-devel
+lib64gadu-devel
+lib64geoip-devel
+lib64gif-devel
+lib64glu-devel
+lib64gmime2.6-devel
+lib64gmp-devel
+lib64gnutls-devel
+lib64gpg-error-devel
+lib64gphoto-devel
+lib64gpod-devel
+lib64graphicsmagick-devel
+lib64gstreamer-devel
+lib64gst-plugins-base1.0-devel
+lib64gtk+2.0-devel
+lib64hiredis-devel
+lib64ical-devel
+lib64icu-devel
+lib64idn-devel
+lib64ifp-devel
+lib64jack-devel
+lib64magick-devel
+lib64inotifytools-devel
+lib64jasper-devel
+lib64jpeg-devel
+lib64lame-devel
+lib64lcms-devel
+lib64ldap-devel
+lib64lirc_client-devel
+lib64lo-devel
+lib64lrdf-devel
+lib64ltdl-devel
+lib64lua-devel
+lib64mad-devel
+lib64magic-devel
+lib64memcached-devel
+lib64mng-devel
+lib64mpcdec-devel
+lib64mtp-devel
+lib64musicbrainz5-devel
+lib64nettle-devel
+lib64njb-devel
+lib64nm-devel
+lib64npth-devel
+lib64nsl-devel
+lib64nspr-devel
+lib64ofx-devel
+lib64openexr-devel
+lib64otr-devel
+lib64paper-devel
+lib64pcre-devel
+lib64pcsclite-devel
+lib64pkcs11-helper-devel
+lib64polkit1-devel
+lib64poppler-devel
+lib64pqxx-devel
+lib64pth-devel
+lib64pulseaudio-devel
+lib64qalculate-devel
+lib64raptor-devel
+lib64raw1394-devel
+lib64rsvg2-devel
+lib64rsync-devel
+lib64samplerate-devel
+lib64sane1-devel
+lib64sasl-devel
+lib64SDL-devel
+lib64smbclient-devel
+lib64sndfile-devel
+lib64t1lib-devel
+lib64tasn1-devel
+lib64theora-devel
+lib64tiff-devel
+lib64tirpc-devel
+lib64twolame-devel
+lib64udev-devel
+lib64udisks-devel
+lib64usb-compat0.1-devel
+lib64usb1.0-devel
+lib64utempter0
+lib64utempter-devel
+lib64v4l-devel
+lib64visual-devel
+lib64vorbis-devel
+lib64wmf-devel
+lib64wpd-devel
+lib64xaw-devel
+lib64xdg-basedir-devel
+lib64xi-devel
+lib64xine-devel
+lib64xkbfile-devel
+lib64xscrnsaver-devel
+lib64xslt-devel
+lib64xtst-devel
+lib64xxf86dga-devel
+lib64xxf86vm-devel
+lib64wrap-devel
+librsvg
+lm_sensors-devel
+mysql-devel
+nas-devel
+neon-devel
+netpbm
+net-snmp-devel
+net-tools
+notification-daemon
+ocaml
+opensc
+openslp-devel
+opensp-devel
+openssh-clients
+optipng
+pam-devel
+pciutils-devel
+perl-devel
+perl(Archive::Zip)
+perl(ExtUtils::CBuilder)
+perl(ExtUtils::Embed)
+perl-ExtUtils-MakeMaker
+perl(IPC::Run3)
+perl(Module::ScanDeps)
+perl(PAR::Dist)
+perl-pcsc-perl
+perl(Test::More)
+perl(Tk)
+perl(XML::Parser)
+pilot-link-devel
+pinentry-gtk2
+pkgconfig(audiofile)
+pkgconfig(libpng16)
+postgresql
+postgresql-devel
+ppp
+python3-devel
+python-pylibacl
+python-pyyaml
+python-setuptools_scm
+pyxattr
+readline-devel
+recode
+rpm-build
+rpm-devel
+ruby-devel
+scons
+speex-devel
+sqlite3-devel
+subversion-devel
+sudo
+swig
+taglib-devel
+tcp_wrappers
+torsocks
+transfig
+unixODBC-devel
+usbutils
+valgrind
+x11-font-util
+xbase-devel
+xkeyboard-config-devel
+xmlto
+xscreensaver
+xscreensaver-base
+xscreensaver-extrusion
+xscreensaver-gl
+zlib-devel

redhat/docker/omv5000/rpmmacros

@@ -0,0 +1,11 @@
+%dist %nil
+%_smp_mflags -j8
+%jobs 8
+%dont_remove_libtool_files 1
+%_disable_rebuild_configure 1
+%_program_prefix ""
+%_debugsource_packages %nil
+%_debugsource_template %nil
+%_vpath_builddir .
+%python python3
+%__python /usr/bin/python3

redhat/docker/omvcooker/Dockerfile.x86_64

@@ -0,0 +1,54 @@
+FROM openmandriva/cooker:latest
+
+ARG TDE_VERSION=14.1.2
+ARG ARCH=x86_64
+
+COPY packages /packages
+RUN set -x \
+ && echo "proxy=http://proxy:3128" >>"/etc/dnf/dnf.conf" \
+ && dnf -y update \
+ && dnf -y install --skip-broken $(</packages)
+
+# Fix utempter detection
+RUN set -x \
+ && chmod a+r /usr/libexec/utempter/utempter
+
+# Add non-root user to build packages
+RUN set -x \
+ && rm -rf /home/trinity \
+ && useradd -m -s /bin/bash -u 1000 trinity \
+ && echo "trinity ALL=(ALL) NOPASSWD: ALL" >>"/etc/sudoers" \
+ && echo "export QA_RPATHS=\$(( 0x0001|0x0002 ))" >>/home/trinity/.bashrc \
+ && chown -R trinity /home/trinity
+
+# Configure user trinity
+USER trinity
+COPY rpmmacros /home/trinity/.rpmmacros
+
+RUN set -x \
+ && rpmbuild --rebuild http://ftp.free.fr/mirrors/fedora.redhat.com/fedora/linux/development/rawhide/Everything/source/tree/Packages/r/rdesktop-1.9.0-15.fc40.src.rpm --nodeps \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/rdesktop-1*.rpm
+
+RUN set -x \
+ && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/cauldron/SRPMS/core/release/sword-1.9.0-11.mga10.src.rpm \
+ && sed -i ${HOME}/rpmbuild/SPECS/sword.spec -e "s/%mkrel //" -e "/pycache/d" \
+ && rpmbuild -bb ${HOME}/rpmbuild/SPECS/sword.spec --define "cmake_build %__make %{?_smp_mflags}" --define "cmake_install %__make -C build install DESTDIR=%{?buildroot}" --define "__cc /usr/bin/gcc" --define "__cxx /usr/bin/g++" --define "_disable_ld_no_undefined 1" --define "python3_ext_suffix .cpython-311-x86_64-linux-gnu.so" --define "_unpackaged_files_terminate_build %nil" --nodeps \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/{lib64sword{1.9,-devel},sword}-1.9.0-*.rpm
+
+#RUN set -x \
+# && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/yaz-5.34.0-1.mga9.src.rpm --nodeps \
+# && sed -i ${HOME}/rpmbuild/SPECS/yaz.spec -e "s/%mkrel //" \
+# && rpmbuild -bb ${HOME}/rpmbuild/SPECS/yaz.spec --nodeps \
+# && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/{lib64yaz{5,-devel},yaz}-5*.rpm
+
+RUN set -x \
+ && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/rdiff-backup-2.2.2-1.mga9.src.rpm \
+ && sed -i ${HOME}/rpmbuild/SPECS/rdiff-backup.spec -e "s/%mkrel //" \
+ && rpmbuild -bb ${HOME}/rpmbuild/SPECS/rdiff-backup.spec \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/rdiff-backup-2*.rpm
+
+RUN set -x \
+ && rpm -ivh http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia/distrib/9/SRPMS/core/release/cscope-15.9-3.mga9.src.rpm \
+ && sed -i ${HOME}/rpmbuild/SPECS/cscope.spec -e "s/%mkrel //" \
+ && rpmbuild -bb ${HOME}/rpmbuild/SPECS/cscope.spec \
+ && sudo rpm -Uvh ${HOME}/rpmbuild/RPMS/*/cscope-15*.rpm

redhat/docker/omvcooker/packages

@@ -0,0 +1,232 @@
+aspell
+aspell-devel
+aspell-en
+audiofile-devel
+bind-devel
+bison
+boost-devel
+bzip2-devel
+ccache
+cdparanoia
+chmlib-devel
+chrpath
+clamav
+clamav-devel
+cmake
+createrepo_c
+ctags
+cups-devel
+curl-devel
+db5-devel
+dbus-devel
+dbus-glib
+dbus-glib-devel
+djvulibre
+docbook2x
+docbook-dtd412-xml
+docbook-style-xsl
+docbook-utils
+doxygen
+dssi-devel
+exempi-devel
+expat-devel
+fdupes
+fftw-devel
+firebird-devel
+flex
+flex-devel
+fontconfig-devel
+freetype-devel
+fribidi-devel
+gamin-devel
+gettext-devel
+glib2-devel
+glibc-i18ndata
+gmime-devel
+gnokii-devel
+gperf
+gpgme-devel
+gsl-devel
+gtk+3.0-devel
+gtk-doc
+hspell-devel
+html2ps
+iceauth
+imake
+imlib2-devel
+intltool
+java-1.8.0-openjdk
+java-1.8.0-openjdk-devel
+java-devel
+kde-dev-scripts
+less
+lib64acl-devel
+lib64alsa-oss-devel
+lib64apr-devel
+lib64apr-util-devel
+lib64asound-devel
+lib64attr-devel
+lib64audio-devel
+lib64binutils-devel
+lib64cdda-devel
+lib64cdio-devel
+lib64cdio_paranoia-devel
+lib64cln-devel
+lib64clucene-devel
+lib64config-devel
+lib64cryptsetup-devel
+lib64curl-devel
+lib64drm-devel
+lib64dvdread-devel
+lib64exif-devel
+lib64exiv2-devel
+lib64expat-devel
+lib64ext2fs-devel
+lib64fbclient-devel
+lib64ffmpeg-devel
+lib64flac++-devel
+lib64flac-devel
+lib64fontenc-devel
+lib64gadu-devel
+lib64geoip-devel
+lib64gif-devel
+lib64glu-devel
+lib64gmime2.6-devel
+lib64gmp-devel
+lib64gnutls-devel
+lib64gpg-error-devel
+lib64gphoto-devel
+lib64gpod-devel
+lib64graphicsmagick-devel
+lib64gstreamer-devel
+lib64gst-plugins-base1.0-devel
+lib64gtk+2.0-devel
+lib64hiredis-devel
+lib64ical-devel
+lib64icu-devel
+lib64idn-devel
+lib64jack-devel
+lib64magick-devel
+lib64inotifytools-devel
+lib64jasper-devel
+lib64jpeg-devel
+lib64lame-devel
+lib64lcms-devel
+lib64ldap-devel
+lib64ltdl-devel
+lib64lua-devel
+lib64mad-devel
+lib64magic-devel
+lib64memcached-devel
+lib64mng-devel
+lib64musicbrainz5-devel
+lib64nettle-devel
+lib64npth-devel
+lib64nspr-devel
+lib64nsl-devel
+lib64openexr-devel
+lib64paper-devel
+lib64cap-devel
+lib64pcre-devel
+lib64pcsclite-devel
+lib64pkcs11-helper-devel
+lib64polkit1-devel
+lib64poppler-devel
+lib64pqxx-devel
+lib64pth-devel
+lib64pulseaudio-devel
+lib64raw1394-devel
+lib64rsvg2-devel
+lib64rsync-devel
+lib64samplerate-devel
+lib64sane1-devel
+lib64sasl-devel
+lib64SDL-devel
+lib64smbclient-devel
+lib64t1lib-devel
+lib64tasn1-devel
+lib64theora-devel
+lib64tiff-devel
+lib64tirpc-devel
+lib64twolame-devel
+lib64udev-devel
+lib64udisks-devel
+lib64usb-compat0.1-devel
+lib64usb1.0-devel
+lib64utempter0
+lib64utempter-devel
+lib64v4l-devel
+lib64vorbis-devel
+lib64wmf-devel
+lib64xaw-devel
+lib64xdg-basedir-devel
+lib64xi-devel
+lib64xine-devel
+lib64xkbfile-devel
+lib64xscrnsaver-devel
+lib64xslt-devel
+lib64xtst-devel
+lib64xxf86dga-devel
+lib64xxf86vm-devel
+lib64wrap-devel
+librsvg
+lm_sensors-devel
+mysql-devel
+nas-devel
+neon-devel
+netpbm
+net-snmp-devel
+net-tools
+notification-daemon
+ocaml
+opensc
+openslp-devel
+opensp-devel
+openssh-clients
+optipng
+pam-devel
+pciutils-devel
+perl-devel
+perl-ExtUtils-MakeMaker
+perl(IPC::Run3)
+perl-pcsc-perl
+perl(XML::Parser)
+pilot-link-devel
+pinentry-gtk2
+pkgconfig(audiofile)
+pkgconfig(libpng16)
+postgresql
+postgresql-devel
+ppp
+python3-devel
+python-pylibacl
+python-pyyaml
+python-setuptools_scm
+pyxattr
+readline-devel
+recode
+rpm-build
+rpm-devel
+ruby-devel
+scons
+speex-devel
+sqlite3-devel
+subversion-devel
+sudo
+swig
+taglib-devel
+tcp_wrappers
+torsocks
+transfig
+unixODBC-devel
+usbutils
+valgrind
+x11-font-util
+xbase-devel
+xkeyboard-config-devel
+xmlto
+xscreensaver
+xscreensaver-base
+xscreensaver-extrusion
+xscreensaver-gl
+zlib-devel

redhat/docker/omvcooker/rpmmacros

@@ -0,0 +1,11 @@
+%dist %nil
+%_smp_mflags -j8
+%jobs 8
+%dont_remove_libtool_files 1
+%_disable_rebuild_configure 1
+%_program_prefix ""
+%_debugsource_packages %nil
+%_debugsource_template %nil
+%_vpath_builddir .
+%python python3
+%__python /usr/bin/python3

redhat/docker/openmandriva.sh

@@ -0,0 +1,27 @@
+#!/bin/bash -ex
+
+NAME="openmandriva"
+VERSION="${1:-5.0}" # E.g: '26'
+IMAGE="${NAME}:${VERSION}"
+TAR="${NAME}-${VERSION}.tar"
+INSTALLROOT="/dev/shm/${IMAGE}"
+
+sudo rm -rf "${INSTALLROOT}"
+sudo dnf install \
+  --assumeyes \
+  --disablerepo="*" \
+  --enablerepo="omv*" \
+  --installroot="${INSTALLROOT}" \
+  --nodocs \
+  --nogpgcheck \
+  --refresh \
+  --releasever="${VERSION}" \
+  --repofrompath 'omv-release,http://mirror.openmandriva.org/$releasever/repository/x86_64/main/release/' \
+  --repofrompath 'omv-updates,http://mirror.openmandriva.org/$releasever/repository/x86_64/main/updates/' \
+   bash curl dnf vim
+
+sudo tar -C "${INSTALLROOT}" -c . >"${TAR}"
+sudo rm -rf "${INSTALLROOT}"
+
+docker rmi -f "${IMAGE}"
+docker import "${TAR}" "${IMAGE}"

redhat/docker/run.sh

@@ -10,6 +10,7 @@ ARCH="$3"
 
 IMAGE="trinity.${DISTRIB}.${ARCH}:${TDE_VERSION}"
 DIST="$(sed -n ${DISTRIB}/rpmmacros -e "/%dist/ s|.* ||p")"
+if [ "${DIST}" = "%nil" ]; then DIST=".${DISTRIB}"; fi
 
 mkdir -p "${HOME}/rpmbuild/RPMS/RPMS${DIST}.tde-${TDE_VERSION}"
 mkdir -p "${HOME}/rpmbuild/SRPMS/SRPMS${DIST}.tde-${TDE_VERSION}"

redhat/extras/fileshareset/fileshareset.spec

@@ -67,7 +67,7 @@ This utility was originally written for openSUSE KDE3.
 
 %prep
 %setup -q -n fileshareset2
-%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "ltmain.sh"
+%__cp -f "/usr/share/libtool/config/ltmain.sh" "." || %__cp -f "/usr/share/libtool/"*"/ltmain.sh" "." || %__cp -f "/usr/share/libtool/ltmain.sh" "."
 aclocal
 autoconf
 automake -a -c
@@ -97,7 +97,7 @@ chmod 0755 "%{?buildroot}%{_bindir}/fileshareset"
 
 # Rename binary to avoid conflict with kde3
 mv "%{?buildroot}%{_bindir}/fileshareset" "%{?buildroot}%{_bindir}/fileshareset2"
-ln -sf "fileshareset2"  "%{?buildroot}%{_bindir}/filesharelist"
+ln -sf "fileshareset2" "%{?buildroot}%{_bindir}/filesharelist"
 
 
 %clean

redhat/extras/htdig/htdig.spec

@@ -1,6 +1,12 @@
 %define _disable_ld_as_needed 1
 %define _disable_ld_no_undefined 1
 
+%if 0%{?mdkver} >= 5000000
+%global __cc /usr/bin/gcc
+%global __cxx /usr/bin/g++
+%global prefer_gcc 1
+%endif
+
 %define contentdir /var/www
 
 Summary:	A web indexing and searching system for a small domain or intranet
@@ -26,6 +32,9 @@ BuildRequires:	zlib-devel
 
 BuildRoot:	%{_tmppath}/%{name}-buildroot
 
+Provides: group(htdig)
+Provides: user(htdig)
+
 %description
 The ht://Dig system is a complete world wide web indexing and searching system 
 for a small domain or intranet. This system is not meant to replace the need 
@@ -105,10 +114,10 @@ Libraries needed to develop for htdig.
 %defattr(-,root,root)
 %doc ChangeLog
 %doc htdoc/*
-%{_libdir}/htdig/*.a
+#%{_libdir}/htdig/*.a
 %{_libdir}/htdig/*.la
 %{_libdir}/htdig/*[a-z].so
-%{_libdir}/htdig_db/*.a
+#%{_libdir}/htdig_db/*.a
 %{_libdir}/htdig_db/*.la
 %{_libdir}/htdig_db/*[a-z].so
 %{_includedir}/*

redhat/extras/pinentry-tqt/pinentry-tqt.spec

@@ -45,7 +45,13 @@ BuildRequires:	autoconf automake libtool m4
 BuildRequires:	pkgconfig
 
 BuildRequires:	libassuan-devel
+
+# SECRET support
+%if 0%{?mdkver} >= 5000000
+BuildRequires:	%{_lib}secret-devel
+%else
 BuildRequires:	libsecret-devel
+%endif
 
 Requires:		pinentry
 

redhat/extras/trinity-filesystem/trinity-filesystem.spec

@@ -65,7 +65,6 @@ This package installs the Trinity directory structure.
 %dir %{tde_bindir}
 
 %dir %{tde_datadir}
-%dir %{tde_confdir}
 %dir %{tde_confdir}/magic
 
 %dir %{tde_docdir}

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"
 
 

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

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

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

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

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

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"
 
 

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*