From 5b43b8b32fe4d2c2096963889f00543ca45243a82d809ccdfda2dafc765a035f Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 17 Jan 2023 15:51:02 +0000 Subject: [PATCH] rework sysusers OBS-URL: https://build.opensuse.org/package/show/server:mail/grommunio-web?expand=0&rev=3 --- debian.control | 2 +- grommunio-web.spec | 31 ++----------------------------- system-user-groweb.conf | 2 -- 3 files changed, 3 insertions(+), 32 deletions(-) delete mode 100644 system-user-groweb.conf diff --git a/debian.control b/debian.control index 7aeb655..400a677 100644 --- a/debian.control +++ b/debian.control @@ -8,7 +8,7 @@ Standards-Version: 3.9.4 Package: grommunio-web Architecture: all Section: web -Depends: system-user-groweb, ${misc:Depends}, gromox (>= 1.27), php-bcmath, +Depends: system-user-grommunio, ${misc:Depends}, gromox (>= 1.27), php-bcmath, php-curl, php-gd, php-iconv, php-json, php-mbstring, php-sqlite3, php-sysvshm, php-xml, php-zip, mapi-header-php, ${dist:Depends} Provides: grommunio-web-plugin-zdeveloper, grommunio-web-plugin-webmanual, grommunio-web-plugin-folderwidgets, grommunio-web-plugin-quickitems, grommunio-web-plugin-titlecounter, grommunio-web-plugin-desktopnotifications, grommunio-web-plugin-filepreviewer diff --git a/grommunio-web.spec b/grommunio-web.spec index fb7d57f..16b608d 100644 --- a/grommunio-web.spec +++ b/grommunio-web.spec @@ -57,17 +57,10 @@ BuildRequires: libxml2-tools %else BuildRequires: libxml2 %endif -%if 0%{?suse_version} >= 1500 -BuildRequires: sysuser-tools -%sysusers_requires -%else -Requires(pre): %_sbindir/groupadd -Requires(pre): %_sbindir/useradd -%endif BuildArch: noarch +BuildRequires: user(groweb) -Obsoletes: system-user-groweb -Provides: system-user-groweb +Requires(pre): user(groweb) Requires: gromox >= 1.27 Requires: mapi-header-php %if 0%{?centos_version} || 0%{?rhel_version} || 0%{?fedora_version} @@ -130,11 +123,6 @@ echo "%version-%release" | sha1sum | cut -b 1-8 >cachebuster %build %make_build -j1 -%if 0%{?suse_version} >= 1500 -%sysusers_generate_pre %_sourcedir/system-user-groweb.conf %name system-user-groweb.conf -%else -: >>"%name.pre" -%endif %install b="%buildroot" @@ -177,21 +165,10 @@ for dir in "$b/%_datadir/%name/plugins"/*; do fi done -%if 0%{?suse_version} >= 1500 -mkdir -p "%buildroot/%_sysusersdir" -install -m 0644 "%_sourcedir/system-user-groweb.conf" "%buildroot/%_sysusersdir/" -%endif %if 0%{?fdupes:1} %fdupes %buildroot/%_prefix %endif -%pre -f %name.pre -%if 0%{?suse_version} < 1500 -getent group groweb >/dev/null || %_sbindir/groupadd -r groweb -getent passwd groweb >/dev/null || %_sbindir/useradd -g groweb -s /bin/false \ - -r -c "user for %name" -d "%_localstatedir/lib/groweb" groweb -%endif - %post # clear translation caches ipcrm -M 0x950412de 2>/dev/null || : @@ -237,10 +214,6 @@ ipcrm -M 0x950412de 2>/dev/null || : %_datadir/%name/cachebuster %attr(750,root,root) /var/log/grommunio/ -%if 0%{?suse_version} >= 1500 -%_sysusersdir/*.conf -%endif - %dir %langdir/ %lang(af_ZA) %langdir/af_ZA.UTF-8 %lang(am_ET) %langdir/am_ET.UTF-8 diff --git a/system-user-groweb.conf b/system-user-groweb.conf deleted file mode 100644 index 651f714..0000000 --- a/system-user-groweb.conf +++ /dev/null @@ -1,2 +0,0 @@ -#Type Name ID GECOS Home directory Shell -u groweb - "user for grommunio-web" /var/lib/groweb -