X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=ejabberd.spec;h=1483c3d223af7ec2d85e7d5f0441f58e8ef7fdc4;hb=3f2196e793b5d1e36f5c510163cd6cd5b48b89d7;hp=41fcba5ef0f090ccf58318d9d5d6a5d29e4d30e7;hpb=4dea86b0c7ec9bf20c22fa043282c23209fd91e3;p=packages%2Fejabberd.git

diff --git a/ejabberd.spec b/ejabberd.spec
index 41fcba5..1483c3d 100644
--- a/ejabberd.spec
+++ b/ejabberd.spec
@@ -6,26 +6,34 @@
 
 %define	realname	ejabberd
 
+%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}
-Version:	2.1.0
+Version:	2.1.11
 Release:	1
 License:	GPL
 Group:		Applications/Communications
-Source0:	http://www.process-one.net/downloads/ejabberd/%{version}/sources/%{realname}-%{version}.tar.gz
-# Source0-md5:	373be6e99acf7c930ab85531489c63c4
+Source0:	http://www.process-one.net/downloads/ejabberd/%{version}/%{realname}-%{version}.tgz
+# Source0-md5:	a70b040c4e7602f47718c8afe8780d50
 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
-URL:		http://ejabberd.jabber.ru/
+Patch4:		%{realname}-vcard-access-get.patch
+URL:		http://www.ejabberd.im/
 BuildRequires:	autoconf
+BuildRequires:	automake
 BuildRequires:	erlang >= R10B_5
 BuildRequires:	expat-devel >= 1.95
 BuildRequires:	openssl-devel
@@ -53,7 +61,7 @@ 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
+Summary:	Server-side logging module
 Group:		Applications/Communications
 Requires:	%{name} = %{version}-%{release}
 
@@ -61,21 +69,31 @@ Requires:	%{name} = %{version}-%{release}
 Server-side logging module.
 
 %prep
-%setup -q -n %{realname}-%{version}
+%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
@@ -92,6 +110,14 @@ sed -e's,@libdir@,%{_libdir},g' %{SOURCE3} > $RPM_BUILD_ROOT%{_sbindir}/%{realna
 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