[balsa/f13/master: 4/4] Merge branch 'master' into f13

[Pawel Salek]

commit fbab209d78ed1efd656d791bf04adad94fdf4e85
Merge: ad9c4c2 60fa822
Author: Pawel Salek <salek at kth.se>
Date:   Thu Aug 26 22:05:54 2010 +0200

    Merge branch 'master' into f13

 .gitignore |    6 ++++--
 balsa.spec |   11 ++++++-----
 sources    |    4 ++--
 3 files changed, 12 insertions(+), 9 deletions(-)
---
diff --cc .gitignore
index f5d7f9c,f69d8ca..d9149ad
--- a/.gitignore
+++ b/.gitignore
@@@ -1,2 -1,3 +1,4 @@@
--balsa-2.4.7.tar.bz2
- balsa-gmime-2.5-port-1.patch
+ balsa-gmime-2.5-port.patch
+ balsa-2.4.8.tar.bz2
++/balsa-2.4.8.tar.bz2
++/balsa-gmime-2.5-port.patch
diff --cc balsa.spec
index e43cb85,947dee5..9fee27e
--- a/balsa.spec
+++ b/balsa.spec
@@@ -1,8 -1,8 +1,8 @@@
 -%define config_opts --prefix=%{_prefix} --sysconfdir=%{_sysconfdir} --mandir=%{_mandir} --libdir=%{_libdir} --bindir=%{_bindir} --includedir=%{_includedir} --datadir=%{_datadir} --disable-more-warnings --with-ssl --with-gss --with-gtkspell  --with-unique --with-gmime=2.6
 +%define config_opts --prefix=%{_prefix} --sysconfdir=%{_sysconfdir} --mandir=%{_mandir} --libdir=%{_libdir} --bindir=%{_bindir} --includedir=%{_includedir} --datadir=%{_datadir} --disable-more-warnings --with-ssl --with-gss --with-gtkspell --with-gpgme --with-unique --with-gmime=2.6
  
  Name:           balsa
- Version:        2.4.7
- Release:        2%{?dist}
+ Version:        2.4.8
+ Release:        1%{?dist}
  Summary:        Mail Client
  
  Group:          Applications/Internet
@@@ -108,8 -106,11 +106,11 @@@ f
  
  
  %changelog
+ * Sat Aug 21 2010 Pawel Salek <salek at kth.se> - 2.4.8-1
+ - update to upstream 2.4.8
+ 
  * Sat Feb 20 2010 Pawel Salek <salek at kth.se> - 2.4.7-2
 -- add a partial gmime-2.5.1 port patch, remove gpgme support for now.
 +- add a gmime-2.5.1 port patch with gpgme support.
  
  * Mon Feb  13 2010 Pawel Salek <salek at kth.se> - 2.4.7-1
  - update to upstream 2.4.7
diff --cc sources
index e999806,f5785cd..374baa4
--- a/sources
+++ b/sources
@@@ -1,2 -1,1 +1,2 @@@
- fb9597446dfe8adcfae4a0928da336f7  balsa-2.4.7.tar.bz2
- cf35e6a6a52d3123905dd42e3bdca245  balsa-gmime-2.5-port-1.patch
+ 4345e440ae5faf2787f5cc324fcb234a  balsa-2.4.8.tar.bz2
++74a0c1374f6f594597acc78a8c897a76  balsa-gmime-2.5-port.patch