From 32ea8c1e9730d36ef99bafee80033602b9cb0a1a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Sun, 1 May 2005 17:31:30 +0000 Subject: [PATCH] - use %useradd/%groupadd macros Changed files: ffsearch.spec -> 1.29 --- ffsearch.spec | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/ffsearch.spec b/ffsearch.spec index b8df1d6..34b2135 100644 --- a/ffsearch.spec +++ b/ffsearch.spec @@ -12,7 +12,7 @@ Source1: %{name}.crond Patch0: %{name}-config.patch URL: http://ffsearch.sf.net/ BuildRequires: rpm-perlprov >= 4.1-13 -BuildRequires: rpmbuild(macros) >= 1.159 +BuildRequires: rpmbuild(macros) >= 1.202 Requires(pre): /bin/id Requires(pre): /usr/bin/getgid Requires(pre): /usr/sbin/groupadd @@ -63,23 +63,8 @@ install -D %{SOURCE1} $RPM_BUILD_ROOT/etc/cron.d/%{name} rm -rf $RPM_BUILD_ROOT %pre -if [ -n "`/usr/bin/getgid ffsearch`" ]; then - if [ "`/usr/bin/getgid ffsearch`" != 118 ]; then - echo "Error: group ffsearch doesn't have gid=118. Correct this before installing ffsearch." 1>&2 - exit 1 - fi -else - /usr/sbin/groupadd -g 118 ffsearch 1>&2 -fi -if [ -n "`/bin/id -u ffsearch 2>/dev/null`" ]; then - if [ "`/bin/id -u ffsearch`" != 118 ]; then - echo "Error: user ffsearch doesn't have uid=118. Correct this before installing ffsearch." 1>&2 - exit 1 - fi -else - /usr/sbin/useradd -u 118 -s /bin/false -g ffsearch \ - -c "Fast File Search user" -d %{_datadir}/ffsearch ffsearch 1>&2 -fi +%groupadd -g 118 ffsearch +%useradd -u 118 -s /bin/false -g ffsearch -c "Fast File Search user" -d %{_datadir}/ffsearch ffsearch %postun if [ "$1" = "0" ]; then -- 2.44.0