[packages/rlocate] fix broken uninstall

glen glen at pld-linux.org
Sun Sep 25 10:57:12 CEST 2016


commit 4e0598bf78c34f9b15edf5dee5560ed9b7d69bef
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sun Sep 25 11:57:03 2016 +0300

    fix broken uninstall

 rlocate.spec | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/rlocate.spec b/rlocate.spec
index d7afb08..6c8022c 100644
--- a/rlocate.spec
+++ b/rlocate.spec
@@ -3,6 +3,7 @@
 # - device: installed with static major, module creates as dynamic => use udev
 # - should provide something like virtual(locate), obsolete other implementations
 # - conflicts: rlocate gid with slocate
+# - pldize initscript
 #
 # Conditional build:
 %bcond_without	kernel		# don't build kernel modules
@@ -40,7 +41,7 @@ Conflicts:	slocate
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-rlocate is an implementation of the ``locate'' command that is always
+rlocate is an implementation of the locate command that is always
 up-to-date. The database that the original locate uses is usually
 updated only once a day, so newer files cannot be located right away.
 The behavior of rlocate is the same as slocate, but it also maintains
@@ -128,13 +129,15 @@ fi
 /sbin/chkconfig --add %{name}
 %service %{name} restart
 
+%preun
+if [ "$1" = "0" ]; then
+	%service -q %{name} stop
+	/sbin/chkconfig --del %{name}
+fi
+
 %postun
 if [ "$1" = "0" ]; then
 	%groupremove rlocate
-else
-if [ "$1" = "0" ]; then
-        %service -q %{name} stop
-        /sbin/chkconfig --del %{name}
 fi
 
 %if %{with userspace}
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rlocate.git/commitdiff/4e0598bf78c34f9b15edf5dee5560ed9b7d69bef



More information about the pld-cvs-commit mailing list