[claws-mail-plugins: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/claws-mail-plugins

[Andreas Bierfert]

commit 3836d65f46f03b46ff09da00d97abef42af57295
Merge: a2a5dd3 2f530dd
Author: Andreas Bierfert <andreas.bierfert at lowlatency.de>
Date:   Thu Jul 5 22:39:53 2012 +0200

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/claws-mail-plugins
    
    Conflicts:
    	claws-mail-plugins.spec

 claws-mail-plugins.spec |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)
---
diff --cc claws-mail-plugins.spec
index fe0a301,9b49737..c4a5fe0
--- a/claws-mail-plugins.spec
+++ b/claws-mail-plugins.spec
@@@ -817,11 -792,20 +817,25 @@@ find ${RPM_BUILD_ROOT} -type f -name "*
  %{_libdir}/claws-mail/plugins/vcalendar*
  
  %changelog
 +* Thu Jul 05 2012 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 +- 3.8.1-1
 +- version upgrade
 +- add subpackage for -pdf-viewer plugin
 +
+ * Fri Jun 08 2012 Petr Pisar <ppisar at redhat.com> - 3.8.0-5
+ - Perl 5.16 rebuild
+ 
+ * Thu Jan 26 2012 Tomas Bzatek <tbzatek at redhat.com> - 3.8.0-4
+ - Rebuilt for new libarchive
+ 
+ * Sun Jan 22 2012 Michael Schwendt <mschwendt at fedoraproject.org>
+ - 3.8.0-3
+ - adjust claws-mail-devel Requires to '>= %%version' and be arch-specific
+   (so claws-mail %%release can differ from claws-mail-plugins %%release)
+ 
+ * Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.8.0-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
  * Thu Dec 29 2011 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
  - 3.8.0-1
  - version upgrade