- include the pgsql module

[packages/ejabberd.git] / ejabberd.spec

diff --git a/ejabberd.spec b/ejabberd.spec
index 0a87f9276a2db12f088c406d321dfcd852ab7405..99d714c6827e34fbcca6c6cc96f9de2e60ee39bd 100644 (file)
--- a/ejabberd.spec
+++ b/ejabberd.spec
@@ -1,39 +1,39 @@
 #
-# TODO:
-#      - drop or update logdb bcond (the patch doesn't apply to 2.0.0)
-#
 # Conditional build:
 %bcond_with    pam             # PAM authentication support
-%bcond_with    logdb           # enable mod_logdb (server-side message logging)
+%bcond_without logdb           # enable mod_logdb (server-side message logging)
 #
-%define        _alt_name       %{nil}
-%if %{with logdb}
-%define        _alt_name       -logdb
-%endif
 
 %define        realname        ejabberd
-%define                rev     r1477
+
+%define        pgsql_module_rev 1105
 
 Summary:       Fault-tolerant distributed Jabber/XMPP server
 Summary(pl.UTF-8):     Odporny na awarie rozproszony serwer Jabbera/XMPP
-Name:          %{realname}%{_alt_name}
-Version:       2.0.1
-Release:       0.%{rev}.1
+Name:          %{realname}
+Version:       2.1.6
+Release:       2
 License:       GPL
 Group:         Applications/Communications
-Source0:       ejabberd-svn-%{rev}.tar.gz
-# Source0-md5: 7163ba0bf21ea892cfde9f113916ca7e
+Source0:       http://www.process-one.net/downloads/ejabberd/%{version}/%{realname}-%{version}.tar.gz
+# Source0-md5: f5a41edee2204c414150075331ced506
 Source1:       %{realname}.init
 Source2:       %{realname}.sysconfig
 Source3:       %{realname}.sh
 Source4:       %{realname}ctl.sh
 Source5:       %{realname}-inetrc
+# svn export -r %{pgsql_module_rev} https://svn.process-one.net/ejabberd-modules/pgsql/trunk/src ejabberd-module-pgsql-%{pgsql_module_rev}
+Source6:       ejabberd-module-pgsql-%{pgsql_module_rev}.tar.bz2
+# Source6-md5: 7a8ba920a508f5180284699610789c14
 Patch0:                %{realname}-makefile.patch
 Patch1:                %{realname}-config.patch
 Patch2:                %{realname}-mod_muc.patch
+# http://www.dp.uz.gov.ua/o.palij/mod_logdb/patch-src-mod_logdb-2.1.0.diff
 Patch3:                %{realname}-mod_logdb.patch
+Patch4:                %{realname}-vcard-access-get.patch
 URL:           http://ejabberd.jabber.ru/
 BuildRequires: autoconf
+BuildRequires: automake
 BuildRequires: erlang >= R10B_5
 BuildRequires: expat-devel >= 1.95
 BuildRequires: openssl-devel
@@ -48,14 +48,8 @@ Requires(post):      sed >= 4.0
 Requires(post):        textutils
 Requires(post,preun):  /sbin/chkconfig
 Requires:      erlang
+Requires:      expat >= 1.95
 Requires:      rc-scripts
-%if %{with logdb}
-Obsoletes:     ejabberd
-Conflicts:     ejabberd
-%else
-Obsoletes:     ejabberd-logdb
-Conflicts:     ejabberd-logdb
-%endif
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -66,22 +60,40 @@ server. It is written mostly in Erlang.
 ejabberd to darmowy, z otwartymi źródłami, odporny na awarie
 rozproszony serwer Jabbera. Jest napisany w większości w Erlangu.
 
+%package logdb
+Summary:       Server-side logging module
+Group:         Applications/Communications
+Requires:      %{name} = %{version}-%{release}
+
+%description logdb
+Server-side logging module.
+
 %prep
-%setup -q -n %{realname}
+%setup -q -a 6
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch4 -p1
 %if %{with logdb}
+cd src
 %patch3 -p0
 %endif
 
 %build
 cd src
+%{__aclocal}
 %{__autoconf}
 %configure \
-       --enable-odbc %{?with_pam --enable-pam}
+       %{?with_pam --enable-pam} \
+       --with-openssl=%{_prefix} \
+       --enable-odbc
 %{__make} -j1
 cd ..
+cd ejabberd-module-pgsql-%{pgsql_module_rev}
+for f in *.erl ; do
+       erlc $f
+done
+cd ..
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -90,13 +102,22 @@ install -d $RPM_BUILD_ROOT{/var/lib/%{realname},/etc/{sysconfig,rc.d/init.d},%{_
 %{__make} -C src install -j1 \
        DESTDIR=$RPM_BUILD_ROOT
 
-sed -e's,@libdir@,%{_libdir},g' %{SOURCE1} > $RPM_BUILD_ROOT/etc/rc.d/init.d/%{realname}
+sed -e's,@libdir@,%{_libdir},g' -e 's,@EJABBERD_DOC_PATH@,%{_docdir}/%{name}-%{version}/doc,g' %{SOURCE1} > $RPM_BUILD_ROOT/etc/rc.d/init.d/%{realname}
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/%{realname}
 
+chmod u+rw $RPM_BUILD_ROOT%{_sbindir}/%{realname}*
 sed -e's,@libdir@,%{_libdir},g' %{SOURCE3} > $RPM_BUILD_ROOT%{_sbindir}/%{realname}
-#sed -e's,@libdir@,%{_libdir},g' %{SOURCE4} > $RPM_BUILD_ROOT%{_sbindir}/%{realname}ctl
+sed -e's,@libdir@,%{_libdir},g' %{SOURCE4} > $RPM_BUILD_ROOT%{_sbindir}/%{realname}ctl
 install %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/jabber
 
+chmod 755 $RPM_BUILD_ROOT%{_libdir}/ejabberd/priv/lib/*.so
+
+cd ejabberd-module-pgsql-%{pgsql_module_rev}
+for f in *.beam ; do
+       install $f $RPM_BUILD_ROOT%{_libdir}/ejabberd/ebin
+done
+cd ..
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -127,11 +148,20 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc ChangeLog doc src/odbc/pg.sql src/odbc/mysql.sql src/odbc/mssql.sql
+%doc doc src/odbc/pg.sql src/odbc/mysql.sql
 %attr(755,root,root) %{_sbindir}/*
 %attr(640,root,jabber) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/jabber/*
 %attr(770,root,jabber) /var/log/ejabberd
+%if %{with logdb}
+%exclude %{_libdir}/ejabberd/ebin/mod_logdb*
+%endif
 %{_libdir}/ejabberd
 %dir %attr(770,root,jabber) /var/lib/ejabberd
 %attr(754,root,root) /etc/rc.d/init.d/%{realname}
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{realname}
+
+%if %{with logdb}
+%files logdb
+%defattr(644,root,root,755)
+%{_libdir}/ejabberd/ebin/mod_logdb*
+%endif