/[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.9 by slords,
Mon Aug 24 18:19:21 2009 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.5
- Release:        4%{?dist}
+ Release:        2%{?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
  Source1:        ejabberd.init
  Source2:        ejabberd.logrotate
+ Source3:        ejabberd.sysconfig
- # http://ejabberd.jabber.ru/ejabberdctl-extra
+ # http://www.ejabberd.im/mod_ctlextra
- Source4:        https://svn.process-one.net/ejabberd-modules/mod_ctlextra/trunk/src/mod_ctlextra.erl
+ # svn export -r 873 https://svn.process-one.net/ejabberd-modules/mod_ctlextra/trunk/src/mod_ctlextra.erl
+ Source4:        mod_ctlextra.erl
  # The following were extracted from a patch found on http://realloc.spb.ru/share/ejabberdad.html
  Source5:        ejabberd_auth_ad.erl
  Source6:        mod_shared_roster_ad.erl
  Source7:        mod_vcard_ad.erl
- #
- #Source8:        ejabberdctl
+ # PAM support
  Source9:        ejabberdctl.pam
  Source10:       ejabberdctl.apps
+ Source11:       ejabberd.pam
- # 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, 465196
+ Patch2: ejabberd-ejabberdctl_fix.diff
+ # Use ejabberd as an example for PAM service name
+ Patch3: ejabberd-ejabberd_cfg_pam_name.diff
+ # CAPTCHA support, see https://support.process-one.net/doc/display/XAAI/Fighting+Multi-User+Chat+SPAM+with+CAPTCHA
+ # wget https://support.process-one.net/secure/attachment/13851/XEP-0158_ejabberd-2.0.4.patch -O ejabberd-captcha.patch
+ Patch4: ejabberd-captcha.patch
- # R12B
- 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 42 
 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(post): /usr/bin/openssl
  Requires(preun): /sbin/chkconfig
  Requires(preun): /sbin/service
  Requires(postun): /sbin/service
 Line 74 
 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
  /sbin/chkconfig --add ejabberd
+ (cd /etc/ejabberd
+ if [ ! -f ejabberd.pem ]
+ then
+     echo "Generating SSL certificate /etc/ejabberd/ejabberd.pem..."
+     HOSTNAME=$(hostname -s)
+     DOMAINNAME=$(hostname -d)
+     openssl req -new -x509 -days 365 -nodes -out ejabberd.pem \
+                 -keyout ejabberd.pem > /dev/null 2>&1 <<+++
+ .
+ .
+ .
+ $DOMAINNAME
+ $HOSTNAME
+ ejabberd
+ root@$HOSTNAME.$DOMAINNAME
+ +++
+ chown ejabberd:ejabberd ejabberd.pem
+ chmod 600 ejabberd.pem
+ fi)
  %preun
  if [ $1 = 0 ]; then
          /sbin/service ejabberd stop >/dev/null 2>&1
-Line 93 
 if [ "$1" -ge "1" ]; then
+Line 113 
 if [ "$1" -ge "1" ]; then
  fi
  %prep
- %setup -q -n %{name}-%{version}
+ %setup -q
- %patch0 -p1 -b .Er12b-build
+ %patch1 -p0 -b .fix_paths
- %patch1 -p1 -b .MC-build
+ %patch2 -p0 -b .fix_user
- #%patch2 -p1 -b .R12B
+ %patch3 -p0 -b .pam_name
- %patch3 -p0 -b .r11_ssl
+ #%patch4 -p1 -b .captcha
+ dos2unix src/odbc/mssql.sql
- %{__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 110 
 cp %{S:7} src
+Line 127 
 cp %{S:7} src
  %build
  pushd src
- %configure --enable-odbc --enable-debug
+ %configure --enable-odbc --enable-debug --enable-pam
- 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 144 
 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 135 
 mkdir -p %{buildroot}/var/lib/ejabberd/s
+Line 153 
 mkdir -p %{buildroot}/var/lib/ejabberd/s
  mkdir -p %{buildroot}%{_bindir}
  ln -s consolehelper %{buildroot}%{_bindir}/ejabberdctl
- #install -D -p -m 0755 %{S:8} %{buildroot}%{_sbindir}/ejabberdctl
  install -D -p -m 0644 %{S:9} %{buildroot}%{_sysconfdir}/pam.d/ejabberdctl
  install -D -p -m 0644 %{S:10} %{buildroot}%{_sysconfdir}/security/console.apps/ejabberdctl
+ install -D -p -m 0644 %{S:11} %{buildroot}%{_sysconfdir}/pam.d/ejabberd
+ # install init-script
+ install -D -p -m 0755 %{S:1} %{buildroot}%{_initrddir}/ejabberd
- mkdir -p %{buildroot}%{_initrddir}
+ # install config for logrotate
- install -p -m 0755 %{S:1} %{buildroot}%{_initrddir}/ejabberd
+ install -D -p -m 0644  %{S:2} %{buildroot}%{_sysconfdir}/logrotate.d/ejabberd
- chmod a+x %{buildroot}%{_initrddir}/ejabberd
- mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
+ # install sysconfig file
- cp -p %{S:2} %{buildroot}%{_sysconfdir}/logrotate.d/ejabberd
+ install -D -p -m 0644  %{S:3} %{buildroot}%{_sysconfdir}/sysconfig/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
+ # tools/captcha.sh
  %attr(750,ejabberd,ejabberd) %dir %{_sysconfdir}/ejabberd
  %attr(640,ejabberd,ejabberd) %config(noreplace) %{_sysconfdir}/ejabberd/ejabberd.cfg
-Line 166 
 rm -rf %{buildroot}
+Line 187 
 rm -rf %{buildroot}
  %{_initrddir}/ejabberd
  %config(noreplace) %{_sysconfdir}/logrotate.d/ejabberd
+ %config(noreplace) %{_sysconfdir}/sysconfig/ejabberd
+ %config(noreplace) %{_sysconfdir}/pam.d/ejabberd
  %config(noreplace) %{_sysconfdir}/pam.d/ejabberdctl
  %config(noreplace) %{_sysconfdir}/security/console.apps/ejabberdctl
  %{_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
+ %attr(4750,root,ejabberd)    %{_libdir}/%{name}/priv/bin/epam
- %dir %{_libdir}/ejabberd-%{version}/priv
+ %dir %{_libdir}/%{name}/priv/lib
+ %dir %{_libdir}/%{name}/priv/msgs
- %dir %{_libdir}/ejabberd-%{version}/priv/lib
- %{_libdir}/ejabberd-%{version}/priv/lib/*.so
+ %{_libdir}/%{name}/ebin/*.app
+ %{_libdir}/%{name}/ebin/*.beam
- %dir %{_libdir}/ejabberd-%{version}/priv/msgs
+ %{_libdir}/%{name}/priv/lib/*.so
- %{_libdir}/ejabberd-%{version}/priv/msgs/*.msg
+ %{_libdir}/%{name}/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
+ * Sat Apr  4 2009 Peter Lemenkov <lemenkov@gmail.com> 2.0.5-2
- - Don't use fedora-usermgmt
+ - Really disable CAPTCHA
- - set ejabberd uid to 33 for SME compatibility
- - only spec file changes
+ * Fri Apr  3 2009 Peter Lemenkov <lemenkov@gmail.com> 2.0.5-1
+ - Ver. 2.0.5
+ - Temporarily disabled CAPTCHA support
+ * Sun Mar 15 2009 Peter Lemenkov <lemenkov@gmail.com> 2.0.4-2
+ - Support for CAPTCHA (XEP-0158)
+ - Updated mod_ctlextra.erl (fixed EJAB-789, EJAB-864)
+ * Sun Mar 15 2009 Peter Lemenkov <lemenkov@gmail.com> 2.0.4-1
+ - Ver. 2.0.4
+ * Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.3-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+ * Mon Jan 26 2009 Peter Lemenkov <lemenkov@gmail.com> 2.0.3-1
+ - Ver. 2.0.3
+ - Merged some stuff from git://dev.laptop.org/users/martin/ejabberd-xs.git
+ * Fri Jan 16 2009 Tomas Mraz <tmraz@redhat.com> 2.0.2-4
+ - rebuild with new openssl
+ * Thu Oct  2 2008 Peter Lemenkov <lemenkov@gmail.com> 2.0.2-3
+ - Fixed broken ejabberdctl (BZ# 465196)
+ * Sat Aug 30 2008 Peter Lemenkov <lemenkov@gmail.com> 2.0.2-2
+ - Added missing Requires
+ * Fri Aug 29 2008 Peter Lemenkov <lemenkov@gmail.com> 2.0.2-1
+ - Ver. 2.0.2
+ * Sat Aug  9 2008 Peter Lemenkov <lemenkov@gmail.com> 2.0.2-0.3.beta1
+ - PAM support (BZ# 452803)
+ * Sat Aug  9 2008 Peter Lemenkov <lemenkov@gmail.com> 2.0.2-0.2.beta1
+ - Fix build with --fuzz=0
+ * Sat Aug  9 2008 Peter Lemenkov <lemenkov@gmail.com> 2.0.2-0.1.beta1
+ - Version 2.0.2-beta1
+ - Fixed BZ# 452326
+ - Fixed BZ# 227270
+ * Sun Jun 22 2008 Peter Lemenkov <lemenkov@gmail.com> 2.0.1-4
+ - Last minute fix (issue with shortnames/fqdn)
+ * 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 296 
 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