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

diff --git a/ejabberd.spec b/ejabberd.spec
index 42a18eb..4448366 100644
--- a/ejabberd.spec
+++ b/ejabberd.spec
@@ -1,6 +1,11 @@
-Name:           ejabberd
-Version:        2.1.3
-Release:        1%{?dist}
+
+%define name ejabberd
+%define version 2.1.6
+%define taglevel 3
+
+Name:           %{name}
+Version:        %{version}
+Release:        %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
 Group:          Applications/Internet
@@ -22,7 +27,7 @@ BuildRequires:  expat-devel
 BuildRequires:  openssl-devel
 BuildRequires:  pam-devel
 BuildRequires:  erlang
-BuildRequires:  hevea
+#BuildRequires:  hevea
 
 Requires:       erlang
 Requires:       usermode
@@ -77,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
@@ -171,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
@@ -178,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