From 6453d918fe45209039a7931e3045a98610c253b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Thu, 6 Feb 2014 19:22:02 +0100 Subject: [PATCH] RPM Packaging: update R14 packages --- redhat/tdebase/tdebase-14.0.0.spec | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/redhat/tdebase/tdebase-14.0.0.spec b/redhat/tdebase/tdebase-14.0.0.spec index 6751ebeee..94ec3cad1 100644 --- a/redhat/tdebase/tdebase-14.0.0.spec +++ b/redhat/tdebase/tdebase-14.0.0.spec @@ -395,8 +395,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 @@ -488,10 +492,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 @@ -3338,8 +3348,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" \