X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=ejabberd.spec;h=7762b9777e6e610e7499ad1d8067aa91cdc1dc64;hb=6e0d2865fc0815f423e5647e6fca6ca28bd7e8b1;hp=7411404135d5b286151f6e360e9c3dd9fb8b4814;hpb=07f9c4cb5df585c5996abf25de53683dcb5b6895;p=ejabberd.git

diff --git a/ejabberd.spec b/ejabberd.spec
index 7411404..7762b97 100644
--- a/ejabberd.spec
+++ b/ejabberd.spec
@@ -1,7 +1,7 @@
 
 %define name ejabberd
 %define version 2.1.3
-%define taglevel 1
+%define taglevel 2
 
 Name:           %{name}
 Version:        %{version}
@@ -27,7 +27,7 @@ BuildRequires:  expat-devel
 BuildRequires:  openssl-devel
 BuildRequires:  pam-devel
 BuildRequires:  erlang
-BuildRequires:  hevea
+#BuildRequires:  hevea
 
 Requires:       erlang
 Requires:       usermode
@@ -82,13 +82,13 @@ fi)
 
 %preun
 if [ $1 = 0 ]; then
-        /sbin/service ejabberd stop >/dev/null 2>&1
-        /sbin/chkconfig --del ejabberd
+        /sbin/service ejabberd stop >/dev/null 2>&1 || :
+        /sbin/chkconfig --del ejabberd || :
 fi
 
 %postun
 if [ "$1" -ge "1" ]; then
-        /sbin/service ejabberd condrestart >/dev/null 2>&1
+        /sbin/service ejabberd condrestart >/dev/null 2>&1 || :
 fi
 
 %prep
@@ -176,6 +176,7 @@ rm -rf %{buildroot}
 
 %attr(750,ejabberd,ejabberd) %dir /var/lib/ejabberd
 %attr(750,ejabberd,ejabberd) %dir /var/lib/ejabberd/spool
+%attr(750,ejabberd,ejabberd) %dir /var/lock/ejabberdctl
 %attr(750,ejabberd,ejabberd) %dir /var/log/ejabberd
 
 %files doc
@@ -183,5 +184,8 @@ rm -rf %{buildroot}
 /usr/share/doc
 
 %changelog
+* Wed Dec 01 2010 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - ejabberd-2.1.3-2
+- preun and postun scriptlets more robust
+
 * Mon Mar 16 2010 Baris Metin <tmetin@sophia.inria.fr>
 - first package from Fedora SRPM, for planetlab