summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2020-10-31 23:21:55 +0100
committerFrançois Andriot <albator78@libertysurf.fr>2020-10-31 23:21:55 +0100
commit1a41c9170b162b7e6f8fc93f26a025b203aa8de5 (patch)
treecb9ca91d5dfa3ec4f4ac97aaf15e097325072ee9
parenta815976a0aebcb84d0d4290b4f17f015f7212436 (diff)
downloadtde-packaging-1a41c9170b162b7e6f8fc93f26a025b203aa8de5.tar.gz
tde-packaging-1a41c9170b162b7e6f8fc93f26a025b203aa8de5.zip
RPM: fix some build issues on OBS
-rw-r--r--redhat/applications/abakus/abakus.spec10
-rw-r--r--redhat/applications/tdedocker/tdedocker.spec14
-rw-r--r--redhat/applications/tdepacman/tdepacman.spec4
3 files changed, 28 insertions, 0 deletions
diff --git a/redhat/applications/abakus/abakus.spec b/redhat/applications/abakus/abakus.spec
index 5c5b38497..78025f9b2 100644
--- a/redhat/applications/abakus/abakus.spec
+++ b/redhat/applications/abakus/abakus.spec
@@ -83,6 +83,16 @@ BuildRequires: gamin-devel
# OPENSSL support
BuildRequires: openssl-devel
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires: update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires: brp-check-trinity
+%endif
+
%description
AbaKus is a complex calculator, which provides
diff --git a/redhat/applications/tdedocker/tdedocker.spec b/redhat/applications/tdedocker/tdedocker.spec
index 3669aca04..638990a6c 100644
--- a/redhat/applications/tdedocker/tdedocker.spec
+++ b/redhat/applications/tdedocker/tdedocker.spec
@@ -77,6 +77,20 @@ BuildRequires: openssl-devel
# XKBFILES support
BuildRequires: libxkbfile-devel
+# XMU support
+%if 0%{?suse_version} == 1140
+BuildRequires: xorg-x11-libXmu-devel
+%endif
+%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} >= 1210
+BuildRequires: libXmu-devel
+%endif
+%if 0%{?mdkversion} || 0%{?mgaversion} >= 4
+BuildRequires: libxmu-devel
+%endif
+%if 0%{?mgaversion} == 2 || 0%{?mgaversion} == 3
+BuildRequires: %{_lib}xmu%{?mgaversion:6}-devel
+%endif
+
# SUSE desktop files utility
%if 0%{?suse_version}
BuildRequires: update-desktop-files
diff --git a/redhat/applications/tdepacman/tdepacman.spec b/redhat/applications/tdepacman/tdepacman.spec
index 3046e74f4..d47b704e8 100644
--- a/redhat/applications/tdepacman/tdepacman.spec
+++ b/redhat/applications/tdepacman/tdepacman.spec
@@ -89,6 +89,10 @@ United States by Bally, Pacman is an icon of 1980's popular culture
%build
+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
%__mkdir_p build
cd build