Drop all attempts to 'fix' #1490632, revert to same as 6.1-1

Every attempt to 'fix' #1490632 had some kind of problem, and
Neil eventually left the spec in a broken state (as of 6.1-2).
Release engineering untagged 6.1-2 to stop it breaking Rawhide
composes, but then the package got bumped to 6.1-3 and rebuilt
in the broken state as part of the F28 mass rebuild.

We can't really keep doing this dance, so since Neil hasn't
indicated a further preference, I'm just reverting the package
to the state it was in before I filed #1490632 for now. This is
less of a problem than having it break composes. It's also at
least a 'clean' state (no patches against upstream).
This commit is contained in:
Adam Williamson 2018-02-15 13:27:14 -08:00
parent 2624712054
commit 9779d71249

View File

@ -4,15 +4,13 @@
Summary: Random number generator related utilities
Name: rng-tools
Version: 6.1
Release: 3%{?dist}
Release: 4%{?dist}
Group: System Environment/Base
License: GPLv2+
URL: https://github.com/nhorman/rng-tools
Source0: https://github.com/nhorman/rng-tools/archive/rng-tools-%{version}.tar.gz
Source1: rngd.service
Patch0: rngd-exit-code-for-list.patch
# https://sourceforge.net/p/gkernel/patches/111/
BuildRequires: gettext
@ -48,18 +46,6 @@ install -Dt %{buildroot}%{_unitdir} -m0644 %{SOURCE1}
%post
%systemd_post rngd.service
# Check to ensure there is at least one entropy source
# If there are none, disable the service
/usr/sbin/rngd --list -f > /dev/null 2>&1
if [ $? -eq 0 ]
then
systemctl --no-reload enable --now rngd.service > /dev/null 2>&1
else
#Disable the service if there is no entropy source
systemctl --no-reload disable --now rngd.service > /dev/null 2>&1
fi
%preun
%systemd_preun rngd.service
@ -77,6 +63,9 @@ fi
%attr(0644,root,root) %{_unitdir}/rngd.service
%changelog
* Thu Feb 15 2018 Adam Williamson <awilliam@redhat.com> - 6.1-4
- Drop all attempts to 'fix' #1490632, revert spec to same as 6.1-1
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 6.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild