X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=ejabberd.spec;h=68c9391bbb7227c963d2007aeacb9940de17884b;hb=379383b4f3e48fbcdfa0191a1903c387858f1116;hp=23f13607e44ac49bb98ebc74ce61ae470dbda5db;hpb=3ae1381d571123e26c27386a99e1764b023dde6f;p=packages%2Fejabberd.git

diff --git a/ejabberd.spec b/ejabberd.spec
index 23f1360..68c9391 100644
--- a/ejabberd.spec
+++ b/ejabberd.spec
@@ -1,29 +1,34 @@
 #
 # Conditional build:
 %bcond_with	pam		# PAM authentication support
+%bcond_without	logdb		# enable mod_logdb (server-side message logging)
 #
+
+%define	realname	ejabberd
+
 Summary:	Fault-tolerant distributed Jabber/XMPP server
 Summary(pl.UTF-8):	Odporny na awarie rozproszony serwer Jabbera/XMPP
-Name:		ejabberd
-Version:	1.1.4
+Name:		%{realname}
+Version:	2.1.4
 Release:	1
 License:	GPL
 Group:		Applications/Communications
-Source0:	http://www.process-one.net/en/projects/ejabberd/download/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	65e9cd346f11a28afbacfe1d7be3a33b
-Source1:	%{name}.init
-Source2:	%{name}.sysconfig
-Source3:	%{name}.sh
-Source4:	%{name}ctl.sh
-Source5:	%{name}-inetrc
-Patch0:		%{name}-makefile.patch
-Patch1:		%{name}-config.patch
-Patch2:		%{name}-mod_muc.patch
-Patch3:		%{name}-auth_pam.patch
-Patch4:		%{name}-show_certificate_chain.patch
+Source0:	http://www.process-one.net/downloads/ejabberd/%{version}/%{realname}-%{version}.tar.gz
+# Source0-md5:	a73f2ae7c5c9ceccc295e6cbc6a70132
+Source1:	%{realname}.init
+Source2:	%{realname}.sysconfig
+Source3:	%{realname}.sh
+Source4:	%{realname}ctl.sh
+Source5:	%{realname}-inetrc
+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:	erlang >= R9C
+BuildRequires:	erlang >= R10B_5
 BuildRequires:	expat-devel >= 1.95
 BuildRequires:	openssl-devel
 %if %{with pam}
@@ -37,6 +42,7 @@ Requires(post):	sed >= 4.0
 Requires(post):	textutils
 Requires(post,preun):	/sbin/chkconfig
 Requires:	erlang
+Requires:	expat >= 1.95
 Requires:	rc-scripts
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -48,39 +54,52 @@ 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
+%setup -q -n %{realname}-%{version}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%if %{with pam}
-cd src/
+%patch4 -p1
+%if %{with logdb}
+cd src
 %patch3 -p0
 %endif
-%patch4 -p1
 
 %build
 cd src
 %{__autoconf}
 %configure \
-	--enable-odbc %{?with_pam --enable-pam}
-%{__make}
+	%{?with_pam --enable-pam} \
+	--with-openssl=%{_prefix} \
+	--enable-odbc
+%{__make} -j1
 cd ..
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/var/lib/%{name},/etc/{sysconfig,rc.d/init.d},%{_sbindir}}
+install -d $RPM_BUILD_ROOT{/var/lib/%{realname},/etc/{sysconfig,rc.d/init.d},%{_sbindir}}
 
-%{__make} -C src install \
+%{__make} -C src install -j1 \
 	DESTDIR=$RPM_BUILD_ROOT
 
-sed -e's,@libdir@,%{_libdir},g' %{SOURCE1} > $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
+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}
 
-sed -e's,@libdir@,%{_libdir},g' %{SOURCE3} > $RPM_BUILD_ROOT%{_sbindir}/%{name}
-sed -e's,@libdir@,%{_libdir},g' %{SOURCE4} > $RPM_BUILD_ROOT%{_sbindir}/%{name}ctl
+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
 install %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/jabber
 
+chmod 755 $RPM_BUILD_ROOT%{_libdir}/ejabberd/priv/lib/*.so
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -111,11 +130,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/%{name}
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}
+%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