SPECS: jabberd.spec - updated to 2.1.23, cleanups with avatars (th...

[djrzulf]

Author: djrzulf                      Date: Sat Feb 16 22:04:57 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated to 2.1.23, cleanups with avatars (there are already at vcard
  by default), PROTOCOL file disappeard,

---- Files affected:
SPECS:
   jabberd.spec (1.103 -> 1.104) 

---- Diffs:

================================================================
Index: SPECS/jabberd.spec
diff -u SPECS/jabberd.spec:1.103 SPECS/jabberd.spec:1.104
--- SPECS/jabberd.spec:1.103	Sat Jan 26 20:07:28 2008
+++ SPECS/jabberd.spec	Sat Feb 16 23:04:52 2008
@@ -10,18 +10,17 @@
 # and allows offline storage (queuing) of subscription requests and/or messages
 # to be disabled
 %bcond_with	bxmpp	# - patches c2s to allow connections from Flash clients which don't use proper XMPP
-%bcond_with	avatars	# - add support to storage avatars (obsolete)
 
 %include	/usr/lib/rpm/macros.perl
 Summary:	Jabber/XMPP server
 Summary(pl.UTF-8):	Serwer Jabber/XMPP
 Name:		jabberd
-Version:	2.1.22
+Version:	2.1.23
 Release:	1
 License:	GPL
 Group:		Applications/Communications
 Source0:	http://ftp.xiaoka.com/jabberd2/releases/%{name}-%{version}.tar.bz2
-# Source0-md5:	16e2e5b8732352b12d691c67b84eebad
+# Source0-md5:	f556a1645a993c837738025077e1961f
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
 Source3:	db-setup.sqlite
@@ -33,10 +32,6 @@
 Patch6:		%{name}-reconnect.patch
 #bcond bxmpp
 Patch22:	http://www.marquard.net/jabber/patches/patch-flash-v2
-# avatars
-#http://j2.openaether.org/bugzilla/attachment.cgi?id=23&action=diff&context=patch&collapsed=&headers=1&format=raw
-Patch25:	%{name}-mod_iq_vcard.patch
-Patch26:	%{name}-avatars.patch
 URL:		http://jabberd.jabberstudio.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -83,11 +78,6 @@
 
 install %{SOURCE3} tools/
 
-%if %{with avatars}
-%patch25 -p1
-%patch26 -p1
-%endif
-
 %build
 #http://j2.openaether.org/bugzilla/show_bug.cgi?id=17
 %{__libtoolize}
@@ -151,7 +141,7 @@
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS PROTOCOL README TODO %{?with_avatars:AVATARS}
+%doc AUTHORS ChangeLog NEWS README TODO
 %doc tools/{migrate.pl,db-setup.mysql,db-setup.pgsql,%{?with_sqlite:db-setup.sqlite,}pipe-auth.pl}
 %attr(640,root,jabber) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/jabber/*.cfg
 %attr(640,root,jabber) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/jabber/*.xml
@@ -172,6 +162,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.104  2008-02-16 22:04:52  djrzulf
+- updated to 2.1.23, cleanups with avatars (there are already at vcard
+  by default), PROTOCOL file disappeard,
+
 Revision 1.103  2008-01-26 19:07:28  dzeus
 - rel. 1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/jabberd.spec?r1=1.103&r2=1.104&f=u