From e5e10e3a0efc0ffc7a726c7e833ca9aa70e8fb5bc8dfa735a26550fbb6126652 Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Mon, 26 Feb 2024 10:51:59 +0000
Subject: [PATCH] Accepting request 1147477 from
 home:crameleon:branches:network:utilities

- Drop obsolete rpmlint filter
- Create /run/memcached as a location for sockets
- Use conditionals for sysusers/tmpfiles

OBS-URL: https://build.opensuse.org/request/show/1147477
OBS-URL: https://build.opensuse.org/package/show/network:utilities/memcached?expand=0&rev=108
---
 memcached-rpmlintrc        |  1 -
 memcached-sysusers.conf    |  1 +
 memcached-tmpfiles.conf    |  1 +
 memcached.changes          | 11 +++++++++++
 memcached.spec             | 38 +++++++++++++++++++++++++++-----------
 system-user-memcached.conf |  2 --
 6 files changed, 40 insertions(+), 14 deletions(-)
 delete mode 100644 memcached-rpmlintrc
 create mode 100644 memcached-sysusers.conf
 create mode 100644 memcached-tmpfiles.conf
 delete mode 100644 system-user-memcached.conf

diff --git a/memcached-rpmlintrc b/memcached-rpmlintrc
deleted file mode 100644
index 50df8e5..0000000
--- a/memcached-rpmlintrc
+++ /dev/null
@@ -1 +0,0 @@
-addFilter("incoherent-init-script-name")
diff --git a/memcached-sysusers.conf b/memcached-sysusers.conf
new file mode 100644
index 0000000..e36c2ea
--- /dev/null
+++ b/memcached-sysusers.conf
@@ -0,0 +1 @@
+u     memcached   -     "user for memcached" /var/lib/memcached  -
diff --git a/memcached-tmpfiles.conf b/memcached-tmpfiles.conf
new file mode 100644
index 0000000..7034eb0
--- /dev/null
+++ b/memcached-tmpfiles.conf
@@ -0,0 +1 @@
+D /run/memcached 0750 memcached memcached
diff --git a/memcached.changes b/memcached.changes
index bab4106..c82e095 100644
--- a/memcached.changes
+++ b/memcached.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Feb 19 01:06:31 UTC 2024 - Georg Pfuetzenreuter <georg.pfuetzenreuter@suse.com>
+
+- Drop obsolete rpmlint filter
+
+-------------------------------------------------------------------
+Mon Feb 19 00:10:25 UTC 2024 - Georg Pfuetzenreuter <georg.pfuetzenreuter@suse.com>
+
+- Create /run/memcached as a location for sockets
+- Use conditionals for sysusers/tmpfiles
+
 -------------------------------------------------------------------
 Mon Jan 29 14:22:08 UTC 2024 - Dirk Müller <dmueller@suse.com>
 
diff --git a/memcached.spec b/memcached.spec
index 34e9ce3..3bf8035 100644
--- a/memcached.spec
+++ b/memcached.spec
@@ -25,6 +25,13 @@
 %else
 %bcond_with    tls
 %endif
+%if 0%{?suse_version} >= 1500
+%bcond_without sysusers
+%bcond_without tmpfiles
+%else
+%bcond_with    sysusers
+%bcond_with    tmpfiles
+%endif
 Name:           memcached
 Version:        1.6.23
 Release:        0
@@ -34,9 +41,9 @@ Group:          Productivity/Networking/Other
 URL:            https://memcached.org/
 Source:         https://www.memcached.org/files/%{name}-%{version}.tar.gz
 Source2:        %{name}.sysconfig
-Source3:        memcached-rpmlintrc
 Source4:        memcached.service
-Source5:        system-user-memcached.conf
+Source5:        %{name}-sysusers.conf
+Source6:        %{name}-tmpfiles.conf
 Patch0:         harden_memcached.service.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -52,7 +59,7 @@ BuildRequires:  perl
 BuildRequires:  perl-IO-Socket-SSL
 BuildRequires:  perl-Net-SSLeay
 %endif
-%if 0%{?suse_version} >= 1500
+%if %{with sysusers}
 BuildRequires:  sysuser-tools
 %sysusers_requires
 %else
@@ -102,8 +109,8 @@ autoreconf -fi
   %endif
 
 %make_build
-%if 0%{?suse_version} >= 1500
-%sysusers_generate_pre %{SOURCE5} memcached system-user-memcached.conf
+%if %{with sysusers}
+%sysusers_generate_pre %{SOURCE5} %{name} %{name}-user.conf
 %endif
 
 %install
@@ -114,15 +121,17 @@ install -D  -m 0644 %{SOURCE2} %{buildroot}%{_fillupdir}/sysconfig.%{name}
 install -d -m 755 %{buildroot}%{_sbindir}
 ln -s  	%{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
 install -D  -m 0644 %{SOURCE4} %{buildroot}%{_unitdir}/%{name}.service
-%if 0%{?suse_version} >= 1500
-mkdir -p %{buildroot}%{_sysusersdir}
-install -m 0644 %{SOURCE5} %{buildroot}%{_sysusersdir}/
+%if %{with sysusers}
+install -D -m 0644 %{SOURCE5} %{buildroot}%{_sysusersdir}/%{name}-user.conf
+%endif
+%if %{with tmpfiles}
+install -D -m 0644 %{SOURCE6} %{buildroot}%{_tmpfilesdir}/%{name}.conf
 %endif
 
 %check
 %make_build test
 
-%if 0%{?suse_version} >= 1500
+%if %{with sysusers}
 %pre -f memcached.pre
 %else
 
@@ -138,6 +147,9 @@ getent passwd %{name} >/dev/null || \
 %post
 %service_add_post %{name}.service
 %fillup_only %{name}
+%if %{with tmpfiles}
+%tmpfiles_create %{_tmpfilesdir}/%{name}.conf
+%endif
 
 %preun
 %service_del_preun %{name}.service
@@ -155,8 +167,12 @@ getent passwd %{name} >/dev/null || \
 %{_unitdir}/%{name}.service
 %{_fillupdir}/sysconfig.%{name}
 %dir %attr(751,root,root) %{_localstatedir}/lib/%{name}
-%if 0%{?suse_version} >= 1500
-%{_sysusersdir}/system-user-memcached.conf
+%if %{with sysusers}
+%{_sysusersdir}/%{name}-user.conf
+%endif
+%if %{with tmpfiles}
+%{_tmpfilesdir}/%{name}.conf
+%dir %ghost %{_rundir}/%{name}
 %endif
 
 %files devel
diff --git a/system-user-memcached.conf b/system-user-memcached.conf
deleted file mode 100644
index b221743..0000000
--- a/system-user-memcached.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-#Type Name        ID    GECOS                Home directory      Shell
-u     memcached   -     "user for memcached" /var/lib/memcached  -