Accepting request 852401 from home:jengelh:branches:network:utilities

- Trim history lesson from description.
- Do not suppress errors from useradd.
- Reduce hard dependency on systemd.

OBS-URL: https://build.opensuse.org/request/show/852401
OBS-URL: https://build.opensuse.org/package/show/network:utilities/memcached?expand=0&rev=82

memcached.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Oct 13 10:08:57 UTC 2020 - Jan Engelhardt <jengelh@inai.de>
+
+- Trim history lesson from description.
+- Do not suppress errors from useradd.
+- Reduce hard dependency on systemd.
+
 -------------------------------------------------------------------
 Mon Sep 28 20:29:25 UTC 2020 - Dirk Mueller <dmueller@suse.com>
 

memcached.spec

@@ -56,7 +56,7 @@ Requires(pre):  %{_sbindir}/useradd
 Conflicts:      memcached-unstable
 %if 0%{?suse_version} > 1210
 BuildRequires:  systemd-rpm-macros
-%{?systemd_requires}
+%{?systemd_ordering}
 %else
 Requires(pre):  %insserv_prereq
 %endif
@@ -66,14 +66,6 @@ Memcached is a high-performance, distributed memory object caching
 system, generic in nature, but intended for use in speeding up dynamic
 web applications by alleviating database load.
 
-Danga Interactive developed memcached to enhance the speed of
-LiveJournal.com, a site which was already doing 20 million+ dynamic
-page views per day for 1 million users with a bunch of webservers and a
-bunch of database servers. memcached dropped the database load to
-almost nothing, yielding faster page load times for users, better
-resource utilization, and faster access to the databases on a memcache
-miss.
-
 %package devel
 Summary:        Files needed for development using memcached protocol
 Group:          Development/Libraries/C and C++
@@ -123,8 +115,11 @@ ln -s  ../..%{_sysconfdir}/init.d/%{name} %{buildroot}%{_sbindir}/rc%{name}
 make %{?_smp_mflags} test
 
 %pre
-%{_sbindir}/groupadd -r %{name} >/dev/null 2>&1 || :
+getent group %{name} >/dev/null || \
-%{_sbindir}/useradd -g %{name} -s /bin/false -r -c "user for %{name}" -d %{_localstatedir}/lib/%{name} %{name} >/dev/null 2>&1 || :
+	%{_sbindir}/groupadd -r %{name}
+getent passwd %{name} >/dev/null || \
+	%{_sbindir}/useradd -g %{name} -s /bin/false -r \
+	-c "user for %{name}" -d %{_localstatedir}/lib/%{name} %{name}
 %if 0%{?suse_version} > 1210
 %service_add_pre %{name}.service
 %endif