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

[packages/aspseek.git] / aspseek.spec

diff --git a/aspseek.spec b/aspseek.spec
index 9372054414a4904282fab6296f06252dd49501fb..dd0bc2890ac32dde2259c00dee34c8624f126170 100644 (file)
--- a/aspseek.spec
+++ b/aspseek.spec
@@ -6,27 +6,30 @@ Summary:      Advanced Internet search engine
 Summary(pl):   Silnik zaawansowanej wyszukiwarki Internetowej
 Name:          aspseek
 Version:       1.2.8
-Release:       3
+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
 URL:           http://www.aspseek.org/
 BuildRequires: apache(EAPI)-devel
-BuildRequires: openssl-devel
+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++
+Obsoletes:     mnogosearch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _sysconfdir     /etc/%{name}
@@ -90,10 +93,10 @@ b
 Summary:       Apache module: ASPSeek search engine
 Summary(pl):   Modu³ Apache: Silnik wyszukiwania ASPSeek
 Group:         Networking/Daemons
-Requires(pre): aspseek
-Requires(pre): fileutils
-Requires(pre): grep
+PreReq:                aspseek
 Requires(post,preun):  %{apxs}
+Requires(post,preun):  grep
+Requires(preun):       fileutils
 Requires:      apache(EAPI)
 
 %description -n apache-mod_aspseek
@@ -137,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 httpd
-touch /var/log/aspseek.log && chown aspseek.root /var/log/aspseek.log
+/sbin/chkconfig --add %{name}
+touch /var/log/aspseek.log
+chown aspseek:root /var/log/aspseek.log
 
 %preun
 if [ "$1" = "0" ]; then
@@ -161,7 +165,7 @@ fi
 %postun
 /sbin/ldconfig
 if [ "$1" = "0" ]; then
-       /usr/sbin/userdel aspseek
+       /usr/sbin/userdel aspseek
 fi
 
 %post db-mysql
@@ -173,21 +177,22 @@ echo "Remember to run %{_sbindir}/aspseek-mysql-postinstall."
 %post -n apache-mod_aspseek
 %{apxs} -e -a -n aspseek %{_pkglibdir}/mod_aspseek.so 1>&2
 if [ -f /etc/httpd/httpd.conf ] && ! grep -q "^Include.*mod_aspseek.conf" /etc/httpd/httpd.conf; then
-        echo "Include /etc/httpd/mod_aspseek.conf" >> /etc/httpd/httpd.conf
+       echo "Include /etc/httpd/mod_aspseek.conf" >> /etc/httpd/httpd.conf
 fi
 if [ -f /var/lock/subsys/httpd ]; then
-        /etc/rc.d/init.d/httpd restart 1>&2
+       /etc/rc.d/init.d/httpd restart 1>&2
 fi
 
 %preun -n apache-mod_aspseek
 if [ "$1" = "0" ]; then
-        %{apxs} -e -A -n aspseek %{_pkglibdir}/mod_aspseek.so 1>&2
-        grep -v "^Include.*mod_aspseek.conf" /etc/httpd/httpd.conf > \
-                /etc/httpd/httpd.conf.tmp
-        mv -f /etc/httpd/httpd.conf.tmp /etc/httpd/httpd.conf
-        if [ -f /var/lock/subsys/httpd ]; then
-                /etc/rc.d/init.d/httpd restart 1>&2
-        fi
+       %{apxs} -e -A -n aspseek %{_pkglibdir}/mod_aspseek.so 1>&2
+       umask 027
+       grep -v "^Include.*mod_aspseek.conf" /etc/httpd/httpd.conf > \
+               /etc/httpd/httpd.conf.tmp
+       mv -f /etc/httpd/httpd.conf.tmp /etc/httpd/httpd.conf
+       if [ -f /var/lock/subsys/httpd ]; then
+               /etc/rc.d/init.d/httpd restart 1>&2
+       fi
 fi
 
 %files