RPM Packaging: fix dependency to qalculate

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

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}

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