[links: 2/2] Rebase to latest upstream 2.6(#751354, apply IPv6 support patch, removed nss patch (already included

[Ondrej Vasik]

commit 18543b918c71d5ec5ffee87b5f41df5830367867
Merge: 055b527 144e2bc
Author: Ondřej Vašík <ovasik at redhat.com>
Date:   Fri Jun 8 12:14:49 2012 +0200

    Rebase to latest upstream 2.6(#751354, apply IPv6 support patch, removed nss patch (already included upstream), use openssl instead of nss again

 links.spec |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --cc links.spec
index 8f7a2ff,fd5cfb4..82296ba
--- a/links.spec
+++ b/links.spec
@@@ -1,6 -1,6 +1,5 @@@
  Name:           links
 -Version:        2.2
 -Release:        15%{?dist}
 +Version:        2.6
- Release:        1%{?dist}
  Epoch:          1
  Summary:        Web browser running in both graphics and text mode
  
@@@ -116,13 -112,9 +115,16 @@@ exit 
  
  
  %changelog
 +* Fri Jun 08 2012 Ondrej Vasik <ovasik at redhat.com> - 1:2.6-1
 +- rebase to latest upstream (#751354)
 +- apply IPv6 support patch
 +- removed nss patch(already included upstream)
 +- use openssl instead of nss again (nss upstream support has some
 +  header detection troubles)
 +
+ * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:2.2-15
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
  * Tue Dec 06 2011 Adam Jackson <ajax at redhat.com> - 1:2.2-14
  - Rebuild for new libpng