Sat Nov 21 08:02:52 UTC 2009

Author: peter

Update of /cvs/pkgs/rpms/ejabberd/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29432/F-12

Modified Files:
	.cvsignore ejabberd-ejabberd_cfg_pam_name.diff 
	ejabberd-ejabberdctl_fix.diff 
	ejabberd-fixed_delays_in_s2s.patch ejabberd.init ejabberd.spec 
	import.log sources 
Removed Files:
	ejabberd-build.patch ejabberd-captcha.patch 
	ejabberd-decrease_buffers_in_mod_proxy65.patch 
	ejabberd-dynamic_compile_loglevel.patch 
	ejabberd-turn_off_error_messages_in_mod_caps.patch 
Log Message:
Ver. 2.1.0


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-12/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15

--- .cvsignore	3 Apr 2009 20:09:33 -0000	1.14
+++ .cvsignore	21 Nov 2009 08:02:50 -0000	1.15
@@ -1 +1 @@
-ejabberd-2.0.5.tar.gz
+ejabberd-2.1.0.tar.gz

ejabberd-ejabberd_cfg_pam_name.diff:
 ejabberd.cfg.example |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: ejabberd-ejabberd_cfg_pam_name.diff
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-12/ejabberd-ejabberd_cfg_pam_name.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ejabberd-ejabberd_cfg_pam_name.diff	10 Aug 2008 06:56:56 -0000	1.1
+++ ejabberd-ejabberd_cfg_pam_name.diff	21 Nov 2009 08:02:51 -0000	1.2
@@ -1,6 +1,6 @@
---- src/ejabberd.cfg.example~	2008-08-01 16:34:28.000000000 +0400
-+++ src/ejabberd.cfg.example	2008-08-09 21:09:07.000000000 +0400
-@@ -214,7 +214,7 @@
+--- src/ejabberd.cfg.example	2009-11-20 15:07:57.317704955 +0300
++++ src/ejabberd.cfg.example	2009-11-20 15:08:11.522704968 +0300
+@@ -235,7 +235,7 @@
  %% Authentication using PAM
  %%
  %%{auth_method, pam}.

ejabberd-ejabberdctl_fix.diff:
 ejabberdctl.template |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Index: ejabberd-ejabberdctl_fix.diff
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-12/ejabberd-ejabberdctl_fix.diff,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- ejabberd-ejabberdctl_fix.diff	25 Aug 2009 19:36:29 -0000	1.6
+++ ejabberd-ejabberdctl_fix.diff	21 Nov 2009 08:02:51 -0000	1.7
@@ -1,6 +1,6 @@
---- src/ejabberdctl.template	2009-04-01 19:23:51.000000000 +0400
-+++ src/ejabberdctl.template	2009-08-25 23:06:19.258685929 +0400
-@@ -9,13 +9,14 @@
+--- src/ejabberdctl.template.fix_ctl	2009-11-06 22:53:19.000000000 +0300
++++ src/ejabberdctl.template	2009-11-21 10:43:17.654686409 +0300
+@@ -9,10 +9,10 @@
  
  # define default environment variables
  NODE=ejabberd
@@ -8,75 +8,25 @@
 +HOST=`hostname -s 2>/dev/null || echo "localhost"`
  ERLANG_NODE=$NODE@$HOST
  ERL=@erl@
--ROOTDIR=@rootdir@
-+ROOTDIR=
-+MAINDIR=
- EJABBERD_CONFIG_PATH=$ROOTDIR/etc/ejabberd/ejabberd.cfg
- LOGS_DIR=$ROOTDIR/var/log/ejabberd/
--EJABBERD_DB=$ROOTDIR/var/lib/ejabberd/db/$NODE
-+EJABBERD_DB=$ROOTDIR/var/lib/ejabberd/spool
+-INSTALLUSER=@installuser@
++INSTALLUSER=ejabberd
  
- # read custom configuration
- CONFIG=$ROOTDIR/etc/ejabberd/ejabberdctl.cfg
-@@ -43,10 +44,10 @@
- ERLANG_OPTS="+K $POLL -smp $SMP +P $ERL_PROCESSES"
+ # parse command line parameters
+ ARGS=
+@@ -60,14 +60,14 @@
+ EJID=`id -g $INSTALLUSER`
+ EXEC_CMD="false"
+ if [ $ID -eq 0 ] ; then
+-	EXEC_CMD="su ${INSTALLUSER} -c"
++	EXEC_CMD="/sbin/runuser -s /bin/bash -p ejabberd -c"
+ fi
+ if [ "$ID" -eq "$EJID" ] ; then
+ 	EXEC_CMD="sh -c"
+ fi
+ if [ "$EXEC_CMD" = "false" ] ; then
+ 	echo "This command can only be run by root or the user $INSTALLUSER" >&2
+-	exit 1
++	exit 4
+ fi
  
- # define additional environment variables
--EJABBERD_EBIN=$ROOTDIR/var/lib/ejabberd/ebin
--EJABBERD_MSGS_PATH=$ROOTDIR/var/lib/ejabberd/priv/msgs
--EJABBERD_SO_PATH=$ROOTDIR/var/lib/ejabberd/priv/lib
--EJABBERD_BIN_PATH=$ROOTDIR/var/lib/ejabberd/priv/bin
-+EJABBERD_EBIN=$MAINDIR/ebin
-+EJABBERD_MSGS_PATH=$MAINDIR/priv/msgs
-+EJABBERD_SO_PATH=$MAINDIR/priv/lib
-+EJABBERD_BIN_PATH=$MAINDIR/priv/bin
- EJABBERD_LOG_PATH=$LOGS_DIR/ejabberd.log
- SASL_LOG_PATH=$LOGS_DIR/sasl.log
- DATETIME=`date "+%Y%m%d-%H%M%S"`
-@@ -75,14 +76,16 @@
- # start server
- start ()
- {
--    $ERL \
-+     ERL_COMMAND="$ERL \
-       $NAME $ERLANG_NODE \
-       -noinput -detached \
-       -pa $EJABBERD_EBIN \
--      -mnesia dir "\"$EJABBERD_DB\"" \
-+      -mnesia dir \\\"$EJABBERD_DB\\\" \
-       -s ejabberd \
--      -sasl sasl_error_logger \{file,\"$SASL_LOG_PATH\"\} \
--      $ERLANG_OPTS $ARGS "$@"
-+      -sasl sasl_error_logger \{file,\\\"$SASL_LOG_PATH\\\"\} \
-+      $ERLANG_OPTS $ARGS "$@" \
-+      "
-+      /sbin/runuser -s /bin/bash -p ejabberd -c "$ERL_COMMAND"
- }
- 
- # attach to server
-@@ -105,7 +108,7 @@
-     read foo
-     echo ""
-     $ERL \
--      $NAME ${NODE}debug \
-+      $NAME debug-${ERLANG_NODE} \
-       -remsh $ERLANG_NODE \
-       $ERLANG_OPTS $ARGS "$@"
- }
-@@ -139,11 +142,13 @@
- # common control function
- ctl ()
- {
--    $ERL \
--      $NAME ejabberdctl \
-+    ERL_COMMAND="$ERL \
-+      $NAME ctl-${ERLANG_NODE} \
-       -noinput \
-       -pa $EJABBERD_EBIN \
--      -s ejabberd_ctl -extra $ERLANG_NODE $@
-+      -s ejabberd_ctl -extra $ERLANG_NODE $@ \
-+      "
-+    /sbin/runuser -s /bin/bash -p ejabberd -c "$ERL_COMMAND"
-     result=$?
-     case $result in
-     0) :;;
+ NAME=-name

ejabberd-fixed_delays_in_s2s.patch:
 ejabberd_s2s_in.erl  |    2 +-
 ejabberd_s2s_out.erl |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

Index: ejabberd-fixed_delays_in_s2s.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-12/ejabberd-fixed_delays_in_s2s.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ejabberd-fixed_delays_in_s2s.patch	9 Sep 2009 10:45:20 -0000	1.1
+++ ejabberd-fixed_delays_in_s2s.patch	21 Nov 2009 08:02:51 -0000	1.2
@@ -18,18 +18,18 @@ Index: src/ejabberd_s2s_in.erl
  					    Key, StateData#state.streamid}),
 Index: src/ejabberd_s2s_out.erl
 ===================================================================
---- src/ejabberd_s2s_out.erl	2009-04-01 17:23:51.000000000 +0200
-+++ src/ejabberd_s2s_out.erl	2009-04-05 22:51:20.000000000 +0200
-@@ -93,7 +93,7 @@
- %% Only change this value if you now what your are doing:
- -define(FSMLIMITS,[]).
- %% -define(FSMLIMITS, [{max_queue, 2000}]).
+--- src/ejabberd_s2s_out.erl	2009-11-06 22:53:19.000000000 +0300
++++ src/ejabberd_s2s_out.erl	2009-11-20 15:59:53.445703654 +0300
+@@ -90,7 +90,7 @@
+ 						 [From, Host, Type])).
+ -endif.
+ 
 --define(FSMTIMEOUT, 30000).
 +-define(FSMTIMEOUT, 60000).
  
  %% We do not block on send anymore.
  -define(TCP_SEND_TIMEOUT, 15000).
-@@ -227,8 +227,8 @@
+@@ -226,8 +226,8 @@
  	{error, _Reason} ->
  	    ?INFO_MSG("s2s connection: ~s -> ~s (remote server not found)",
  		      [StateData#state.myname, StateData#state.server]),


Index: ejabberd.init
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-12/ejabberd.init,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- ejabberd.init	5 Nov 2009 13:41:37 -0000	1.9
+++ ejabberd.init	21 Nov 2009 08:02:52 -0000	1.10
@@ -11,6 +11,8 @@
 # Provides: ejabberd
 # Required-Start: network
 # Required-Stop: network
+# Default-Start:
+# Default-Stop: 0 1 6
 # Short-Description: Start and stop ejabberd
 # Description: A distributed, fault-tolerant Jabber/XMPP server
 ### END INIT INFO


Index: ejabberd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-12/ejabberd.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- ejabberd.spec	5 Nov 2009 13:41:37 -0000	1.46
+++ ejabberd.spec	21 Nov 2009 08:02:52 -0000	1.47
@@ -1,6 +1,18 @@
+%bcond_without fedora
+%global uid 27
+
+# Currently, hevea available only in Fedora
+%if %{defined fedora}
+# No hevea on Fedora for ppc64
+# see https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=250253
+%ifnarch ppc64
+%define with_hevea 1
+%endif
+%endif
+
 Name:           ejabberd
-Version:        2.0.5
-Release:        10%{?dist}
+Version:        2.1.0
+Release:        1%{?dist}
 Summary:        A distributed, fault-tolerant Jabber/XMPP server
 
 Group:          Applications/Internet
@@ -12,10 +24,12 @@ Source2:        ejabberd.logrotate
 Source3:	ejabberd.sysconfig
 
 # http://www.ejabberd.im/mod_ctlextra
+# this module will be removed in the near future in favor of mod_admin_extra
 # svn export -r 1020 https://svn.process-one.net/ejabberd-modules/mod_ctlextra/trunk/src/mod_ctlextra.erl
 Source4:        mod_ctlextra.erl
 
 # The following were extracted from a patch found on http://realloc.spb.ru/share/ejabberdad.html
+# These are unmaintained and will be removed soon (users should use *_ldap.erl instead)
 Source5:        ejabberd_auth_ad.erl
 Source6:        mod_shared_roster_ad.erl
 Source7:        mod_vcard_ad.erl
@@ -25,27 +39,14 @@ Source9:        ejabberdctl.pam
 Source10:       ejabberdctl.apps
 Source11:       ejabberd.pam
 
-# Fedora-specific stuff - fixing paths
-Patch1: ejabberd-build.patch
 # BZ# 439583, 452326, 451554, 465196, 502361
 Patch2: ejabberd-ejabberdctl_fix.diff
 # Use ejabberd as an example for PAM service name
 Patch3: ejabberd-ejabberd_cfg_pam_name.diff
-# CAPTCHA support, see https://support.process-one.net/doc/display/XAAI/Fighting+Multi-User+Chat+SPAM+with+CAPTCHA
-# wget https://support.process-one.net/secure/attachment/13851/XEP-0158_ejabberd-2.0.4.patch -O ejabberd-captcha.patch
-Patch4: ejabberd-captcha.patch
 # Mention mod_ctlextra as an ejabberd module
 Patch5: ejabberd-mod_ctlextra_mentioning_in_ejabberd_app.diff
-# Turn off unnecessary error messages in mod_caps (backport from upstream)
-Patch6: ejabberd-turn_off_error_messages_in_mod_caps.patch
-# Decrease mod_proxy65 send/receive buffers (backport from upstream)
-Patch7: ejabberd-decrease_buffers_in_mod_proxy65.patch
 # fixed delays in s2s connections
 Patch8: ejabberd-fixed_delays_in_s2s.patch
-# Common dynamic compilation facility for Erlang R11/R12/R13 instead of old one
-# See https://support.process-one.net/browse/EJAB-919
-# Fixes BZ# 533021
-Patch9: ejabberd-dynamic_compile_loglevel.patch
 
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -55,22 +56,25 @@ BuildRequires:  openssl-devel
 BuildRequires:  pam-devel
 BuildRequires:  erlang
 BuildRequires:	dos2unix
-%if %{undefined rhel}
+BuildRequires:	fedora-usermgmt-devel
+
+%if 0%{?with_hevea}
 BuildRequires:  hevea
 %endif
 
-Requires:       erlang
-Requires:       usermode
-
-Requires(pre): fedora-usermgmt
+%{?FE_USERADD_REQ}
 Requires(post): /sbin/chkconfig
 Requires(post): /usr/bin/openssl
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
 Requires(postun): /sbin/service
 
-# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=250253
-ExcludeArch: ppc64
+Provides: user(%{name}) = %{uid}
+Provides: group(%{name}) = %{uid}
+
+Requires:       erlang
+Requires:       usermode
+
 
 %description
 ejabberd is a Free and Open Source distributed fault-tolerant
@@ -86,12 +90,12 @@ Group: Documentation
 Documentation for ejabberd.
 
 %pre
-/usr/sbin/fedora-groupadd 27 -r ejabberd &>/dev/null || :
-/usr/sbin/fedora-useradd  27 -r -s /sbin/nologin -d /var/lib/ejabberd -M \
-                             -c 'ejabberd' -g ejabberd ejabberd &>/dev/null || :
+%{__fe_groupadd} %{uid} -r %{name} &>/dev/null || :
+%{__fe_useradd} %{uid} -r -s /sbin/nologin -d /var/lib/ejabberd -M \
+			-c 'ejabberd' -g %{name} %{name} &>/dev/null || :
 
 %post
-/sbin/chkconfig --add ejabberd
+/sbin/chkconfig --add %{name}
 
 (cd /etc/ejabberd
 if [ ! -f ejabberd.pem ]
@@ -115,28 +119,23 @@ fi)
 
 %preun
 if [ $1 = 0 ]; then
-        /sbin/service ejabberd stop >/dev/null 2>&1
-        /sbin/chkconfig --del ejabberd
+        /sbin/service %{name} stop >/dev/null 2>&1
+        /sbin/chkconfig --del %{name}
 fi
 
 %postun
 if [ "$1" -ge "1" ]; then
-        /sbin/service ejabberd condrestart >/dev/null 2>&1
+        /sbin/service %{name} condrestart >/dev/null 2>&1
 fi
 
 %prep
 %setup -q
-%patch1 -p0 -b .fix_paths
 %patch2 -p0 -b .fix_ctl
 %patch3 -p0 -b .pam_name
-%patch4 -p1 -b .captcha
 %patch5 -p0 -b .mod_ctlextra
-%patch6 -p0 -b .error_msg
-%patch7 -p0 -b .decrease_buffers
 %patch8 -p0 -b .s2s
-%patch9 -p0 -b .dyn_compile
 
-dos2unix src/odbc/mssql.sql
+dos2unix src/odbc/mssql2000.sql
 
 cp %{S:4} src
 cp %{S:5} src
@@ -149,8 +148,10 @@ pushd src
 # doesn't builds on SMP currently
 make
 popd
-%if %{undefined rhel}
+%if 0%{?with_hevea}
 pushd doc
+# remove pre-built docs
+rm -f dev.html features.html features.pdf guide.html guide.pdf
 make html pdf
 popd
 %endif
@@ -162,9 +163,11 @@ pushd src
 make install DESTDIR=%{buildroot}
 popd
 
+# surprisingly, generic ejabberd makefile installs libraries with 644 permissions
 chmod a+x %{buildroot}%{_libdir}/%{name}/priv/lib/*.so
 
-%{__perl} -pi -e 's!./ssl.pem!/etc/ejabberd/ejabberd.pem!g' %{buildroot}/etc/ejabberd/ejabberd.cfg
+# fix example SSL certificate path to real one, which we created recently (see above)
+%{__perl} -pi -e 's!/path/to/ssl.pem!/etc/ejabberd/ejabberd.pem!g' %{buildroot}/etc/ejabberd/ejabberd.cfg
 
 mkdir -p %{buildroot}/var/log/ejabberd
 mkdir -p %{buildroot}/var/lib/ejabberd/spool
@@ -184,18 +187,26 @@ install -D -p -m 0644  %{S:2} %{buildroo
 # install sysconfig file
 install -D -p -m 0644  %{S:3} %{buildroot}%{_sysconfdir}/sysconfig/ejabberd
 
-%{__perl} -pi -e 's!\@libdir\@!%{_libdir}!g'  %{buildroot}%{_initrddir}/ejabberd %{buildroot}%{_sysconfdir}/logrotate.d/ejabberd %{buildroot}%{_sbindir}/ejabberdctl
-%{__perl} -pi -e 's!\@version\@!%{version}!g' %{buildroot}%{_initrddir}/ejabberd %{buildroot}%{_sysconfdir}/logrotate.d/ejabberd %{buildroot}%{_sbindir}/ejabberdctl
-
-# BZ# 439583
-%{__perl} -pi -e 's!MAINDIR=!MAINDIR=%{_libdir}/ejabberd!g' %{buildroot}%{_sbindir}/ejabberdctl
+# create room for necessary data
+install -d %{buildroot}%{_datadir}/%{name}
+# install sql-scripts for creating db schemes for various RDBMS
+install -p -m 0644 src/odbc/mssql2000.sql %{buildroot}%{_datadir}/%{name}
+install -p -m 0644 src/odbc/mssql2005.sql %{buildroot}%{_datadir}/%{name}
+install -p -m 0644 src/odbc/mysql.sql %{buildroot}%{_datadir}/%{name}
+install -p -m 0644 src/odbc/pg.sql %{buildroot}%{_datadir}/%{name}
+# install example script for CAPTCHA-protection
+install -p -m 0644 tools/captcha.sh %{buildroot}%{_datadir}/%{name}
+
+# removed files, which would be packaged later (see 'files' section)
+rm -rf %{buildroot}%{_docdir}/%{name}
+rm -f %{buildroot}%{_libdir}/%{name}/priv/bin/captcha.sh
 
 %clean
 rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING src/odbc/mysql.sql src/odbc/mssql.sql src/odbc/pg.sql tools/captcha.sh
+%doc COPYING
 
 %attr(750,ejabberd,ejabberd) %dir %{_sysconfdir}/ejabberd
 %attr(640,ejabberd,ejabberd) %config(noreplace) %{_sysconfdir}/ejabberd/ejabberd.cfg
@@ -213,30 +224,97 @@ rm -rf %{buildroot}
 
 %dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}/ebin
+%dir %{_libdir}/%{name}/include
+%dir %{_libdir}/%{name}/include/eldap
+%dir %{_libdir}/%{name}/include/mod_muc
+%dir %{_libdir}/%{name}/include/mod_proxy65
+%dir %{_libdir}/%{name}/include/mod_pubsub
+%dir %{_libdir}/%{name}/include/web
 %dir %{_libdir}/%{name}/priv
 %dir %{_libdir}/%{name}/priv/bin
-%attr(4750,root,ejabberd)    %{_libdir}/%{name}/priv/bin/epam
 %dir %{_libdir}/%{name}/priv/lib
 %dir %{_libdir}/%{name}/priv/msgs
 
-%{_libdir}/%{name}/ebin/*.app
+%{_libdir}/%{name}/ebin/%{name}.app
 %{_libdir}/%{name}/ebin/*.beam
-%{_libdir}/%{name}/priv/lib/*.so
+%{_libdir}/%{name}/include/XmppAddr.hrl
+%{_libdir}/%{name}/include/adhoc.hrl
+%{_libdir}/%{name}/include/ejabberd.hrl
+%{_libdir}/%{name}/include/ejabberd_commands.hrl
+%{_libdir}/%{name}/include/ejabberd_config.hrl
+%{_libdir}/%{name}/include/ejabberd_ctl.hrl
+%{_libdir}/%{name}/include/eldap/ELDAPv3.hrl
+%{_libdir}/%{name}/include/eldap/eldap.hrl
+%{_libdir}/%{name}/include/jlib.hrl
+%{_libdir}/%{name}/include/mod_muc/mod_muc_room.hrl
+%{_libdir}/%{name}/include/mod_privacy.hrl
+%{_libdir}/%{name}/include/mod_proxy65/mod_proxy65.hrl
+%{_libdir}/%{name}/include/mod_pubsub/pubsub.hrl
+%{_libdir}/%{name}/include/mod_roster.hrl
+%{_libdir}/%{name}/include/web/ejabberd_http.hrl
+%{_libdir}/%{name}/include/web/ejabberd_web_admin.hrl
+%attr(4750,root,ejabberd) %{_libdir}/%{name}/priv/bin/epam
+%{_libdir}/%{name}/priv/lib/ejabberd_zlib_drv.so
+%{_libdir}/%{name}/priv/lib/expat_erl.so
+%{_libdir}/%{name}/priv/lib/iconv_erl.so
+%{_libdir}/%{name}/priv/lib/stringprep_drv.so
+%{_libdir}/%{name}/priv/lib/tls_drv.so
 %{_libdir}/%{name}/priv/msgs/*.msg
 
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/captcha.sh
+%{_datadir}/%{name}/mssql2000.sql
+%{_datadir}/%{name}/mssql2005.sql
+%{_datadir}/%{name}/mysql.sql
+%{_datadir}/%{name}/pg.sql
+
 %attr(750,ejabberd,ejabberd) %dir /var/lib/ejabberd
 %attr(750,ejabberd,ejabberd) %dir /var/lib/ejabberd/spool
 %attr(750,ejabberd,ejabberd) %dir /var/log/ejabberd
 
 %files doc
 %defattr(-,root,root,-)
-%if %{undefined rhel}
-%doc ChangeLog COPYING doc/release_notes_* doc/*.pdf doc/*.html doc/*.png
-%else
-%doc ChangeLog COPYING doc/release_notes_*
-%endif
+%doc COPYING
+%doc doc/dev.html
+%doc doc/discorus.png
+%doc doc/features.html
+%doc doc/features.pdf
+%doc doc/guide.html
+%doc doc/guide.pdf
+%doc doc/logo.png
+%doc doc/release_notes_0.9.txt
+%doc doc/release_notes_0.9.1.txt
+%doc doc/release_notes_0.9.8.txt
+%doc doc/release_notes_1.0.0.txt
+%doc doc/release_notes_1.1.0.txt
+%doc doc/release_notes_1.1.1.txt
+%doc doc/release_notes_1.1.2.txt
+%doc doc/release_notes_1.1.3.txt
+%doc doc/release_notes_1.1.4.txt
+%doc doc/release_notes_2.0.0.txt
+%doc doc/release_notes_2.0.1.txt
+%doc doc/release_notes_2.0.2.txt
+%doc doc/release_notes_2.0.3.txt
+%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/webadmmain.png
+%doc doc/webadmmainru.png
+%doc doc/yozhikheader.png
 
 %changelog
+* Fri Nov 20 2009 Peter Lemenkov <lemenkov at gmail.com> 2.1.0-1
+- Ver. 2.1.0
+- Upstream no longer providing ChangeLog
+- Dropped ejabberd-build.patch (upstreamed)
+- Dropped ejabberd-captcha.patch (upstreamed)
+- Dropped ejabberd-decrease_buffers_in_mod_proxy65.patch (upstreamed)
+- Dropped ejabberd-dynamic_compile_loglevel.patch (upstreamed)
+- Dropped ejabberd-turn_off_error_messages_in_mod_caps.patch (upstreamed)
+- Docs reorganized and added ability to rebuild them if possible
+- Added back ppc64 target
+- SQL-scripts moved to %%{_datadir}/%%{name} from %%doc
+
 * Thu Nov  5 2009 Peter Lemenkov <lemenkov at gmail.com> 2.0.5-10
 - mod_ctlextra was updated from r873 to r1020
 - Fix for BZ# 533021


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-12/import.log,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- import.log	5 Nov 2009 13:41:37 -0000	1.14
+++ import.log	21 Nov 2009 08:02:52 -0000	1.15
@@ -12,3 +12,4 @@ ejabberd-2_0_5-3_fc10:HEAD:ejabberd-2.0.
 ejabberd-2_0_5-6_fc11:HEAD:ejabberd-2.0.5-6.fc11.src.rpm:1251228870
 ejabberd-2_0_5-8_fc11:HEAD:ejabberd-2.0.5-8.fc11.src.rpm:1252493017
 ejabberd-2_0_5-10_fc11:F-12:ejabberd-2.0.5-10.fc11.src.rpm:1257428464
+ejabberd-2_1_0-1_fc12:F-12:ejabberd-2.1.0-1.fc12.src.rpm:1258790540


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ejabberd/F-12/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- sources	3 Apr 2009 20:09:33 -0000	1.16
+++ sources	21 Nov 2009 08:02:52 -0000	1.17
@@ -1 +1 @@
-2d85b47df969daf0a78ed3b16562d731  ejabberd-2.0.5.tar.gz
+373be6e99acf7c930ab85531489c63c4  ejabberd-2.1.0.tar.gz


--- ejabberd-build.patch DELETED ---


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


--- ejabberd-decrease_buffers_in_mod_proxy65.patch DELETED ---


--- ejabberd-dynamic_compile_loglevel.patch DELETED ---


--- ejabberd-turn_off_error_messages_in_mod_caps.patch DELETED ---


