Drop modification of the configuration file to add
systemd supervision - Remi correctly points out this
is redundant (due to unit files already overriding)
and will just cause issues.
Noticed the build runs twice also, once during the
%build phase and once again during %install (full
rebuild) - this was because of differing options on
the make lines (CFLAGS= etc vs PREFIX= etc) and the
Redis src/Makefile causes full rebuild as a result
(including of deps/* which it "make distclean"s).
Also fixed a rpmbuild "warning: Macro expanded in
comment" message in a couple of places, and changed
the way we squash hidden build messages to use the
"V" macro as the Makefiles intended.
Add "--supervised systemd" to the command line, and
drop the "--daemonize" option as Redis already does
this internally in supervised mode.
Add Provides:bundled spec file lines for linenoise,
lua-libs and hiredis.
For cases where we have two ways of doing one thing (using
a patch or sed-based modification of files), rework these
such that we're only using one method. Allows several of
the patches to be dropped.
Described in https://github.com/antirez/redis/issues/1417
is a method for allowing integration/replication-psync to
be reliably run - start using it, and drop the patch that
was disabling that test.
Other small side-effects of this commit:
- the build warning about "jemalloc not found" is fixed;
- CFLAGS additions are now consistently handled (for deps
as well) - using the upstream-provided mechanism for
compiler flag propogation.
Enable the systemd supervision support in redis
configuration files and update the service type
in the systemd service file to enable its use.
This resolves RHBZ #1172841.
Merge the redis-trib sub-package patch originally from
Sebastian Saletnik with added conditionals for building
on platforms with no ruby redis gem (EPEL6 and Fedoras
before f19).
This resolves Redis RHBZ #1215654.
Add RuntimeDirectory=redis to systemd unit file (RHBZ #1454700)
Mark rundir as %ghost since it may disappear (tmpfs - #1454700)
Fix a shutdown failure with Unix domain sockets (RHBZ #1444988)
Patch contributed by Nathan Scott
