RPM packaging: update R14 packages

diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14
index ab00f4b..2f8826c 100644
--- a/redhat/Makefile.r14
+++ b/redhat/Makefile.r14
@@ -27,25 +27,25 @@
 
 
 ### 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 @@
 tqt3:
 	$(call buildpkg,dependencies/tqt3)
 
-tqtinterface:	tqt3
+tqtinterface:	tqt3 cmake
 	$(call buildpkg,dependencies/tqtinterface)
 
 # Main packages
@@ -82,7 +82,7 @@
 tdeartwork:	tdebase
 	$(call buildpkg,tdeartwork)
 
-tdebase:	tdelibs htdig
+tdebase:	tdelibs htdig cmake
 	$(call buildpkg,tdebase)
 
 tdebindings:	tdebase tqscintilla
@@ -94,10 +94,10 @@
 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 @@
 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 @@
 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
 
-libcurl:
+libcurl: automake libtool
 # Build on CentOS 5 only
 ifneq ($(wildcard /boot/vmlinuz*.el5*),)
 	$(call buildpkg,3rdparty/curl)
@@ -165,10 +183,22 @@
 	$(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:
@@ -258,7 +288,7 @@
 adept:	tdebase
 	$(call buildpkg,applications/adept)
 
-amarok:	tdebase
+amarok:	tdebase cmake
 	$(call buildpkg,applications/amarok)
 
 basket:	tdebase
@@ -611,7 +641,7 @@
 koffice-i18n:	tdebase
 	$(call buildpkg,applications/koffice-i18n)
 
-tde-i18n:	tdebase
+tde-i18n:	tdebase cmake
 	$(call buildpkg,tde-i18n)
 
 ### Meta packages
diff --git a/redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec b/redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec
index 5ca9c11..a18b767 100644
--- a/redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec
+++ b/redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec
@@ -141,6 +141,12 @@
 /sbin/ldconfig
 touch --no-create %{tde_datadir}/icons/hicolor || :
 gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
+# Prevent autostart of 'nm-applet', if installed.
+if [ -r "/etc/xdg/autostart/nm-applet.desktop" ]; then
+  if ! grep -qw "TDE" "/etc/xdg/autostart/nm-applet.desktop" ; then
+    sed -i "/etc/xdg/autostart/nm-applet.desktop" -e "s|\(NotShowIn=.*\)|\1TDE;|"
+  fi
+fi
 
 %postun
 update-desktop-database %{tde_appdir} > /dev/null
diff --git a/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec b/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec
index ef4ff63..288aed6 100644
--- a/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec
+++ b/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec
@@ -40,7 +40,8 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-#Patch0:		tdepowersave-14.0.0-test.patch
+
+Patch1:		1391880088:c68a1bac04c5cfdb0cdcbd91dc54995bfa05e292.diff
 
 BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
 BuildRequires:	trinity-arts-devel >= 1:1.5.10
@@ -88,7 +89,7 @@
 
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-#patch0 -p1 -b .test
+%patch1 -R -p1
 
 
 %build
diff --git a/redhat/build/get_rpm_package_name.sh b/redhat/build/get_rpm_package_name.sh
index 7127329..63a1961 100755
--- a/redhat/build/get_rpm_package_name.sh
+++ b/redhat/build/get_rpm_package_name.sh
@@ -22,7 +22,7 @@
 # Use the Trinity Prefix, or not.
 case "${PKGNAME}" in
   "trinity-"*|"qt3"|"python-qt3"|"esound") PREFIX="";;
-  "gnuchess"|"htdig"|"imlib1"|"libotr3"|"lilypond"|"mftrace"|"pcsc-perl"|"torsocks"|"wv2") PREFIX="";;
+  "autoconf"|"automake"|"cmake"|"gnuchess"|"htdig"|"imlib1"|"libotr3"|"libtool"|"lilypond"|"m4"|"mftrace"|"pcsc-perl"|"torsocks"|"wv2") PREFIX="";;
   "curl") PREFIX="trinity-lib";;
   *) PREFIX="trinity-";;
 esac
diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0-rhel5_ftbfs.patch b/redhat/dependencies/tqt3/tqt3-14.0.0-rhel5_ftbfs.patch
new file mode 100644
index 0000000..beb82b4
--- /dev/null
+++ b/redhat/dependencies/tqt3/tqt3-14.0.0-rhel5_ftbfs.patch
@@ -0,0 +1,35 @@
+--- trinity-tqt3-14.0.0~pre193+a9ec6a15/src/kernel/ntqstyle.h.ORI	2014-05-04 12:49:48.579786273 -0400
++++ trinity-tqt3-14.0.0~pre193+a9ec6a15/src/kernel/ntqstyle.h	2014-05-04 12:50:00.948216121 -0400
+@@ -287,6 +287,7 @@
+ 		TQ_UINT32 topLevelWidgetFlags;
+ 		TQPixmap paletteBgPixmap;
+ 
++/*
+ #ifdef ENABLE_TQSTYLECONTROLELEMENTDATA_SLOW_COPY
+ 	public:
+ 		TQStyleControlElementData(const TQStyleControlElementData&);
+@@ -295,6 +296,7 @@
+ 		// Disable copy constructor
+ 		TQStyleControlElementData(const TQStyleControlElementData&);
+ #endif // ENABLE_TQSTYLECONTROLELEMENTDATA_SLOW_COPY
++*/
+ 
+ };
+ 
+--- trinity-tqt3-14.0.0~pre193+a9ec6a15/src/kernel/qstyle.cpp.ORI	2014-05-04 12:50:38.499448860 -0400
++++ trinity-tqt3-14.0.0~pre193+a9ec6a15/src/kernel/qstyle.cpp	2014-05-04 12:50:49.766018474 -0400
+@@ -2836,6 +2836,7 @@
+ 	//
+ }
+ 
++/*
+ TQStyleControlElementData::TQStyleControlElementData(const TQStyleControlElementData& orig) {
+ 	isNull = orig.isNull;
+ 	widgetObjectTypes = orig.widgetObjectTypes;
+@@ -2898,5 +2899,6 @@
 ** Diff limit reached (max: 250 lines) **

Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging

 ** Diff limit reached (max: 250 lines) **