From 0df073751afb1dcc5b79ae8bfd197595fb053a88 Mon Sep 17 00:00:00 2001
From: Haikel Guemar <hguemar@fedoraproject.org>
Date: Fri, 16 Oct 2015 17:50:15 +0200
Subject: [PATCH] Revert "SPEC cleanup"

This reverts commit 1bb2f79e98fcedef51a756617f98ed3edd981ee0.

Not very useful, and makes spec even less readable
---
 redis-sentinel.service |  1 +
 redis.service          |  1 +
 redis.spec             | 31 ++++++++++++++++---------------
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/redis-sentinel.service b/redis-sentinel.service
index 42cc5c0..2ec86ae 100644
--- a/redis-sentinel.service
+++ b/redis-sentinel.service
@@ -10,3 +10,4 @@ Group=redis
 
 [Install]
 WantedBy=multi-user.target
+
diff --git a/redis.service b/redis.service
index c97ae13..1c549b4 100644
--- a/redis.service
+++ b/redis.service
@@ -10,3 +10,4 @@ Group=redis
 
 [Install]
 WantedBy=multi-user.target
+
diff --git a/redis.spec b/redis.spec
index 0626f0b..03fdabb 100644
--- a/redis.spec
+++ b/redis.spec
@@ -69,26 +69,26 @@ Requires(postun):  initscripts
 %endif
 
 %description
-Redis is an advanced key-value store. It is often referred to as a data
-structure server since keys can contain strings, hashes, lists, sets and
+Redis is an advanced key-value store. It is often referred to as a data 
+structure server since keys can contain strings, hashes, lists, sets and 
 sorted sets.
 
 You can run atomic operations on these types, like appending to a string;
-incrementing the value in a hash; pushing to a list; computing set
-intersection, union and difference; or getting the member with highest
+incrementing the value in a hash; pushing to a list; computing set 
+intersection, union and difference; or getting the member with highest 
 ranking in a sorted set.
 
-In order to achieve its outstanding performance, Redis works with an
-in-memory dataset. Depending on your use case, you can persist it either
-by dumping the dataset to disk every once in a while, or by appending
+In order to achieve its outstanding performance, Redis works with an 
+in-memory dataset. Depending on your use case, you can persist it either 
+by dumping the dataset to disk every once in a while, or by appending 
 each command to a log.
 
-Redis also supports trivial-to-setup master-slave replication, with very
-fast non-blocking first synchronization, auto-reconnection on net split
+Redis also supports trivial-to-setup master-slave replication, with very 
+fast non-blocking first synchronization, auto-reconnection on net split 
 and so forth.
 
-Other features include Transactions, Pub/Sub, Lua scripting, Keys with a
-limited time-to-live, and configuration settings to make Redis behave like
+Other features include Transactions, Pub/Sub, Lua scripting, Keys with a 
+limited time-to-live, and configuration settings to make Redis behave like 
 a cache.
 
 You can use Redis from most programming languages also.
@@ -107,7 +107,7 @@ sed -i -e 's|\t@|\t|g' deps/lua/src/Makefile
 sed -i -e 's|$(QUIET_CC)||g' src/Makefile
 sed -i -e 's|$(QUIET_LINK)||g' src/Makefile
 sed -i -e 's|$(QUIET_INSTALL)||g' src/Makefile
-# Ensure deps are built with proper flags.
+# Ensure deps are built with proper flags
 sed -i -e 's|$(CFLAGS)|%{optflags}|g' deps/Makefile
 sed -i -e 's|OPTIMIZATION?=-O3|OPTIMIZATION=%{optflags}|g' deps/hiredis/Makefile
 sed -i -e 's|$(LDFLAGS)|%{?__global_ldflags}|g' deps/hiredis/Makefile
@@ -151,12 +151,12 @@ install -pm644 %{S:2} %{buildroot}%{_unitdir}
 # Install systemd tmpfiles config.
 install -pDm644 %{S:4} %{buildroot}%{_tmpfilesdir}/%{name}.conf
 # Install systemd limit files (requires systemd >= 204)
-install -pDm644 %{S:8} %{buildroot}%{_sysconfdir}/systemd/system/%{name}.service.d/limit.conf
-install -pDm644 %{S:8} %{buildroot}%{_sysconfdir}/systemd/system/%{name}-sentinel.service.d/limit.conf
+install -p -D -m 644 %{S:8} %{buildroot}%{_sysconfdir}/systemd/system/%{name}.service.d/limit.conf
+install -p -D -m 644 %{S:8} %{buildroot}%{_sysconfdir}/systemd/system/%{name}-sentinel.service.d/limit.conf
 %else # install SysV service files
 install -pDm755 %{S:5} %{buildroot}%{_initrddir}/%{name}-sentinel
 install -pDm755 %{S:6} %{buildroot}%{_initrddir}/%{name}
-install -pDm644 %{S:9} %{buildroot}%{_sysconfdir}/security/limits.d/95-%{name}.conf
+install -p -D -m 644 %{S:9} %{buildroot}%{_sysconfdir}/security/limits.d/95-%{name}.conf
 %endif
 
 # Fix non-standard-executable-perm error.
@@ -241,6 +241,7 @@ fi
 %config(noreplace) %{_sysconfdir}/security/limits.d/95-%{name}.conf
 %endif
 
+
 %changelog
 * Mon Sep 07 2015 Christopher Meng <rpm@cicku.me> - 3.0.4-1
 - Update to 3.0.4