diff options
| author | François Andriot <albator78@libertysurf.fr> | 2014-02-06 19:22:02 +0100 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2014-02-06 19:22:02 +0100 |
| commit | 6453d918fe45209039a7931e3045a98610c253b4 (patch) | |
| tree | 5b5c250b3082a0669786dd37eeec3891bfe8f23c /redhat | |
| parent | 90a360553626ac757a29708ba76c764b1b7b900c (diff) | |
| download | tde-packaging-6453d918fe45209039a7931e3045a98610c253b4.tar.gz tde-packaging-6453d918fe45209039a7931e3045a98610c253b4.zip | |
RPM Packaging: update R14 packages
Diffstat (limited to 'redhat')
| -rw-r--r-- | redhat/tdebase/tdebase-14.0.0.spec | 15 |
1 files 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" \ |