RPM Packaging: update R14 packages

pull/3/head
François Andriot 11 years ago
parent 90a3605536
commit 6453d918fe

@ -395,8 +395,12 @@ BuildRequires: xorg-x11-proto-devel
BuildRequires: gnome-screensaver BuildRequires: gnome-screensaver
%endif %endif
%if 0%{?mgaversion} || 0%{?mdkversion} %if 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{?mgaversion} >= 4
BuildRequires: %{_lib}xscrnsaver-devel
%else
BuildRequires: %{_lib}xscrnsaver%{?mgaversion:1}-devel BuildRequires: %{_lib}xscrnsaver%{?mgaversion:1}-devel
%endif %endif
%endif
%if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} >= 1220 %if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} >= 1220
BuildRequires: xscreensaver BuildRequires: xscreensaver
BuildRequires: libXScrnSaver-devel BuildRequires: libXScrnSaver-devel
@ -488,10 +492,16 @@ BuildRequires: libfontenc-devel
%endif %endif
%if 0%{?mgaversion} || 0%{?mdkversion} %if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}xcomposite%{?mgaversion:1}-devel
BuildRequires: %{_lib}xdamage-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}xdmcp%{?mgaversion:6}-devel
BuildRequires: %{_lib}xtst%{?mgaversion:6}-devel BuildRequires: %{_lib}xtst%{?mgaversion:6}-devel
%endif
BuildRequires: x11-font-util BuildRequires: x11-font-util
BuildRequires: x11-proto-devel BuildRequires: x11-proto-devel
%endif %endif
@ -3338,8 +3348,7 @@ if [ -x "/usr/bin/reboot" ]; then
fi fi
if [ -n "${REBOOT}" ]; then if [ -n "${REBOOT}" ]; then
%__sed -i \ %__sed -i \
"doc/tdm/index.docbook" \ "doc/tdm/tdmrc-ref.docbook" \
"doc/kcontrol/tdm/index.docbook" \
"kcontrol/tdm/tdm-shut.cpp" \ "kcontrol/tdm/tdm-shut.cpp" \
"tdm/config.def" \ "tdm/config.def" \
-e "s|/sbin/poweroff|${POWEROFF}|g" \ -e "s|/sbin/poweroff|${POWEROFF}|g" \

Loading…
Cancel
Save