#1 fix if conditions
Merged 2 years ago by tdawson. Opened 2 years ago by ignatenkobrain.
Unknown source rhel-conds  into  master

file modified
+5 -7

@@ -72,7 +72,7 @@

  Group:		Development/Languages

  License:	ASL 2.0

  URL:		https://www.erlang.org

- %if 0%{?el7}%{?fedora}

+ %if ! (0%{?rhel} && 0%{?rhel} <= 6)

  VCS:		scm:git:https://github.com/erlang/otp

  %endif

  Source0:	https://github.com/erlang/otp/archive/OTP-%{version}/otp-OTP-%{version}.tar.gz

@@ -118,13 +118,11 @@

  %endif

  %endif

  

- %if 0%{?el7}%{?fedora}

+ %if ! (0%{?rhel} && 0%{?rhel} <= 6)

  # for <systemd/sd-daemon.h>

  BuildRequires:	systemd-devel

  BuildRequires:	systemd

- Requires(post):	systemd

- Requires(preun):systemd

- Requires(postun):systemd

+ %{?systemd_requires}

  Requires:	systemd

  %endif

  BuildRequires:	autoconf

@@ -1116,7 +1114,7 @@

  %endif %{__with_java}

  

  # systemd-related stuff

- %if 0%{?el7}%{?fedora}

+ %if ! (0%{?rhel} && 0%{?rhel} <= 6)

  install -D -p -m 0644 %{SOURCE5} %{buildroot}%{_unitdir}/epmd.service

  install -D -p -m 0644 %{SOURCE6} %{buildroot}%{_unitdir}/epmd.socket

  install -D -p -m 0644 %{SOURCE7} %{buildroot}%{_unitdir}/epmd@.service

@@ -1500,7 +1498,7 @@

  %endif

  %{_libdir}/erlang/releases/*

  %{_libdir}/erlang/usr/

- %if 0%{?el7}%{?fedora}

+ %if ! (0%{?rhel} && 0%{?rhel} <= 6)

  %{_unitdir}/epmd.service

  %{_unitdir}/epmd.socket

  %{_unitdir}/epmd@.service

Looks Good.
Thanks for fixing this.

Pull-Request has been merged by tdawson

2 years ago