Author: bszx Date: Tue Jan 22 15:14:46 2008 GMT Module: SPECS Tag: HEAD ---- Log message: - updated to 2.1.22 - patches 7 and 21 have been included in source
---- Files affected: SPECS: jabberd.spec (1.99 -> 1.100) ---- Diffs: ================================================================ Index: SPECS/jabberd.spec diff -u SPECS/jabberd.spec:1.99 SPECS/jabberd.spec:1.100 --- SPECS/jabberd.spec:1.99 Sat Nov 3 03:10:03 2007 +++ SPECS/jabberd.spec Tue Jan 22 16:14:41 2008 @@ -17,26 +17,21 @@ Summary: Jabber/XMPP server Summary(pl.UTF-8): Serwer Jabber/XMPP Name: jabberd -Version: 2.0s11 -Release: 2 +Version: 2.1.22 +Release: 0.1 License: GPL Group: Applications/Communications -Source0: http://files.jabberstudio.org/jabberd2/%{name}-%{version}.tar.gz -# Source0-md5: 67d1663ed97a5ba707d5d145b1d19c55 +Source0: http://ftp.xiaoka.com/jabberd2/releases/%{name}-%{version}.tar.bz2 +# Source0-md5: 16e2e5b8732352b12d691c67b84eebad Source1: %{name}.init Source2: %{name}.sysconfig Source3: db-setup.sqlite Patch0: %{name}-perlscript.patch Patch1: %{name}-daemonize.patch Patch2: %{name}-default_config.patch -Patch3: %{name}-sysconfdir.patch Patch4: %{name}-delay_jobs.patch Patch5: %{name}-binary_path.patch Patch6: %{name}-reconnect.patch -# http://staff.xiaoka.com/smoku/stuff/Jabber/jabberd2/jabberd2-presence-handling.patch -Patch7: %{name}2-presence-handling.patch -#bcond oq, http://www.marquard.net/jabber/patches/patch-sm-offline-quota -Patch21: patch-sm-offline-quota #bcond bxmpp Patch22: http://www.marquard.net/jabber/patches/patch-flash-v2 # avatars @@ -51,13 +46,14 @@ BuildRequires: libidn-devel >= 0.3.0 BuildRequires: libtool %{?with_mysql:BuildRequires: mysql-devel} -%{?with_ldap:BuildRequires: openldap-devel >= 2.4.6} +%{?with_ldap:BuildRequires: openldap-devel} BuildRequires: openssl-devel >= 0.9.6d BuildRequires: pam-devel %{?with_pgsql:BuildRequires: postgresql-devel} BuildRequires: rpm-perlprov >= 3.0.3-16 BuildRequires: rpmbuild(macros) >= 1.268 %{?with_sqlite:BuildRequires: sqlite3-devel} +BuildRequires: gsasl-devel Requires(post): sed >= 4.0 Requires(post): textutils Requires(post,preun): /sbin/chkconfig @@ -78,15 +74,9 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 %patch4 -p1 %patch5 -p1 %patch6 -p1 -%patch7 -p0 - -%if %{with oq} -%patch21 -p0 -%endif %if %{with bxmpp} %patch22 -p0 @@ -108,6 +98,7 @@ %{__automake} %configure \ --bindir="%{_libdir}/%{name}" \ + --sysconfdir="%{_sysconfdir}/jabber" \ %{?with_db:--enable-db} \ %{!?with_mysql:--disable-mysql} \ %{?with_pgsql:--enable-pgsql} \ @@ -182,6 +173,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.100 2008-01-22 15:14:41 bszx +- updated to 2.1.22 +- patches 7 and 21 have been included in source + Revision 1.99 2007-11-03 02:10:03 baggins - updated openldap BR/R to 2.4.6 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/jabberd.spec?r1=1.99&r2=1.100&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
