- doc subpackage

- tests need tcl 8.5

Changed files:
    redis.spec -> 1.5

diff --git a/redis.spec b/redis.spec
index 5e1e80f4240417e60c5a684c455beddb37835b38..abeda5f9774ec9dc3b3c572b4439a9efdb744eea 100644 (file)
--- a/redis.spec
+++ b/redis.spec
@@ -1,14 +1,19 @@
 # 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"
+%bcond_with            tests           # build without tests
+%else
 %bcond_without tests           # build without tests
+%endif
 
 Summary:       A persistent key-value database
 Name:          redis
 Version:       2.0.2
-Release:       1
+Release:       2
 License:       BSD
 Group:         Applications/Databases
 URL:           http://code.google.com/p/redis/
@@ -19,9 +24,10 @@ Source2:     %{name}.init
 Patch0:                %{name}-redis.conf.patch
 BuildRequires: rpmbuild(macros) >= 1.202
 BuildRequires: sed >= 4.0
-%{?with_tests:BuildRequires:   tcl}
+%{?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
@@ -42,6 +48,13 @@ add/remove elements, perform server side union, intersection,
 difference between sets, and so forth. Redis supports different kind
 of sorting abilities.
 
+%package doc
+Summary:       documentation for redis
+Group:         Documentation
+
+%description doc
+HTML Documentation for Redis.
+
 %prep
 %setup -q
 %patch0 -p1
@@ -100,7 +113,7 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc 00-RELEASENOTES BUGS COPYING Changelog README TODO doc/
+%doc 00-RELEASENOTES BUGS COPYING Changelog README TODO
 %config(noreplace) %{_sysconfdir}/%{name}.conf
 %attr(754,root,root) /etc/rc.d/init.d/%{name}
 %attr(755,root,root) %{_bindir}/%{name}-*
@@ -109,3 +122,7 @@ fi
 %dir %attr(755,redis,root) %{_localstatedir}/lib/%{name}
 %dir %attr(755,redis,root) %{_localstatedir}/log/%{name}
 %dir %attr(755,redis,root) %{_localstatedir}/run/%{name}
+
+%files doc
+%defattr(644,root,root,755)
+%doc doc/*