[jabberd/f14/master: 8/8] Merge branch 'master' into f14

[Adrian Reber]

commit adcb913efb986d8cadceb19818248248063e01b5
Merge: c76aff3 412d1f3
Author: Adrian Reber <adrian at lisas.de>
Date:   Wed Jan 5 22:08:39 2011 +0100

    Merge branch 'master' into f14
    
    Conflicts:
    	.gitignore
    	jabberd.spec

 .gitignore   |    1 -
 jabberd.spec |   20 ++++++++++++++++----
 2 files changed, 16 insertions(+), 5 deletions(-)
---
diff --cc .gitignore
index b47ab65,f0988ca..f37f6a2
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,2 +1,1 @@@
--jabberd-2.2.8.tar.bz2
 -/jabberd-2.2.11.tar.bz2
 +jabberd-2.2.11.tar.bz2
diff --cc jabberd.spec
index c2e1d34,f1c617d..e5fdc5b
--- a/jabberd.spec
+++ b/jabberd.spec
@@@ -197,15 -197,22 +197,27 @@@ f
  %attr(700, jabber, jabber) %{_var}/lib/%{name}
  
  %changelog
+ * Wed Jan 05 2011 Adrian Reber <adrian at lisas.de> - 2.2.11-5
+ - ported spec changes from f14 branch to devel branch
+ 
+ * Wed Jan 05 2011 Adrian Reber <adrian at lisas.de> - 2.2.11-4
+ - fix "jabberd spec file puts server.pem in /etc instead of /etc/jabberd" (#667504)
+ 
 +* Tue Nov 09 2010 Dominic Hopf <dmaphy at fedoraproject.org> - 2.2.11-3
 +- re-add the server.pem ghost as %%config(noreplace) to prevent the
 +  file from being deleted when updating to this package
 +- fix permissions for directories and files under /var/lib/jabberd
 +
- * Wed Oct 06 2010 Dominic Hopf <dmaphy at fedoraproject.org> - 2.2.11-2
- - new upstream release jabberd 2.2.11
+ * Wed Sep 29 2010 jkeating - 2.2.11-2
+ - Rebuilt for gcc bug 634757
+ 
+ * Sun Sep 12 2010 Dominic Hopf <dmaphy at fedoraproject.org> - 2.2.11-1
+ - new upstream release
  - fix script-without-shebang errors
  - preserve timestamp of ChangeLog while converting to UTF8
+ 
+ * Thu Aug 12 2010 Dominic Hopf <dmaphy at fedoraproject.org> - 2.2.10-1
+ - new upstream release jabberd 2.2.10
  - add patch jabberd-fix-missing-reference-in-log_error.patch from upstream svn
  - use %%{_mandir} macro for manpages
  - create a new source file for the PAM info instead of writing it on the fly