Commit aa992903 authored by Jonathan Perkin's avatar Jonathan Perkin

fixes

parent f94c34ce
...@@ -125,7 +125,8 @@ ...@@ -125,7 +125,8 @@
%endif %endif
%if %{distro_specific} %if %{distro_specific}
%if %(test -f /etc/redhat-release && echo 1 || echo 0) %if %(test -f /etc/redhat-release && echo 1 || echo 0)
%define redhatver %(rpm -qf --qf '%%{version}' /etc/redhat-release | sed -e 's/^\([0-9]*\).*/\1/g') %define redhatver %(rpm -qf --qf '%%{version}' /etc/redhat-release | sed -e 's/^\\([0-9]*\\).*/\\1/g')
%{echo:Found Red Hat version %{redhatver}}
%if %redhatver == 4 %if %redhatver == 4
%define distro_description Red Hat Enterprise Linux 4 %define distro_description Red Hat Enterprise Linux 4
%define distro_releasetag rhel4 %define distro_releasetag rhel4
...@@ -138,9 +139,11 @@ ...@@ -138,9 +139,11 @@
%define distro_buildreq gcc-c++ gperf ncurses-devel perl readline-devel time zlib-devel %define distro_buildreq gcc-c++ gperf ncurses-devel perl readline-devel time zlib-devel
%define distro_requires chkconfig coreutils grep procps shadow-utils %define distro_requires chkconfig coreutils grep procps shadow-utils
%endif %endif
%endif
%else %else
%if %(test -f /etc/SuSE-release && echo 1 || echo 0) %if %(test -f /etc/SuSE-release && echo 1 || echo 0)
%define susever %(rpm -qf --qf '%%{version}' /etc/SuSE-release) %define susever %(rpm -qf --qf '%%{version}' /etc/SuSE-release)
%{echo:Found SuSE version %{susever}}
%if %susever == 10 %if %susever == 10
%define distro_description SUSE Linux Enterprise Server 10 %define distro_description SUSE Linux Enterprise Server 10
%define distro_releasetag sles10 %define distro_releasetag sles10
...@@ -154,17 +157,21 @@ ...@@ -154,17 +157,21 @@
%define distro_requires aaa_base coreutils grep procps pwdutils %define distro_requires aaa_base coreutils grep procps pwdutils
%endif %endif
%endif %endif
%endif
%endif
%if %{undefined distro_description} %if %{undefined distro_description}
%{error:Unsupported distribution} %{error:Unsupported distribution}
%endif %endif
%else %else
%define generic_kernel %(uname -r | cut -d\. -f1-2) %define generic_kernel %(uname -r | cut -d. -f1-2)
%define distro_description Generic Linux %{generic_kernel} %define distro_description Generic Linux %{generic_kernel}
%define distro_releasetag linux%{generic_kernel} %define distro_releasetag linux%{generic_kernel}
%define distro_buildreq gcc-c++ gperf ncurses-devel perl readline-devel time zlib-devel %define distro_buildreq gcc-c++ gperf ncurses-devel perl readline-devel time zlib-devel
%define distro_requires coreutils grep procps /sbin/chkconfig /usr/sbin/useradd /usr/sbin/groupadd %define distro_requires coreutils grep procps /sbin/chkconfig /usr/sbin/useradd /usr/sbin/groupadd
%endif %endif
%{echo:Building for %{distro_description}
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
# Support optional "tcmalloc" library (experimental) # Support optional "tcmalloc" library (experimental)
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment