summaryrefslogtreecommitdiffstats
path: root/redis.spec
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2025-07-10 11:40:32 +0200
committerRemi Collet <remi@php.net>2025-07-10 11:40:32 +0200
commit0c82b2e914f98b4f3fd847009eba07cd1228523d (patch)
tree41f7a7d5d5b883683fb80197fe84dd4dd248a3b7 /redis.spec
parent8350428740d94327df6b1143917e4bb9b91f2299 (diff)
add missing build requirementsHEADmaster
use patch for config instead of sed fix pidfile path in /run/redis set unixsocket
Diffstat (limited to 'redis.spec')
-rw-r--r--redis.spec17
1 files changed, 6 insertions, 11 deletions
diff --git a/redis.spec b/redis.spec
index 423e402..265d516 100644
--- a/redis.spec
+++ b/redis.spec
@@ -38,6 +38,9 @@ Source2: %{name}-sentinel.service
Source3: %{name}.service
Source9: macros.%{name}
+# Fix default paths in configuration files for RPM layout
+Patch0: %{name}-conf.patch
+
BuildRequires: gcc
BuildRequires: gcc-c++
BuildRequires: libstdc++-devel
@@ -122,6 +125,7 @@ API documentation is available in the redis-doc package.
%prep
%setup -q -n %{name}-%{upstream_ver}
+%patch -P0 -p1
%if %{with jemalloc}
rm -frv deps/jemalloc
@@ -138,16 +142,6 @@ mv deps/hdr_histogram/LICENSE.txt LICENSE-hdrhistogram
mv deps/hdr_histogram/COPYING.txt COPYING-hdrhistogram
mv deps/fpconv/LICENSE.txt LICENSE-fpconv
-# Configuration file changes
-sed -e 's|^logfile .*$|logfile /var/log/redis/redis.log|g' \
- -e 's|^dir .*$|dir /var/lib/redis|g' \
- -e 's|^pidfile .*$|pidfile /run/redis/redis.pid|g' \
- -e 's|^# unixsocket .*$|unixsocket /run/redis/redis.sock|g' \
- -i redis.conf
-sed -e 's|^logfile .*$|logfile /var/log/redis/sentinel.log|g' \
- -e 's|^pidfile .*$|pidfile /run/redis/sentinel.pid|g' \
- -i sentinel.conf
-
# See https://bugzilla.redhat.com/2240293
# See https://src.fedoraproject.org/rpms/jemalloc/blob/rawhide/f/jemalloc.spec#_34
%ifarch %ix86 %arm x86_64 s390x
@@ -314,9 +308,10 @@ fi
%changelog
* Thu Jul 10 2025 Remi Collet <remi@remirepo.net> - 8.0.3-2
+- add missing build requirements
+- use patch for config instead of sed
- fix pidfile path in /run/redis
- set unixsocket
-- add missing build requirements
* Mon Jul 7 2025 Remi Collet <remi@remirepo.net> - 8.0.3-1
- Redis 8.0.3 Released Sun 6 Jul 2025 12:00:00 IST