Clean up ancient Fedora and RHEL conditionals

RHEL-5 reached EOL in March of 2017.  Fedora-24 is similarly EOL.
This commit is contained in:
Todd Zullinger 2018-08-24 13:12:21 -04:00
parent 434c418ed5
commit a61baffdc8
1 changed files with 5 additions and 11 deletions

View File

@ -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 <tmz@pobox.com>
- Clean up ancient Fedora and RHEL conditionals
* Mon Jul 23 2018 Nick Bebout <nb@fedoraproject.org> - 1.7.1-2
- Add gcc-c++ and redhat-rpm-config to znc-devel's dependencies