--- rpms/ejabberd/contribs7/ejabberd.spec 2008/06/25 19:02:58 1.4 +++ rpms/ejabberd/contribs7/ejabberd.spec 2008/06/25 19:06:40 1.5 @@ -1,3 +1,7 @@ +# $Id: ejabberd.spec,v 1.3 2008/05/10 15:41:02 gnujpl Exp $ +# Authority: gnujpl +# Name: Jean-Paul Leclère + Name: ejabberd Version: 2.0.1 Release: 4%{?dist} @@ -34,14 +38,14 @@ BuildRequires: openssl-devel BuildRequires: pam-devel BuildRequires: erlang BuildRequires: dos2unix -%if %{undefined rhel} +%if %{?rhel:0}%{!?rhel:1} BuildRequires: hevea %endif Requires: erlang Requires: usermode -Requires(pre): fedora-usermgmt +#Requires(pre): fedora-usermgmt Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig Requires(preun): /sbin/service @@ -64,8 +68,8 @@ Group: Documentation 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 \ +/usr/sbin/groupadd 33 -r ejabberd &>/dev/null || : +/usr/sbin/useradd 33 -r -s /sbin/nologin -d /var/lib/ejabberd -M \ -c 'ejabberd' -g ejabberd ejabberd &>/dev/null || : %post @@ -99,7 +103,7 @@ pushd src # doesn't builds on SMP currently make popd -%if %{undefined rhel} +%if %{?rhel:0}%{!?rhel:1} pushd doc make html pdf popd @@ -176,13 +180,18 @@ rm -rf %{buildroot} %files doc %defattr(-,root,root,-) -%if %{undefined rhel} +%if %{?rhel:0}%{!?rhel:1} %doc ChangeLog COPYING doc/release_notes_* doc/*.pdf doc/*.html doc/*.png %else %doc ChangeLog COPYING doc/release_notes_* %endif %changelog +* Wed Jun 25 2008 Jean-Paul Leclere 2.0.1-4.sme +- Don't use fedora-usermgmt +- set ejabberd uid to 33 for SME compatibility +- only spec file changes + * Sun Jun 22 2008 Peter Lemenkov 2.0.1-4 - Last minute fix (issue with shortnames/fqdn)