- use SUSv2-compliant chown syntax (user:group) instead of deprecated

[packages/aspseek.git] / aspseek.spec

diff --git a/aspseek.spec b/aspseek.spec
index 5a7a0da0fa9ef23fefe722473520f3f796935f66..dd0bc2890ac32dde2259c00dee34c8624f126170 100644 (file)
--- a/aspseek.spec
+++ b/aspseek.spec
@@ -10,6 +10,7 @@ Release:      4
 License:       GPL
 Group:         Networking/Utilities
 Source0:       http://www.aspseek.org/pkg/src/1.2.8/%{name}-%{version}.tar.gz
+# Source0-md5: 0660b6b0d45d37c7a53c7e1c40cae002
 Source1:       %{name}-mod_aspseek.conf
 Source2:       %{name}.init
 Patch0:                %{name}-types.patch
@@ -19,12 +20,12 @@ BuildRequires:      openssl-devel >= 0.9.7
 BuildRequires: mysql-devel
 BuildRequires: libstdc++-devel
 BuildRequires: zlib-devel
-Requires(pre): /bin/id
-Requires(pre): /usr/sbin/useradd
+Requires(pre): /bin/id
+Requires(pre): /usr/sbin/useradd
+Requires(postun):      /usr/sbin/userdel
 Requires(post):        fileutils
 Requires(post,preun):  /sbin/chkconfig
 Requires(post,postun): /sbin/ldconfig
-Requires(postun):      /usr/sbin/userdel
 Requires:      webserver
 Requires:      %{name}-db-%{version}
 Obsoletes:     swish++
@@ -139,18 +140,19 @@ rm -rf $RPM_BUILD_ROOT
 
 %pre
 if [ -n "`id -u aspseek 2>/dev/null`" ]; then
-       if [ "`id -u aspseek`" != "50" ]; then
-               echo "Error: user aspseek doesn't have uid=50. Correct this before installing aspseek." 1>&2
-               exit 1
-       fi
+       if [ "`id -u aspseek`" != "50" ]; then
+               echo "Error: user aspseek doesn't have uid=50. Correct this before installing aspseek." 1>&2
+               exit 1
+       fi
 else
-       /usr/sbin/useradd -u 50 -r -d /home/services/aspseek -s /bin/false -c "ASPSEEK User" -g root aspseek 1>&2
+       /usr/sbin/useradd -u 50 -r -d /home/services/aspseek -s /bin/false -c "ASPSEEK User" -g root aspseek 1>&2
 fi
 
 %post
 /sbin/ldconfig
 /sbin/chkconfig --add %{name}
-touch /var/log/aspseek.log && chown aspseek.root /var/log/aspseek.log
+touch /var/log/aspseek.log
+chown aspseek:root /var/log/aspseek.log
 
 %preun
 if [ "$1" = "0" ]; then
@@ -163,7 +165,7 @@ fi
 %postun
 /sbin/ldconfig
 if [ "$1" = "0" ]; then
-       /usr/sbin/userdel aspseek
+       /usr/sbin/userdel aspseek
 fi
 
 %post db-mysql