X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=memcached.spec;h=1a62d70eaaac42d202731b55624f6eabc568ea70;hb=d8d64c979b3f11575a8d0d0e61ce2849c057e290;hp=774d4db49dd1605a6d3ae92fa62a8ff53dc431f9;hpb=d771efc1e1566f6890ef47b3dacd4ce846607473;p=packages%2Fmemcached.git

diff --git a/memcached.spec b/memcached.spec
index 774d4db..1a62d70 100644
--- a/memcached.spec
+++ b/memcached.spec
@@ -1,17 +1,12 @@
-# TODO
-# - memcached has -P option for pid, but root privs are dropped before
-#   pid is written, so either run memcached as new uid or hack code to
-#   write pidfile before changing uid, as rc-script removes pid on
-#   shutdown anyway.
 Summary:	A high-performance, distributed memory object caching system
 Summary(pl.UTF-8):	Rozproszony, wysokiej wydajności system cache'owania obiektów
 Name:		memcached
-Version:	1.2.5
-Release:	3
+Version:	1.4.2
+Release:	1
 License:	BSD
 Group:		Networking/Daemons
-Source0:	http://www.danga.com/memcached/dist/%{name}-%{version}.tar.gz
-# Source0-md5:	8ac0d1749ded88044f0f850fad979e4d
+Source0:	http://memcached.googlecode.com/files/%{name}-%{version}.tar.gz
+# Source0-md5:	31caa3e74f2714ba49475b1df44bc315
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
 URL:		http://www.danga.com/memcached/
@@ -20,7 +15,15 @@ BuildRequires:	automake
 BuildRequires:	libevent-devel >= 1.1
 BuildRequires:	rpmbuild(macros) >= 1.268
 Requires(post,preun):	/sbin/chkconfig
-Requires:	rc-scripts
+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 >= 0.4.1.23
+Provides:	group(memcached)
+Provides:	user(memcached)
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -37,12 +40,13 @@ Rozproszony, wysokiej wydajności system cache'owania obiektów.
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-%configure
+%configure \
+	--disable-coverage
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig}
+install -d $RPM_BUILD_ROOT{/etc/{rc.d/init.d,sysconfig},/var/run/memcached}
 install -d $RPM_BUILD_ROOT{%{_sbindir},%{_mandir}/man1}
 
 install memcached $RPM_BUILD_ROOT%{_sbindir}
@@ -51,6 +55,10 @@ install doc/memcached.1 $RPM_BUILD_ROOT%{_mandir}/man1
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
 
+%pre
+%groupadd -g 209 %{name}
+%useradd -u 209 -d /usr/share/empty -g %{name} -c "Memcached User" %{name}
+
 %post
 /sbin/chkconfig --add %{name}
 %service %{name} restart
@@ -61,13 +69,20 @@ if [ "$1" = "0" ]; then
 	/sbin/chkconfig --del %{name}
 fi
 
+%postun
+if [ "$1" = "0" ]; then
+	%userremove %{name}
+	%groupremove %{name}
+fi
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS README TODO doc/*.txt
-%attr(755,root,root) %{_sbindir}/*
-%{_mandir}/man1/*
-%attr(754,root,root) /etc/rc.d/init.d/%{name}
+%doc AUTHORS README doc/*.txt
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}
+%attr(754,root,root) /etc/rc.d/init.d/%{name}
+%attr(755,root,root) %{_sbindir}/%{name}
+%{_mandir}/man1/memcached.1*
+%dir %attr(770,root,memcached) /var/run/memcached