[jabberd/el6/master: 18/18] - new upstream release jabberd 2.2.11 - fix script-without-shebang errors - preserve timestamp of Ch

[Dominic Hopf]

commit b325a617d19dca5605edf5292016599cbecd7011
Merge: f81c5cc c15847e
Author: Dominic Hopf <dmaphy at fedoraproject.org>
Date:   Sun Oct 10 15:31:15 2010 +0200

    - new upstream release jabberd 2.2.11
    - fix script-without-shebang errors
    - preserve timestamp of ChangeLog while converting to UTF8
    - 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
    - install all tools provided by upstream to /usr/share/jabberd/
    - remove storage driver replacement, since 2.2.10 sqlite is the default
    - remove dependency to gc-devel
    - remove unneccessary defines for sysconfdir and don't use unneccessary macros
    - remove static libraries
    - fix a lot of rpmlint errors and warnings
    - rename file jabberd to jabberd.init to make 'fedpkg mockbuild' possible

 jabberd => jabberd.init |    0
 jabberd.pam             |    5 +
 jabberd.spec            |  271 +++++++++++++++++++++++++----------------------
 sources                 |    2 +-
 4 files changed, 151 insertions(+), 127 deletions(-)
---
diff --cc jabberd.spec
index 0d8ba9b,b5ef5fd..087d86d
--- a/jabberd.spec
+++ b/jabberd.spec
@@@ -175,23 -173,44 +173,44 @@@ if [ "$1" -eq "1" ]; the
  fi
  
  %files
- %defattr(-,root,root)
- %doc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
+ %defattr(-,root,root,-)
+ %doc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO UPGRADE
+ %{_mandir}/man8/*
  %{_bindir}/*
  %{_libdir}/%{name}/
- %attr(750, jabber, jabber) %dir %{sysconfdir}/
- %attr(640, jabber, jabber) %config(noreplace) %{sysconfdir}/*xml*
- %attr(750, jabber, jabber) %dir %{sysconfdir}/templates
- %attr(640, jabber, jabber) %config(noreplace) %{sysconfdir}/templates/*xml*
- %{_datadir}/man/man8/*
- %{_datadir}/%{name}/
+ %attr(750, jabber, jabber) %dir %{_sysconfdir}/%{name}
+ %attr(750, jabber, jabber) %dir %{_sysconfdir}/%{name}/templates
+ %attr(640, jabber, jabber) %config(noreplace) %{_sysconfdir}/%{name}/*xml*
+ %attr(640, jabber, jabber) %config(noreplace) %{_sysconfdir}/%{name}/templates/*xml*
+ %dir %{_datadir}/%{name}/
+ %attr(644,root,root) %{_datadir}/%{name}/*
+ %attr(755,root,root) %{_datadir}/%{name}/*.pl
+ %attr(755,root,root) %{_datadir}/%{name}/*.rb
+ %attr(755,root,root) %{_datadir}/%{name}/%{name}
  %{_initrddir}/%{name}
- %config(noreplace) %{_sysconfdir}/pam.d/jabberd
- %config %{_sysconfdir}/sysconfig/jabberd
- %attr(-, jabber, jabber) %{_var}/lib/jabberd
- %ghost %{_sysconfdir}/jabberd/server.pem
+ %config(noreplace) %{_sysconfdir}/pam.d/%{name}
+ %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
+ %attr(755, jabber, jabber) %{_var}/lib/%{name}
  
  %changelog
 -* Wed Oct 06 2010 Dominic Hopf <dmaphy at fedoraproject.org> - 2.2.11-1
++* Sun Oct 10 2010 Dominic Hopf <dmaphy at fedoraproject.org> - 2.2.11-1
+ - new upstream release jabberd 2.2.11
+ - fix script-without-shebang errors
+ - preserve timestamp of ChangeLog while converting to UTF8
+ - 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
+ - install all tools provided by upstream to /usr/share/jabberd/
+ - remove storage driver replacement, since 2.2.10 sqlite is the default
+ - remove dependency to gc-devel
+ - remove unneccessary defines for sysconfdir and don't use unneccessary macros
+ - remove static libraries
+ - fix a lot of rpmlint errors and warnings
+ - rename file jabberd to jabberd.init to make 'fedpkg mockbuild' possible
+ 
+ * Wed Sep 29 2010 jkeating - 2.2.8-5.1
+ - Rebuilt for gcc bug 634757
+ 
  * Wed Sep 16 2009 Tomas Mraz <tmraz at redhat.com> - 2.2.8-5
  - use password-auth common PAM configuration instead of system-auth