From 24e6483bf1f1c0822641d3384144ad855436b685d9b176c4f0032dc1792491d5 Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Thu, 24 Nov 2011 10:50:39 +0000 Subject: [PATCH] - Don't use runlevel 4 in init script - Compile with RPM_OPT_FLAGS (PROG env var didn't cut it) - Remove outdated %clean section, bogus doc package (there are none) and netcat runtime dependency (for init script?) - Set license to SDPX style OBS-URL: https://build.opensuse.org/package/show/server:database/redis?expand=0&rev=24 --- redis-initscript.patch | 2 +- redis.changes | 9 +++++ redis.spec | 85 +++++++++++++----------------------------- 3 files changed, 36 insertions(+), 60 deletions(-) diff --git a/redis-initscript.patch b/redis-initscript.patch index 35b9064..a8365c9 100644 --- a/redis-initscript.patch +++ b/redis-initscript.patch @@ -15,7 +15,7 @@ Index: utils/redis_init_script +# Should-Start: +# Required-Stop: $syslog $remote_fs +# Should-Stop: -+# Default-Start: 3 4 5 ++# Default-Start: 3 5 +# Default-Stop: 0 1 2 6 +# Short-Description: Redis server +# Description: Starts and stops the Redis daemon diff --git a/redis.changes b/redis.changes index 7bf8a53..c3e1013 100644 --- a/redis.changes +++ b/redis.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Nov 24 09:48:13 UTC 2011 - saschpe@suse.de + +- Don't use runlevel 4 in init script +- Compile with RPM_OPT_FLAGS (PROG env var didn't cut it) +- Remove outdated %clean section, bogus doc package (there are none) + and netcat runtime dependency (for init script?) +- Set license to SDPX style + ------------------------------------------------------------------- Mon Oct 24 10:48:19 UTC 2011 - asn@cryptomilk.org diff --git a/redis.spec b/redis.spec index f9c42c7..6dcee2a 100644 --- a/redis.spec +++ b/redis.spec @@ -1,3 +1,4 @@ +# # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties @@ -12,35 +13,30 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild -%define _data_dir %{_var}/lib/%{name} -%define _log_dir %{_var}/log/%{name} +%define _data_dir %{_localstatedir}/lib/%{name} +%define _log_dir %{_localstatedir}/log/%{name} Name: redis Version: 2.4.1 -Release: 1 -# -License: BSD License -Group: Productivity/Databases/Servers +Release: 0 +License: BSD-3-Clause Summary: Persistent key-value database Url: http://redis.io/ -# +Group: Productivity/Databases/Servers Source: http://redis.googlecode.com/files/%{name}-%{version}.tar.gz Source1: %{name}.logrotate Source4: redis.sysconfig -# +# PATCH-FIX-OPENSUSE -- openSUSE-style init script Patch0: %{name}-initscript.patch +# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch1: %{name}-conf.patch +# PATCH-FIX-UPSTREAM -- Fixed AOF: Server should have been started: Expected '1' to equal or match '0' Patch2: skip-aof-test.patch -# -BuildRoot: %{_tmppath}/%{name}-%{version}-build -# for init script -Requires: netcat -Requires: logrotate - # for make test BuildRequires: tcl +Requires: logrotate +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Redis is an advanced key-value store. It is similar to memcached but the dataset @@ -50,72 +46,46 @@ with atomic operations to push/pop elements, add/remove elements, perform server side union, intersection, difference between sets, and so forth. Redis supports different kind of sorting abilities. -%package doc -Summary: HTML documentation for redis -Group: Productivity/Databases/Servers -Requires: redis = %{version} - -%description doc -HTML documentation for redis database. - %prep %setup -q %patch0 %patch1 - -# skip-aof-test.patch -# Failures: - Fixed AOF: Server should have been started: Expected '1' to equal or match '0' %patch2 -p1 -# Documents are not available in this build -#mv doc html - %build -make PROF="%{optflags}" %{?jobs:-j%jobs} +CFLAGS="%{optflags}" make %{?_smp_mflags} %install -%{__install} -Dd -m 0755 \ - %{buildroot}%{_sysconfdir}/init.d \ - %{buildroot}%{_sysconfdir}/logrotate.d \ - %{buildroot}%{_bindir} \ - %{buildroot}%{_libdir} \ - %{buildroot}%{_sbindir} \ - %{buildroot}%{_log_dir} \ - %{buildroot}%{_data_dir} +install -d %{buildroot}%{_log_dir} %{buildroot}%{_data_dir} -%{__install} -m 0755 src/redis-benchmark %{buildroot}%{_bindir}/redis-benchmark -%{__install} -m 0755 src/redis-cli %{buildroot}%{_bindir}/redis-cli -%{__install} -m 0755 src/redis-check-dump %{buildroot}%{_bindir}/redis-check-dump -%{__install} -m 0755 src/redis-check-aof %{buildroot}%{_bindir}/redis-check-aof -%{__install} -m 0755 src/redis-server %{buildroot}%{_sbindir}/redis-server -%{__install} -m 0640 redis.conf %{buildroot}%{_sysconfdir}/redis.conf -## %{__install} -Dp -m 0755 %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/redis +install -D -m 0755 src/redis-benchmark %{buildroot}%{_bindir}/redis-benchmark +install -m 0755 src/redis-cli %{buildroot}%{_bindir}/redis-cli +install -m 0755 src/redis-check-dump %{buildroot}%{_bindir}/redis-check-dump +install -m 0755 src/redis-check-aof %{buildroot}%{_bindir}/redis-check-aof +install -D -m 0755 src/redis-server %{buildroot}%{_sbindir}/redis-server +install -D -m 0640 redis.conf %{buildroot}%{_sysconfdir}/redis.conf +## install -Dp -m 0755 %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/redis # # init # -%{__install} -m 0755 utils/redis_init_script %{buildroot}%{_sysconfdir}/init.d/redis -%{__ln_s} %{_sysconfdir}/init.d/%{name} %{buildroot}%{_sbindir}/rc%{name} +install -D -m 0755 utils/redis_init_script %{buildroot}%{_sysconfdir}/init.d/redis +ln -s %{_sysconfdir}/init.d/%{name} %{buildroot}%{_sbindir}/rc%{name} # # logrotate # -%{__install} -m 0644 %{S:1} \ - %{buildroot}%{_sysconfdir}/logrotate.d/%{name} +install -D -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/logrotate.d/%{name} %check - cat </dev/null || : /usr/sbin/useradd -o -g %{name} -s /bin/false -r -c "User for Redis key-value store" -d %{_data_dir} %{name} &>/dev/null || : @@ -130,10 +100,11 @@ echo " sudo rcredis start; insserv redis" %stop_on_removal %{name} %postun +%restart_on_update %insserv_cleanup %files -%defattr(-,root,root) +%defattr(-,root,root,-) %doc 00-RELEASENOTES BUGS CONTRIBUTING COPYING Changelog README TODO %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %{_bindir}/redis-* @@ -144,8 +115,4 @@ echo " sudo rcredis start; insserv redis" %dir %attr(0750, %{name}, %{name}) %{_data_dir} %dir %attr(0750, %{name}, %{name}) %{_log_dir} -%files doc -%defattr(-,root,root) -%doc 00-RELEASENOTES BUGS CONTRIBUTING COPYING Changelog README TODO - %changelog