git://git.onelab.eu
/
ejabberd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bump to 2.1.6 to solve compilation problems under f14
[ejabberd.git]
/
ejabberd.spec
diff --git
a/ejabberd.spec
b/ejabberd.spec
index
7411404
..
60607cc
100644
(file)
--- a/
ejabberd.spec
+++ b/
ejabberd.spec
@@
-1,7
+1,7
@@
%define name ejabberd
%define name ejabberd
-%define version 2.1.
3
-%define taglevel
1
+%define version 2.1.
6
+%define taglevel
0
Name: %{name}
Version: %{version}
Name: %{name}
Version: %{version}
@@
-27,7
+27,7
@@
BuildRequires: expat-devel
BuildRequires: openssl-devel
BuildRequires: pam-devel
BuildRequires: erlang
BuildRequires: openssl-devel
BuildRequires: pam-devel
BuildRequires: erlang
-BuildRequires: hevea
+
#
BuildRequires: hevea
Requires: erlang
Requires: usermode
Requires: erlang
Requires: usermode
@@
-82,13
+82,13
@@
fi)
%preun
if [ $1 = 0 ]; then
%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
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
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/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
%attr(750,ejabberd,ejabberd) %dir /var/log/ejabberd
%files doc
@@
-183,5
+184,8
@@
rm -rf %{buildroot}
/usr/share/doc
%changelog
/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
* Mon Mar 16 2010 Baris Metin <tmetin@sophia.inria.fr>
- first package from Fedora SRPM, for planetlab