2 files changed, 21 insertions, 4 deletions
diff --git a/redhat/applications/kaffeine/kaffeine-14.0.0.spec b/redhat/applications/kaffeine/kaffeine-14.0.0.spec
index 7a24c867a..078caea0d 100644
--- a/redhat/applications/kaffeine/kaffeine-14.0.0.spec
+++ b/redhat/applications/kaffeine/kaffeine-14.0.0.spec
@@ -64,10 +64,16 @@ BuildRequires:	libcdio-paranoia-devel
 
 # X11 stuff
 %if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mgaversion} >= 4
+BuildRequires:	%{_lib}xext-devel
+BuildRequires:	%{_lib}xtst-devel
+BuildRequires:	%{_lib}xinerama-devel
+%else
 BuildRequires:	%{_lib}xext%{?mgaversion:6}-devel
 BuildRequires:	%{_lib}xtst%{?mgaversion:6}-devel
 BuildRequires:	%{_lib}xinerama%{?mgaversion:1}-devel
 %endif
+%endif
 %if 0%{?rhel} == 4
 BuildRequires:	xorg-x11-devel 
 %endif
@@ -216,11 +222,11 @@ Requires:		%{name} = %{version}-%{release}
 
 ##########
 
-
 %if 0%{?suse_version} || 0%{?pclinuxos}
 %debug_package
 %endif
 
+##########
 
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
@@ -230,6 +236,7 @@ Requires:		%{name} = %{version}-%{release}
 %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
 %__make -f "admin/Makefile.common"
 
+
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
@@ -275,6 +282,7 @@ export PATH="%{tde_bindir}:${PATH}"
 rm -f $RPM_BUILD_ROOT%{tde_libdir}/lib*.la
 rm -f $RPM_BUILD_ROOT%{tde_datadir}/mimelnk/application/x-mplayer2.desktop
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
diff --git a/redhat/tdebase/tdebase-14.0.0.spec b/redhat/tdebase/tdebase-14.0.0.spec
index 7781973d6..9998f6721 100644
--- a/redhat/tdebase/tdebase-14.0.0.spec
+++ b/redhat/tdebase/tdebase-14.0.0.spec
@@ -406,8 +406,12 @@ BuildRequires:	xorg-x11-proto-devel
 BuildRequires:	gnome-screensaver
 %endif
 %if 0%{?mgaversion} || 0%{?mdkversion}
+%if 0%{?mgaversion} >= 4
+BuildRequires:	%{_lib}xscrnsaver-devel
+%else
 BuildRequires:	%{_lib}xscrnsaver%{?mgaversion:1}-devel
 %endif
+%endif
 %if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} >= 1220
 BuildRequires:	xscreensaver
 BuildRequires:	libXScrnSaver-devel
@@ -499,10 +503,16 @@ BuildRequires:	libfontenc-devel
 %endif
 
 %if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires:	%{_lib}xcomposite%{?mgaversion:1}-devel
 BuildRequires:	%{_lib}xdamage-devel
+%if 0%{?mgaversion} >= 4
+BuildRequires:	%{_lib}xcomposite-devel
+BuildRequires:	%{_lib}xdmcp-devel
+BuildRequires:	%{_lib}xtst-devel
+%else
+BuildRequires:	%{_lib}xcomposite%{?mgaversion:1}-devel
 BuildRequires:	%{_lib}xdmcp%{?mgaversion:6}-devel
 BuildRequires:	%{_lib}xtst%{?mgaversion:6}-devel
+%endif
 BuildRequires:	x11-font-util
 BuildRequires:	x11-proto-devel
 %endif
@@ -3349,8 +3359,7 @@ if [ -x "/usr/bin/reboot" ]; then
 fi
 if [ -n "${REBOOT}" ]; then
   %__sed -i \
-    "doc/tdm/index.docbook" \
-    "doc/kcontrol/tdm/index.docbook" \
+    "doc/tdm/tdmrc-ref.docbook" \
     "kcontrol/tdm/tdm-shut.cpp" \
     "tdm/config.def" \
   -e "s|/sbin/poweroff|${POWEROFF}|g" \