X-Git-Url: http://git.onelab.eu/?p=ejabberd.git;a=blobdiff_plain;f=ejabberd.spec;h=4448366091dbdc9cc9fcadb4bef66b571f45237d;hp=f3f537757aa518903b863dc58109587ac54f1462;hb=HEAD;hpb=f281fc2ed13b877fa274318bb05e047454e0f75b

diff --git a/ejabberd.spec b/ejabberd.spec
index f3f5377..4448366 100644
--- a/ejabberd.spec
+++ b/ejabberd.spec
@@ -1,7 +1,7 @@
 
 %define name ejabberd
-%define version 2.1.3
-%define taglevel 1
+%define version 2.1.6
+%define taglevel 3
 
 Name:           %{name}
 Version:        %{version}
@@ -21,15 +21,13 @@ Source9:        ejabberdctl.pam
 Source10:       ejabberdctl.apps
 Source11:       ejabberd.pam
 
-Patch1:         ejabberd-ejabberdctl_fix.diff
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  expat-devel
 BuildRequires:  openssl-devel
 BuildRequires:  pam-devel
 BuildRequires:  erlang
-BuildRequires:  hevea
+#BuildRequires:  hevea
 
 Requires:       erlang
 Requires:       usermode
@@ -84,18 +82,17 @@ 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
 %setup -q
-%patch1 -p0 -b .fix_ctl
 
 
 %build
@@ -179,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
@@ -186,5 +184,16 @@ rm -rf %{buildroot}
 /usr/share/doc
 
 %changelog
+* Mon Jan 30 2012 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - ejabberd-2.1.6-3
+- search third-party in dual location
+
+* Tue Dec 21 2010 S.Çağlar Onur <caglar@cs.princeton.edu> - ejabberd-2.1.6-2
+
+* Tue Dec 21 2010 S.Çağlar Onur <caglar@cs.princeton.edu> - ejabberd-2.1.6-1
+- Bump to 2.1.6
+
+* 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