[httpcomponents-client: 2/2] Merge branch 'refs/heads/master' of git://pkgs.fedoraproject.org/httpcomponents-client.git

[jerboaa]

commit 25bcb434bb6a7cd993d3c5929e1c84997071c00b
Merge: 387cfa6 8e3aaf5
Author: Severin Gehwolf <sgehwolf at redhat.com>
Date:   Tue Mar 15 10:47:58 2011 -0400

    Merge branch 'refs/heads/master' of
    git://pkgs.fedoraproject.org/httpcomponents-client.git

 httpcomponents-client.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --cc httpcomponents-client.spec
index 1c6a3b1,3cce83e..cc8553a
--- a/httpcomponents-client.spec
+++ b/httpcomponents-client.spec
@@@ -3,7 -3,7 +3,7 @@@
  Name:              httpcomponents-client
  Summary:           HTTP agent implementation based on httpcomponents HttpCore
  Version:           4.1
--Release:           5%{?dist}
++Release:           6%{?dist}
  Group:             Development/Libraries
  License:           ASL 2.0
  URL:               http://hc.apache.org/
@@@ -92,10 -92,9 +92,13 @@@ cp -pr target/site/api*/* %{buildroot}%
  
  
  %changelog
- * Tue Mar 15 2011 Severin Gehwolf <sgehwolf at redhat.com> 4.1-5
++* Tue Mar 15 2011 Severin Gehwolf <sgehwolf at redhat.com> 4.1-6
 +- Explicitly set PrivatePackage to the empty set, so as to
 +  export all packages.
 +
+ * Thu Mar 10 2011 Alexander Kurtakov <akurtako at redhat.com> 4.1-5
+ - OSGi export more packages.
+ 
  * Fri Feb 25 2011 Alexander Kurtakov <akurtako at redhat.com> 4.1-4
  - Build httpmime module.