RPM packaging: update R14 packages

1 files changed, 45 insertions, 15 deletions

diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14
index ab00f4ba4..2f8826c8c 100644
--- a/redhat/Makefile.r14
+++ b/redhat/Makefile.r14
@@ -27,25 +27,25 @@ i18n:	gwenview-i18n k3b-i18n koffice-i18n tde-i18n
 
 
 ### Trinity Dependencies
-arts:	tqtinterface esound
+arts:	tqtinterface esound cmake
 	$(call buildpkg,dependencies/arts)
 
 avahi-tqt:	tqtinterface
 	$(call buildpkg,dependencies/avahi-tqt)
 
-dbus-1-tqt:	tqtinterface
+dbus-1-tqt:	tqtinterface cmake
 	$(call buildpkg,dependencies/dbus-1-tqt)
 
-dbus-tqt: tqtinterface
+dbus-tqt: tqtinterface cmake
 	$(call buildpkg,dependencies/dbus-tqt)
 
 libart_lgpl:	tqtinterface
 	$(call buildpkg,dependencies/libart-lgpl)
 
-libcaldav: tqtinterface libcurl
+libcaldav: tqtinterface autoconf libcurl
 	$(call buildpkg,dependencies/libcaldav)
 
-libcarddav:	tqtinterface libcurl
+libcarddav:	tqtinterface autoconf libcurl
 	$(call buildpkg,dependencies/libcarddav)
 	
 python-tqt: sip4-tqt tdelibs
@@ -66,7 +66,7 @@ tqscintilla: tqca-tls tdelibs
 tqt3:
 	$(call buildpkg,dependencies/tqt3)
 
-tqtinterface:	tqt3
+tqtinterface:	tqt3 cmake
 	$(call buildpkg,dependencies/tqtinterface)
 
 # Main packages
@@ -82,7 +82,7 @@ tdeadmin:	tdebase
 tdeartwork:	tdebase
 	$(call buildpkg,tdeartwork)
 
-tdebase:	tdelibs htdig
+tdebase:	tdelibs htdig cmake
 	$(call buildpkg,tdebase)
 
 tdebindings:	tdebase tqscintilla
@@ -94,10 +94,10 @@ tdeedu:	tdebase
 tdegames:	tdebase tdemultimedia
 	$(call buildpkg,tdegames)
 
-tdegraphics:	tdebase poppler
+tdegraphics:	tdebase poppler cmake
 	$(call buildpkg,tdegraphics)
 
-tdelibs:	tqt3 tqtinterface arts dbus-tqt dbus-1-tqt
+tdelibs:	tqt3 tqtinterface arts dbus-tqt dbus-1-tqt cmake
 	$(call buildpkg,tdelibs)
 
 tdemultimedia:	tdebase akode
@@ -106,10 +106,10 @@ tdemultimedia:	tdebase akode
 tdenetwork:	tdebase
 	$(call buildpkg,tdenetwork)
 
-tdepim:	tdebase libcaldav libcarddav
+tdepim:	tdebase libcaldav libcarddav cmake
 	$(call buildpkg,tdepim)
 
-tdesdk:		tdebase tdebindings
+tdesdk:		tdebase tdebindings cmake
 	$(call buildpkg,tdesdk)
 
 tdetoys:	tdebase
@@ -118,13 +118,31 @@ tdetoys:	tdebase
 tdeutils:	tdebase
 	$(call buildpkg,tdeutils)
 
-tdevelop:	tdebase tdesdk
+tdevelop:	tdebase tdesdk cmake
 	$(call buildpkg,tdevelop)
 
 tdewebdev:	tdebase tdesdk
 	$(call buildpkg,tdewebdev)
 
 ### 3rd party libraries and tools
+autoconf: m4
+# Build on CentOS 5 only
+ifneq ($(wildcard /boot/vmlinuz*.el5*),)
+	$(call buildpkg,3rdparty/autoconf)
+endif
+
+automake:
+# Build on CentOS 5 only
+ifneq ($(wildcard /boot/vmlinuz*.el5*),)
+	$(call buildpkg,3rdparty/automake)
+endif
+
+cmake:
+# Build on CentOS only
+ifneq ($(wildcard /etc/centos-release /boot/vmlinuz*.el5*),)
+	$(call buildpkg,3rdparty/cmake)
+endif
+
 esound:
 # Build on Mageia only
 ifneq ($(wildcard /etc/mageia-release),)
@@ -153,7 +171,7 @@ endif
 endif
 endif
 
-libcurl:
+libcurl: automake libtool
 # Build on CentOS 5 only
 ifneq ($(wildcard /boot/vmlinuz*.el5*),)
 	$(call buildpkg,3rdparty/curl)
@@ -165,12 +183,24 @@ ifneq ($(wildcard /etc/mageia-release),)
 	$(call buildpkg,3rdparty/libotr3)
 endif
 
+libtool: autoconf automake
+# Build on CentOS 5 only
+ifneq ($(wildcard /boot/vmlinuz*.el5*),)
+	$(call buildpkg,3rdparty/libtool)
+endif
+
 lilypond: mftrace
 # Build on CentOS only
 ifneq ($(wildcard /etc/centos-release),)
 	$(call buildpkg,3rdparty/lilypond)
 endif
 
+m4:
+# Build on CentOS 5 only (vendor-provided Poppler is too old)
+ifneq ($(wildcard /boot/vmlinuz*.el5*),)
+	$(call buildpkg,3rdparty/m4)
+endif
+
 mftrace:
 # Build on CentOS only
 ifneq ($(wildcard /etc/centos-release),)
@@ -258,7 +288,7 @@ abakus:	tdebase
 adept:	tdebase
 	$(call buildpkg,applications/adept)
 
-amarok:	tdebase
+amarok:	tdebase cmake
 	$(call buildpkg,applications/amarok)
 
 basket:	tdebase
@@ -611,7 +641,7 @@ k3b-i18n:	tdebase
 koffice-i18n:	tdebase
 	$(call buildpkg,applications/koffice-i18n)
 
-tde-i18n:	tdebase
+tde-i18n:	tdebase cmake
 	$(call buildpkg,tde-i18n)
 
 ### Meta packages