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

diff --git a/ejabberd.spec b/ejabberd.spec
index fa85f95..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}
@@ -27,7 +27,6 @@ BuildRequires:  expat-devel
 BuildRequires:  openssl-devel
 BuildRequires:  pam-devel
 BuildRequires:  erlang
-#docs disabled
 #BuildRequires:  hevea
 
 Requires:       erlang
@@ -46,6 +45,13 @@ Jabber/XMPP server. It is mostly written in Erlang, and runs on many
 platforms (tested on Linux, FreeBSD, NetBSD, Solaris, Mac OS X and
 Windows NT/2000/XP).
 
+%package doc
+Summary: Documentation for ejabberd
+Group: Documentation
+
+%description doc
+Documentation for ejabberd.
+
 %pre
 /usr/sbin/fedora-groupadd 27 -r ejabberd &>/dev/null || :
 /usr/sbin/fedora-useradd  27 -r -s /sbin/nologin -d /var/lib/ejabberd -M \
@@ -76,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
@@ -96,12 +102,6 @@ pushd src
 make
 popd
 
-# compile w/o docs
-pushd doc
-# remove pre-built docs
-rm -f dev.html features.html features.pdf guide.html guide.pdf
-popd
-
 %install
 rm -rf %{buildroot}
 
@@ -179,6 +179,21 @@ rm -rf %{buildroot}
 %attr(750,ejabberd,ejabberd) %dir /var/lock/ejabberdctl
 %attr(750,ejabberd,ejabberd) %dir /var/log/ejabberd
 
+%files doc
+%defattr(-,root,root,-)
+/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