rpms/redis
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Revert "SPEC cleanup"

Browse Source 
This reverts commit 1bb2f79e98.

Not very useful, and makes spec even less readable
This commit is contained in:
Haikel Guemar 2015-10-16 17:50:15 +02:00
parent 5c3ab3d4f8
commit 0df073751a
3 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
redis-sentinel.service
View File

@ -10,3 +10,4 @@ Group=redis
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

1
redis.service
View File

@ -10,3 +10,4 @@ Group=redis
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

9
redis.spec
View File

@ -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_CC)||g' src/Makefile
sed -i -e 's|$(QUIET_LINK)||g' src/Makefile sed -i -e 's|$(QUIET_LINK)||g' src/Makefile
sed -i -e 's|$(QUIET_INSTALL)||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|$(CFLAGS)|%{optflags}|g' deps/Makefile
sed -i -e 's|OPTIMIZATION?=-O3|OPTIMIZATION=%{optflags}|g' deps/hiredis/Makefile sed -i -e 's|OPTIMIZATION?=-O3|OPTIMIZATION=%{optflags}|g' deps/hiredis/Makefile
sed -i -e 's|$(LDFLAGS)|%{?__global_ldflags}|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 systemd tmpfiles config.
install -pDm644 %{S:4} %{buildroot}%{_tmpfilesdir}/%{name}.conf install -pDm644 %{S:4} %{buildroot}%{_tmpfilesdir}/%{name}.conf
# Install systemd limit files (requires systemd >= 204) # Install systemd limit files (requires systemd >= 204)
install -pDm644 %{S:8} %{buildroot}%{_sysconfdir}/systemd/system/%{name}.service.d/limit.conf install -p -D -m 644 %{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}-sentinel.service.d/limit.conf
%else # install SysV service files %else # install SysV service files
install -pDm755 %{S:5} %{buildroot}%{_initrddir}/%{name}-sentinel install -pDm755 %{S:5} %{buildroot}%{_initrddir}/%{name}-sentinel
install -pDm755 %{S:6} %{buildroot}%{_initrddir}/%{name} 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 %endif
# Fix non-standard-executable-perm error. # Fix non-standard-executable-perm error.
@ -241,6 +241,7 @@ fi
%config(noreplace) %{_sysconfdir}/security/limits.d/95-%{name}.conf %config(noreplace) %{_sysconfdir}/security/limits.d/95-%{name}.conf
%endif %endif
%changelog %changelog
* Mon Sep 07 2015 Christopher Meng <rpm@cicku.me> - 3.0.4-1 * Mon Sep 07 2015 Christopher Meng <rpm@cicku.me> - 3.0.4-1
- Update to 3.0.4 - Update to 3.0.4