RPM Packaging: massive update

1 files changed, 28 insertions, 17 deletions

diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14
index 1b9e44d82..3c778624d 100644
--- a/redhat/Makefile.r14
+++ b/redhat/Makefile.r14
@@ -33,7 +33,7 @@ extras:	icons-nuvola kdevmon kdissert klamav klibido knoda kompose koverartist k
 arts:	tqtinterface trinity-filesystem esound cmake
 	$(call buildpkg,dependencies/arts)
 
-avahi-tqt:	tqtinterface autoconf automake libtool
+avahi-tqt:	tqtinterface autoconf automake libtool2
 	$(call buildpkg,dependencies/avahi-tqt)
 
 dbus-1-tqt:	tqtinterface cmake
@@ -42,7 +42,7 @@ dbus-1-tqt:	tqtinterface cmake
 dbus-tqt: tqtinterface cmake
 	$(call buildpkg,dependencies/dbus-tqt)
 
-libart_lgpl:	tqtinterface libtool
+libart_lgpl:	tqtinterface libtool2
 	$(call buildpkg,dependencies/libart-lgpl)
 
 libcaldav: tqtinterface autoconf libcurl
@@ -85,7 +85,7 @@ tdeadmin:	tdebase
 tdeartwork:	tdebase
 	$(call buildpkg,main/tdeartwork)
 
-tdebase:	tdelibs cmake htdig fileshareset libconfig
+tdebase:	tdelibs cmake htdig fileshareset
 	$(call buildpkg,main/tdebase)
 
 tdebindings:	tdebase tqscintilla
@@ -174,23 +174,16 @@ endif
 endif
 endif
 
-libconfig:
+libcurl: automake libtool2
 # Build on CentOS 5 only
-ifneq ($(wildcard /boot/vmlinuz*.el5*),)
-	$(call buildpkg,3rdparty/libconfig)
-endif
-	
-
-libcurl: automake libtool
-# Build on CentOS 5 only
-ifneq ($(wildcard /boot/vmlinuz*.el5*),)
+ifneq ($(wildcard /boot/vmlinuz*.el4*),)
 	$(call buildpkg,3rdparty/curl)
 endif
 
-libtool: autoconf automake
+libtool2: autoconf automake
 # Build on CentOS 5 only
 ifneq ($(wildcard /boot/vmlinuz*.el5*),)
-	$(call buildpkg,3rdparty/libtool)
+	$(call buildpkg,3rdparty/libtool2)
 endif
 
 lilypond: mftrace
@@ -246,7 +239,7 @@ endif
 
 ### Extra packages
 akode:	tqtinterface
-	$(call buildpkg,extras/akode)
+	$(call buildpkg,dependencies/akode)
 
 cmake-macros: cmake
 ifneq ($(wildcard /etc/SuSE-release),)
@@ -337,10 +330,16 @@ gwenview:	tdebase
 	$(call buildpkg,applications/gwenview)
 
 k3b:	tdebase
+# Do NOT build on CentOS 5 (No TDE HWLIB support)
+ifeq ($(wildcard /boot/vmlinuz*.el5*),)
 	$(call buildpkg,applications/k3b)
+endif
 
 k9copy:	tdebase k3b
+# Do NOT build on CentOS 5 (No K3B)
+ifeq ($(wildcard /boot/vmlinuz*.el5*),)
 	$(call buildpkg,applications/k9copy)
+endif
 
 kaffeine:	tdebase
 	$(call buildpkg,applications/kaffeine)
@@ -427,7 +426,9 @@ kile:	tdebase
 	$(call buildpkg,applications/kile)
 
 kima:	tdebase
+ifeq ($(wildcard /boot/vmlinuz*.el5*),)
 	$(call buildpkg,applications/kima)
+endif
 
 kiosktool:	tdebase
 	$(call buildpkg,applications/kiosktool)
@@ -553,8 +554,8 @@ potracegui:	tdebase
 	$(call buildpkg,applications/potracegui)
 
 qt4-tqt-theme-engine:	tdebase
-# Do NOT build on CentOS
-ifeq ($(wildcard /etc/centos-release),)
+# Do NOT build on CentOS 5, CentOS 6
+ifeq ($(wildcard /boot/vmlinuz*.el5* /boot/vmlinuz*.el6*),)
 	$(call buildpkg,applications/qt4-tqt-theme-engine)
 endif
 
@@ -598,7 +599,10 @@ ifeq ($(wildcard /boot/vmlinuz*.el5* /boot/vmlinuz*.el6*),)
 endif
 
 tdepowersave:	tdebase
+# Do NOT build on CentOS 5
+ifeq ($(wildcard /boot/vmlinuz*.el5*),)
 	$(call buildpkg,applications/tdepowersave)
+endif
 
 tderadio:	tdebase
 	$(call buildpkg,applications/tderadio)
@@ -641,7 +645,10 @@ gwenview-i18n:	tdebase
 	$(call buildpkg,applications/gwenview-i18n)
 
 k3b-i18n:	tdebase
+# Do NOT build on CentOS 5
+ifeq ($(wildcard /boot/vmlinuz*.el5*),)
 	$(call buildpkg,applications/k3b-i18n)
+endif
 
 koffice-i18n:	tdebase
 	$(call buildpkg,applications/koffice-i18n)
@@ -676,7 +683,9 @@ klamav:
 	$(call buildpkg,extras/klamav)
 
 klibido: pan
+ifeq ($(wildcard /boot/vmlinuz*.el5*),)
 	$(call buildpkg,extras/klibido)
+endif
 
 knoda: hk_classes
 	$(call buildpkg,extras/knoda)
@@ -694,7 +703,9 @@ mathemagics:
 	$(call buildpkg,extras/mathemagics)
 
 pan:
+ifeq ($(wildcard /boot/vmlinuz*.el5*),)
 	$(call buildpkg,3rdparty/pan)
+endif
 
 png2qrgb:
 	$(call buildpkg,extras/png2qrgb)