From d56083baedc6823797515c37e5204af3103ab772 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Mon, 5 Sep 2016 19:46:18 +0200
Subject: [PATCH] RPM Packaging: fix dependency to qalculate

---
 redhat/Makefile.r14                                      | 3 +++
 redhat/applications/qalculate-tde/qalculate-tde.spec     | 2 +-
 .../extras/trinity-desktop/trinity-desktop-14.0.0.spec   | 9 ++++++---
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14
index b9f52d2a9..36fb72ed0 100644
--- a/redhat/Makefile.r14
+++ b/redhat/Makefile.r14
@@ -585,7 +585,10 @@ potracegui:	tdebase
 	$(call buildpkg,applications/potracegui)
 
 qalculate-tde:	tdebase
+# Do NOT build on CentOS 5, CentOS 6
+ifeq ($(wildcard /boot/vmlinuz*.el5* /boot/vmlinuz*.el6*),)
 	$(call buildpkg,applications/qalculate-tde)
+endif
 
 qt4-tqt-theme-engine:	tdebase
 # Do NOT build on CentOS 5, CentOS 6
diff --git a/redhat/applications/qalculate-tde/qalculate-tde.spec b/redhat/applications/qalculate-tde/qalculate-tde.spec
index 2b18cce8e..36a7aa8aa 100644
--- a/redhat/applications/qalculate-tde/qalculate-tde.spec
+++ b/redhat/applications/qalculate-tde/qalculate-tde.spec
@@ -66,7 +66,7 @@ BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	libtool
 
-BuildRequires:	qalculate-devel
+BuildRequires:	libqalculate-devel
 
 # SUSE desktop files utility
 %if 0%{?suse_version}
diff --git a/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec b/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec
index 53219ac1d..c848e39c4 100644
--- a/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec
+++ b/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec
@@ -182,7 +182,6 @@ Requires: trinity-kvkbd
 Requires: trinity-kvpnc
 Requires: trinity-kxmleditor
 Requires: trinity-mplayerthumbs
-Requires: trinity-qalculate-tde
 Requires: trinity-piklab
 Requires: trinity-potracegui
 Requires: trinity-smb4k
@@ -242,9 +241,13 @@ Requires: trinity-tdepowersave
 #Requires: trinity-gtk3-tqt-engine
 #Requires: trinity-qt4-tqt-theme-engine
 
+# Missing qalculate on older RHEL ...
+%if 0%{?rhel} == 0 || 0%{?rhel} >= 7
+Requires: trinity-qalculate-tde
+%endif
+
 # On RHEL 5/7, lilypond is not available, so no rosegarden :'-(
-%if 0%{?rhel} == 5 || 0%{?rhel} == 7
-%else
+%if 0%{?rhel} == 6 || 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?fedora}
 Requires: trinity-rosegarden
 %endif