packages: redis/redis.spec - server subpackage

[glen]

Author: glen                         Date: Sat Oct  9 15:29:02 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- server subpackage

---- Files affected:
packages/redis:
   redis.spec (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: packages/redis/redis.spec
diff -u packages/redis/redis.spec:1.5 packages/redis/redis.spec:1.6
--- packages/redis/redis.spec:1.5	Sat Oct  9 17:15:07 2010
+++ packages/redis/redis.spec	Sat Oct  9 17:28:57 2010
@@ -1,8 +1,6 @@
 # $Revision$, $Date$
 # TODO
-# - register user/gid, pld initscript
 # - Check for status of man pages http://code.google.com/p/redis/issues/detail?id=202
-# - server/client subpackages perhaps?
 #
 # Conditional build:
 %if "%{pld_release}" == "ac"
@@ -14,7 +12,7 @@
 Summary:	A persistent key-value database
 Name:		redis
 Version:	2.0.2
-Release:	2
+Release:	3
 License:	BSD
 Group:		Applications/Databases
 URL:		http://code.google.com/p/redis/
@@ -22,22 +20,11 @@
 # Source0-md5:	1658ab25161efcc0d0e98b4d1e38a985
 Source1:	%{name}.logrotate
 Source2:	%{name}.init
-Patch0:		%{name}-redis.conf.patch
+Patch0:		%{name}.conf.patch
+BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpmbuild(macros) >= 1.202
 BuildRequires:	sed >= 4.0
 %{?with_tests:BuildRequires:	tcl >= 8.5}
-Requires:	rc-scripts
-Requires(post,preun):	/sbin/chkconfig
-BuildRequires:	rpm >= 4.4.9-56
-Requires(postun):	/usr/sbin/userdel
-Requires(pre):	/bin/id
-Requires(pre):	/usr/sbin/useradd
-Requires(postun):	/usr/sbin/groupdel
-Requires(pre):	/usr/bin/getgid
-Requires(pre):	/usr/sbin/groupadd
-Requires:	rc-scripts
-Provides:	group(redis)
-Provides:	user(redis)
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -49,6 +36,29 @@
 difference between sets, and so forth. Redis supports different kind
 of sorting abilities.
 
+%package server
+Summary:	Persistent key-value database with network interface
+Group:		Applications/Databases
+Requires(post,preun):	/sbin/chkconfig
+Requires(postun):	/usr/sbin/groupdel
+Requires(postun):	/usr/sbin/userdel
+Requires(pre):	/bin/id
+Requires(pre):	/usr/bin/getgid
+Requires(pre):	/usr/sbin/groupadd
+Requires(pre):	/usr/sbin/useradd
+Requires:	rc-scripts
+Provides:	group(redis)
+Provides:	user(redis)
+
+%description server
+Redis is a key-value database in a similar vein to memcache but the
+dataset is non-volatile. Redis additionally provides native support
+for atomically manipulating and querying data structures such as lists
+and sets.
+
+The dataset is stored entirely in memory and periodically flushed to
+disk.
+
 %package doc
 Summary:	documentation for redis
 Group:		Documentation
@@ -92,21 +102,21 @@
 %clean
 rm -fr $RPM_BUILD_ROOT
 
-%pre
+%pre server
 %groupadd -g 256 redis
 %useradd -u 256 -g redis -d %{_sharedstatedir}/redis -s /sbin/nologin -c 'Redis Server' redis
 
-%post
+%post server
 /sbin/chkconfig --add redis
 %service redis restart
 
-%preun
+%preun server
 if [ "$1" = 0 ]; then
 	%service redis stop
 	/sbin/chkconfig --del redis
 fi
 
-%postun
+%postun server
 if [ "$1" = "0" ]; then
 	%userremove redis
 	%groupremove redis
@@ -114,11 +124,17 @@
 
 %files
 %defattr(644,root,root,755)
-%doc 00-RELEASENOTES BUGS COPYING Changelog README TODO
+%doc COPYING 00-RELEASENOTES BUGS Changelog README TODO
+%attr(755,root,root) %{_bindir}/redis-benchmark
+%attr(755,root,root) %{_bindir}/redis-check-aof
+%attr(755,root,root) %{_bindir}/redis-check-dump
+%attr(755,root,root) %{_bindir}/redis-cli
+
+%files server
+%defattr(644,root,root,755)
 %config(noreplace) %{_sysconfdir}/%{name}.conf
 %attr(754,root,root) /etc/rc.d/init.d/%{name}
-%attr(755,root,root) %{_bindir}/%{name}-*
-%attr(755,root,root) %{_sbindir}/%{name}-*
+%attr(755,root,root) %{_sbindir}/redis-server
 %config(noreplace) /etc/logrotate.d/%{name}
 %dir %attr(755,redis,root) %{_localstatedir}/lib/%{name}
 %dir %attr(755,redis,root) %{_localstatedir}/log/%{name}
@@ -134,6 +150,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2010/10/09 15:28:57  glen
+- server subpackage
+
 Revision 1.5  2010/10/09 15:15:07  glen
 - doc subpackage
 - tests need tcl 8.5
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/redis/redis.spec?r1=1.5&r2=1.6&f=u