/[smecontribs]/rpms/ejabberd/contribs7/ejabberd.spec

Diff of /rpms/ejabberd/contribs7/ejabberd.spec

Parent Directory | Revision Log | View Revision Graph Revision Graph | View Patch Patch

-Revision 1.3 by gnujpl,
Sat May 10 15:41:02 2008 UTC
+Revision 1.4 by slords,
Wed Jun 25 19:02:58 2008 UTC
 Line 1
- # $Id: ejabberd.spec,v 1.2 2008/05/08 21:12:30 slords Exp $
- # Authority: gnujpl
- # Name: Jean-Paul Leclère
  Name:           ejabberd
- Version:        2.0.0
+ Version:        2.0.1
  Release:        4%{?dist}
  Summary:        A distributed, fault-tolerant Jabber/XMPP server
  Group:          Applications/Internet
- License:        GPLv2
+ License:        GPLv2+
  URL:            http://www.ejabberd.im/
- Source0:        http://www.process-one.net/downloads/%{name}/%{version}/%{name}-%{version}.tar.gz
+ Source0:        http://www.process-one.net/downloads/%{name}/%{version}/%{name}-%{version}_2.tar.gz
  Source1:        ejabberd.init
  Source2:        ejabberd.logrotate
-Line 26 
 Source7:        mod_vcard_ad.erl
+Line 22 
 Source7:        mod_vcard_ad.erl
  Source9:        ejabberdctl.pam
  Source10:       ejabberdctl.apps
- # originally from
+ # Fedora-specific stuff - fixing paths
- # https://support.process-one.net/secure/attachment/11788/ejab-446.patch
- Patch0: ejab-446.patch
- # local stuff
  Patch1: ejabberd-build.patch
+ # BZ# 439583, 452326, 451554
- # R12B
+ Patch2: ejabberd-ejabberdctl_fix.diff
- Patch2: ejabberd-ssl.patch
- # R11B SSL
- Patch3: ejabberd_s2s_in_erl.diff
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Line 45 
 BuildRequires:  expat-devel
+Line 33 
 BuildRequires:  expat-devel
  BuildRequires:  openssl-devel
  BuildRequires:  pam-devel
  BuildRequires:  erlang
- %if %{?rhel:0}%{!?rhel:1}
+ BuildRequires:  dos2unix
+ %if %{undefined rhel}
  BuildRequires:  hevea
  %endif
  Requires:       erlang
  Requires:       usermode
+ Requires(pre): fedora-usermgmt
  Requires(post): /sbin/chkconfig
  Requires(preun): /sbin/chkconfig
  Requires(preun): /sbin/service
-Line 74 
 Group: Documentation
+Line 64 
 Group: Documentation
  Documentation for ejabberd.
  %pre
- /usr/sbin/groupadd -g 33 -r ejabberd &>/dev/null || :
+ /usr/sbin/fedora-groupadd 27 -r ejabberd &>/dev/null || :
- /usr/sbin/useradd -u 33 -r -s /sbin/nologin -d /var/lib/ejabberd -M \
+ /usr/sbin/fedora-useradd  27 -r -s /sbin/nologin -d /var/lib/ejabberd -M \
                               -c 'ejabberd' -g ejabberd ejabberd &>/dev/null || :
  %post
-Line 94 
 fi
+Line 84 
 fi
  %prep
  %setup -q -n %{name}-%{version}
- %patch0 -p1 -b .Er12b-build
+ %patch1 -p0 -b .fix_paths
- %patch1 -p1 -b .MC-build
+ %patch2 -p0 -b .fix_user
- #%patch2 -p1 -b .R12B
+ dos2unix src/odbc/mssql.sql
- %patch3 -p0 -b .r11_ssl
- %{__perl} -pi -e "s!/var/lib/ejabberd!%{_libdir}/ejabberd-%{version}!g" src/Makefile.in
- %{__perl} -pi -e "s!/etc!%{_sysconfdir}!g" src/Makefile.in
- %{__perl} -pi -e "s!\@prefix\@!!g" src/Makefile.in
  cp %{S:4} src
  cp %{S:5} src
-Line 111 
 cp %{S:7} src
+Line 96 
 cp %{S:7} src
  %build
  pushd src
  %configure --enable-odbc --enable-debug
- make %{?_smp_mflags}
+ # doesn't builds on SMP currently
+ make
  popd
- %if %{?rhel:0}%{!?rhel:1}
+ %if %{undefined rhel}
  pushd doc
  make html pdf
  popd
-Line 126 
 pushd src
+Line 112 
 pushd src
  make install DESTDIR=%{buildroot}
  popd
- chmod a+x %{buildroot}%{_libdir}/ejabberd-%{version}/priv/lib/*.so
+ chmod a+x %{buildroot}%{_libdir}/%{name}/priv/lib/*.so
  %{__perl} -pi -e 's!./ssl.pem!/etc/ejabberd/ejabberd.pem!g' %{buildroot}/etc/ejabberd/ejabberd.cfg
-Line 146 
 chmod a+x %{buildroot}%{_initrddir}/ejab
+Line 132 
 chmod a+x %{buildroot}%{_initrddir}/ejab
  mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
  cp -p %{S:2} %{buildroot}%{_sysconfdir}/logrotate.d/ejabberd
- %{__perl} -pi -e 's!\@libdir\@!%{_libdir}!g' %{buildroot}%{_initrddir}/ejabberd %{buildroot}%{_sysconfdir}/logrotate.d/ejabberd %{buildroot}%{_sbindir}/ejabberdctl
+ %{__perl} -pi -e 's!\@libdir\@!%{_libdir}!g'  %{buildroot}%{_initrddir}/ejabberd %{buildroot}%{_sysconfdir}/logrotate.d/ejabberd %{buildroot}%{_sbindir}/ejabberdctl
  %{__perl} -pi -e 's!\@version\@!%{version}!g' %{buildroot}%{_initrddir}/ejabberd %{buildroot}%{_sysconfdir}/logrotate.d/ejabberd %{buildroot}%{_sbindir}/ejabberdctl
- #cp %{S:3} %{buildroot}%{_sysconfdir}/ejabberd/inetrc
+ # BZ# 439583
- #mv %{buildroot}%{_sysconfdir}/ejabberd/{ejabberd.,}inetrc
+ %{__perl} -pi -e 's!MAINDIR=!MAINDIR=%{_libdir}/ejabberd!g' %{buildroot}%{_sbindir}/ejabberdctl
  %clean
  rm -rf %{buildroot}
  %files
  %defattr(-,root,root,-)
- %doc COPYING
+ %doc COPYING src/odbc/mysql.sql src/odbc/mssql.sql src/odbc/pg.sql
  %attr(750,ejabberd,ejabberd) %dir %{_sysconfdir}/ejabberd
  %attr(640,ejabberd,ejabberd) %config(noreplace) %{_sysconfdir}/ejabberd/ejabberd.cfg
-Line 172 
 rm -rf %{buildroot}
+Line 158 
 rm -rf %{buildroot}
  %{_bindir}/ejabberdctl
  %{_sbindir}/ejabberdctl
- %dir %{_libdir}/ejabberd-%{version}
+ %dir %{_libdir}/%{name}
- %dir %{_libdir}/ejabberd-%{version}/ebin
+ %dir %{_libdir}/%{name}/ebin
- %{_libdir}/ejabberd-%{version}/ebin/*.app
+ %dir %{_libdir}/%{name}/priv
- %{_libdir}/ejabberd-%{version}/ebin/*.beam
+ %dir %{_libdir}/%{name}/priv/bin
+ %dir %{_libdir}/%{name}/priv/lib
- %dir %{_libdir}/ejabberd-%{version}/priv
+ %dir %{_libdir}/%{name}/priv/msgs
- %dir %{_libdir}/ejabberd-%{version}/priv/lib
+ %{_libdir}/%{name}/ebin/*.app
- %{_libdir}/ejabberd-%{version}/priv/lib/*.so
+ %{_libdir}/%{name}/ebin/*.beam
+ %{_libdir}/%{name}/priv/lib/*.so
- %dir %{_libdir}/ejabberd-%{version}/priv/msgs
+ %{_libdir}/%{name}/priv/msgs/*.msg
- %{_libdir}/ejabberd-%{version}/priv/msgs/*.msg
  %attr(750,ejabberd,ejabberd) %dir /var/lib/ejabberd
  %attr(750,ejabberd,ejabberd) %dir /var/lib/ejabberd/spool
  %attr(750,ejabberd,ejabberd) %dir /var/log/ejabberd
  %files doc
  %defattr(-,root,root,-)
- %if %{?rhel:0}%{!?rhel:1}
+ %if %{undefined rhel}
- %doc ChangeLog COPYING doc/*.pdf doc/*.html doc/*.png doc/release_notes_*
+ %doc ChangeLog COPYING doc/release_notes_* doc/*.pdf doc/*.html doc/*.png
  %else
  %doc ChangeLog COPYING doc/release_notes_*
  %endif
  %changelog
- * Sat May  10 2008 Jean-Paul Leclere <jean-paul@leclere.org> 2.0.0-4
+ * Sun Jun 22 2008 Peter Lemenkov <lemenkov@gmail.com> 2.0.1-4
- - Don't use fedora-usermgmt
+ - Last minute fix (issue with shortnames/fqdn)
- - set ejabberd uid to 33 for SME compatibility
- - only spec file changes
+ * Sun Jun 22 2008 Peter Lemenkov <lemenkov@gmail.com> 2.0.1-3
+ -Fixed BZ# 439583, 452326, 451554
+ * Thu May 29 2008 Peter Lemenkov <lemenkov@gmail.com> 2.0.1-2
+ - Fixed BZ# 439583
+ * Sat May 24 2008 Peter Lemenkov <lemenkov@gmail.com> 2.0.1-1
+ - Ver. 2.0.1
+ - Upstreamed patches dropped
+ - No longer uses versioned libdir (/usr/lib/ejabberd-x.x.x)
+ - Added sql-scripts in docs-directory
  * Mon May  5 2008 Peter Lemenkov <lemenkov@gmail.com> 2.0.0-3
  - Fix build against R11B-2
-Line 221 
 rm -rf %{buildroot}
+Line 215 
 rm -rf %{buildroot}
  * Wed Jan 23 2008 Peter Lemenkov <lemenkov@gmail.com> 2.0.0-0.2.rc1
  - Enabled some previously disabled modules
  * Sat Jan 19 2008 Matej Cepl <mcepl@redhat.com> 2.0.0-0.1.rc1
  - Upgrade to the current upsteram version.
  - Make ejabberd.init LSB compliant (missing Provides: tag)

 Legend:



Removed lines/characters
 


Changed lines/characters


 
Added lines/characters
 Legend:



Removed lines/characters
 


Changed lines/characters


 
Added lines/characters
-Removed lines/characters
+Added lines/characters

admin@koozali.org	ViewVC Help
Powered by ViewVC 1.2.1