RPM: initial support for OpenMandriva

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

14 files changed, 97 insertions, 17 deletions

diff --git a/redhat/applications/utilities/abakus/abakus.spec b/redhat/applications/utilities/abakus/abakus.spec
index 1b563c2a7..4e11d387e 100644
--- a/redhat/applications/utilities/abakus/abakus.spec
+++ b/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
diff --git a/redhat/applications/utilities/filelight/filelight.spec b/redhat/applications/utilities/filelight/filelight.spec
index d60ea5a00..32825f481 100644
--- a/redhat/applications/utilities/filelight/filelight.spec
+++ b/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
diff --git a/redhat/applications/utilities/kbarcode/kbarcode.spec b/redhat/applications/utilities/kbarcode/kbarcode.spec
index 174ab4f3a..6164dc971 100644
--- a/redhat/applications/utilities/kbarcode/kbarcode.spec
+++ b/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
diff --git a/redhat/applications/utilities/kchmviewer/kchmviewer.spec b/redhat/applications/utilities/kchmviewer/kchmviewer.spec
index 45104c44a..b3c11038d 100644
--- a/redhat/applications/utilities/kchmviewer/kchmviewer.spec
+++ b/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
diff --git a/redhat/applications/utilities/kcpuload/kcpuload.spec b/redhat/applications/utilities/kcpuload/kcpuload.spec
index cdcc2f155..04cc9a1cd 100644
--- a/redhat/applications/utilities/kcpuload/kcpuload.spec
+++ b/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
diff --git a/redhat/applications/utilities/kdirstat/kdirstat.spec b/redhat/applications/utilities/kdirstat/kdirstat.spec
index 171b73c2b..08cd58522 100644
--- a/redhat/applications/utilities/kdirstat/kdirstat.spec
+++ b/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
diff --git a/redhat/applications/utilities/keep/keep.spec b/redhat/applications/utilities/keep/keep.spec
index 0c9cc3b18..d76f6b613 100644
--- a/redhat/applications/utilities/keep/keep.spec
+++ b/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
diff --git a/redhat/applications/utilities/knutclient/knutclient.spec b/redhat/applications/utilities/knutclient/knutclient.spec
index e9a253199..2f96d7d0b 100644
--- a/redhat/applications/utilities/knutclient/knutclient.spec
+++ b/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
diff --git a/redhat/applications/utilities/kommando/kommando.spec b/redhat/applications/utilities/kommando/kommando.spec
index 19a1e09ed..cc39c7652 100644
--- a/redhat/applications/utilities/kommando/kommando.spec
+++ b/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
diff --git a/redhat/applications/utilities/kompose/kompose.spec b/redhat/applications/utilities/kompose/kompose.spec
index bfbab4f42..e9d65c5a4 100644
--- a/redhat/applications/utilities/kompose/kompose.spec
+++ b/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
diff --git a/redhat/applications/utilities/krename/krename.spec b/redhat/applications/utilities/krename/krename.spec
index 714e58ed5..5b1b0e216 100644
--- a/redhat/applications/utilities/krename/krename.spec
+++ b/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
diff --git a/redhat/applications/utilities/ksensors/ksensors.spec b/redhat/applications/utilities/ksensors/ksensors.spec
index b2f407043..f9f515aa2 100644
--- a/redhat/applications/utilities/ksensors/ksensors.spec
+++ b/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
diff --git a/redhat/applications/utilities/mathemagics/mathemagics.spec b/redhat/applications/utilities/mathemagics/mathemagics.spec
index 3bb95745c..be04a512f 100644
--- a/redhat/applications/utilities/mathemagics/mathemagics.spec
+++ b/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
diff --git a/redhat/applications/utilities/qalculate-tde/qalculate-tde.spec b/redhat/applications/utilities/qalculate-tde/qalculate-tde.spec
index 3b5687601..a343befe6 100644
--- a/redhat/applications/utilities/qalculate-tde/qalculate-tde.spec
+++ b/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