From a61baffdc8f16046d65ec9e2f2774c3904d51016 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Fri, 24 Aug 2018 13:12:21 -0400 Subject: [PATCH] Clean up ancient Fedora and RHEL conditionals RHEL-5 reached EOL in March of 2017. Fedora-24 is similarly EOL. --- znc.spec | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/znc.spec b/znc.spec index bc68124..3cf6dd3 100644 --- a/znc.spec +++ b/znc.spec @@ -30,9 +30,9 @@ BuildRequires: libicu-devel BuildRequires: openssl-devel >= 0.9.8 BuildRequires: perl(ExtUtils::Embed) -%if (0%{?fedora} && 0%{?fedora} <= 24) || (0%{?rhel} && 0%{?rhel} <= 9) +%if 0%{?rhel} && 0%{?rhel} <= 9 Obsoletes: znc-extra <= %{version}-%{release} -%endif # (0%{?fedora} && 0%{?fedora} <= 24) || (0%{?rhel} && 0%{?rhel} <= 9) +%endif # 0%{?rhel} && 0%{?rhel} <= 9 Requires(pre): shadow-utils BuildRequires: systemd @@ -135,21 +135,12 @@ chmod -x modules/q.cpp %install -%if 0%{?rhel} && 0%{?rhel} <= 5 -%__rm -Rf "%{buildroot}" -%endif # 0%{?rhel} && 0%{?rhel} <= 5 %__make install DESTDIR="%{buildroot}" mkdir -p %buildroot%{_unitdir} #install -m 0644 %{SOURCE1} %buildroot%{_unitdir}/znc.service install -d "%{buildroot}%{_sharedstatedir}/znc" -%if 0%{?rhel} && 0%{?rhel} <= 5 -%clean -%__rm -Rf "%{buildroot}" -%endif # 0%{?rhel} && 0%{?rhel} <= 5 - - %pre getent group znc >/dev/null || groupadd -r znc getent passwd znc >/dev/null || \ @@ -259,6 +250,9 @@ getent passwd znc >/dev/null || \ %changelog +* Fri Aug 24 2018 Todd Zullinger +- Clean up ancient Fedora and RHEL conditionals + * Mon Jul 23 2018 Nick Bebout - 1.7.1-2 - Add gcc-c++ and redhat-rpm-config to znc-devel's dependencies