[perl-Crypt-OpenSSL-X509/el6/master: 4/4] merge from master for upstream release

[Wes Hardaker]

commit e2ce116ca83c1e37da26190ca41bb57d768c9400
Merge: ed4cf73 a72ec09
Author: Wes Hardaker <opensource(a)hardakers.net&gt;
Date:   Thu May 5 13:40:07 2011 -0700

    merge from master for upstream release

 perl-Crypt-OpenSSL-X509.spec |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)
---
diff --cc perl-Crypt-OpenSSL-X509.spec
index eaae917,168cb41..4147e4a
--- a/perl-Crypt-OpenSSL-X509.spec
+++ b/perl-Crypt-OpenSSL-X509.spec
@@@ -51,15 -47,12 +47,21 @@@ rm -rf %{buildroot
  %{_mandir}/man3/*
  
  %changelog
+ * Thu May  5 2011 Wes Hardaker <wjhns174(a)hardakers.net&gt; - 1.800.1-1
+ - Update to the upstream 1.800.1
+ 
+ * Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org&gt; -
1.6-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+ 
 +* Thu Jan 13 2011 Wes Hardaker <wjhns174(a)hardakers.net&gt; - 1.6-4
 +- reenable the patch for el6, which has a newer openssl
 +
 +* Thu Jan 13 2011 Wes Hardaker <wjhns174(a)hardakers.net&gt; - 1.6-3
 +- removed the patch that is only needed for newer versions of openssl
 +
 +* Thu Jan 13 2011 Wes Hardaker <wjhns174(a)hardakers.net&gt; - 1.6-2
 +- added missing patch
 +
  * Thu Jan 13 2011 Wes Hardaker <wjhns174(a)hardakers.net&gt; - 1.6-1
  - Updated to the upstream: 1.6