rpms/ejabberd/devel .cvsignore, 1.15, 1.16 ejabberd.spec, 1.48, 1.49 import.log, 1.16, 1.17 sources, 1.17, 1.18 ejabberd-captcha-bashism.patch, 1.1, NONE ejabberd-http-poll-web-page.patch, 1.1, NONE ejabberd-piefxis-vhost-export.patch, 1.1, NONE ejabberd-vcard-reqs-forwarding.patch, 1.1, NONE

[Peter Lemenkov]

Author: peter

Update of /cvs/pkgs/rpms/ejabberd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19558/devel

Modified Files:
	.cvsignore ejabberd.spec import.log sources 
Removed Files:
	ejabberd-captcha-bashism.patch 
	ejabberd-http-poll-web-page.patch 
	ejabberd-piefxis-vhost-export.patch 
	ejabberd-vcard-reqs-forwarding.patch 
Log Message:
Ver. 2.1.1


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- .cvsignore	21 Nov 2009 08:01:18 -0000	1.15
+++ .cvsignore	24 Dec 2009 12:05:21 -0000	1.16
@@ -1 +1 @@
-ejabberd-2.1.0.tar.gz
+ejabberd-2.1.1.tar.gz


Index: ejabberd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/devel/ejabberd.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- ejabberd.spec	10 Dec 2009 19:01:41 -0000	1.48
+++ ejabberd.spec	24 Dec 2009 12:05:21 -0000	1.49
@@ -11,8 +11,8 @@
 %endif
 
 Name:           ejabberd
-Version:        2.1.0
-Release:        2%{?dist}
+Version:        2.1.1
+Release:        1%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
 Group:          Applications/Internet
@@ -47,23 +47,8 @@ Patch3: ejabberd-ejabberd_cfg_pam_name.d
 Patch5: ejabberd-mod_ctlextra_mentioning_in_ejabberd_app.diff
 # fixed delays in s2s connections
 Patch8: ejabberd-fixed_delays_in_s2s.patch
-# captcha.sh uses some BASH-specific variables
-# see https://support.process-one.net/browse/EJAB-1105
-Patch9: ejabberd-captcha-bashism.patch
 # Introducing mod_admin_extra
 Patch10: ejabberd-mod_admin_extra.patch
-# Fixed long-standing bug with RFC 3920 violation
-# see https://support.process-one.net/browse/EJAB-1045
-Patch11: ejabberd-vcard-reqs-forwarding.patch
-# Generates a human-readable XHTML page which is returned
-# when a user tries to browse the HTTP-poll URL configured
-# for the server (a common mistake).
-# see https://support.process-one.net/browse/EJAB-1106
-Patch12: ejabberd-http-poll-web-page.patch
-# This patch enables generation of the main XML file
-# when exporting data of a virtual host into PIEFXIS format.
-# see https://support.process-one.net/browse/EJAB-1098
-Patch13: ejabberd-piefxis-vhost-export.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -177,11 +162,7 @@ fi
 %patch3 -p0 -b .pam_name
 %patch5 -p0 -b .mod_ctlextra
 %patch8 -p0 -b .s2s
-%patch9 -p1 -b .bashism
 %patch10 -p1 -b .mod_admin_extra
-%patch11 -p1 -b .vcard_rfc_violation
-%patch12 -p1 -b .xhtml
-%patch13 -p1 -b .piefxis
 
 dos2unix src/odbc/mssql2000.sql
 
@@ -346,11 +327,16 @@ rm -rf %{buildroot}
 %doc doc/release_notes_2.0.4.txt
 %doc doc/release_notes_2.0.5.txt
 %doc doc/release_notes_2.1.0.txt
+%doc doc/release_notes_2.1.1.txt
 %doc doc/webadmmain.png
 %doc doc/webadmmainru.png
 %doc doc/yozhikheader.png
 
 %changelog
+* Thu Dec 24 2009 Peter Lemenkov <lemenkov at gmail.com> 2.1.1-1
+- Ver. 2.1.1
+- Dropped patches 9,11,12,13 (accepted upstream)
+
 * Thu Dec 10 2009 Peter Lemenkov <lemenkov at gmail.com> 2.1.0-2
 - DB backups are made on every upgrade/uninstall
 - Fixed installation of captcha.sh example helper


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/devel/import.log,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- import.log	10 Dec 2009 19:01:41 -0000	1.16
+++ import.log	24 Dec 2009 12:05:21 -0000	1.17
@@ -14,3 +14,4 @@ ejabberd-2_0_5-8_fc11:HEAD:ejabberd-2.0.
 ejabberd-2_0_5-10_fc11:HEAD:ejabberd-2.0.5-10.fc11.src.rpm:1257428310
 ejabberd-2_1_0-1_fc12:HEAD:ejabberd-2.1.0-1.fc12.src.rpm:1258790332
 ejabberd-2_1_0-2_fc12:HEAD:ejabberd-2.1.0-2.fc12.src.rpm:1260471420
+ejabberd-2_1_1-1_fc12:HEAD:ejabberd-2.1.1-1.fc12.src.rpm:1261656263


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	21 Nov 2009 08:01:19 -0000	1.17
+++ sources	24 Dec 2009 12:05:21 -0000	1.18
@@ -1 +1 @@
-373be6e99acf7c930ab85531489c63c4  ejabberd-2.1.0.tar.gz
+8a2b9925fc2790d0594a8d3b37183537  ejabberd-2.1.1.tar.gz


--- ejabberd-captcha-bashism.patch DELETED ---


--- ejabberd-http-poll-web-page.patch DELETED ---


--- ejabberd-piefxis-vhost-export.patch DELETED ---


--- ejabberd-vcard-reqs-forwarding.patch DELETED ---