[vpnc/f19: 8/8] Merge branch 'f20' into f19

[Paul Wouters]

commit a54659c8a283a010de557e99993bbc7f5b9dd6ab
Merge: f2ffcc7 82b8815
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Feb 25 13:04:31 2014 -0500

    Merge branch 'f20' into f19
    
    Conflicts:
    	vpnc.spec

 vpnc-script |   21 +++++++++++++++++++++
 vpnc.spec   |    5 ++++-
 2 files changed, 25 insertions(+), 1 deletions(-)
---
diff --cc vpnc.spec
index afdb8a3,2a9c27f..e751171
--- a/vpnc.spec
+++ b/vpnc.spec
@@@ -2,7 -2,7 +2,7 @@@
  
  Name:		vpnc
  Version:	0.5.3
- Release:	18%{snapshot}%{?dist}
 -Release:	20%{snapshot}%{?dist}
++Release:	19%{snapshot}%{?dist}
  
  Summary:	IPSec VPN client compatible with Cisco equipment
  
@@@ -120,9 -119,15 +120,12 @@@ install -d -m 0755 %{buildroot}%{_local
  %config(noreplace) %{_sysconfdir}/vpnc/vpnc-script
  
  %changelog
 -* Fri Nov 15 2013 Paul Wouters <pwouters at redhat.com> - 0.5.3-20.svn457
++* Fri Nov 15 2013 Paul Wouters <pwouters at redhat.com> - 0.5.3-19.svn457
+ - Actually patch the vpnc-script we ship with the unbound patch
+ 
 -* Mon Sep 23 2013 Paul Wouters <pwouters at redhat.com> - 0.5.3-19.svn457
 +* Mon Sep 23 2013 Paul Wouters <pwouters at redhat.com> - 0.5.3-18.svn457
  - Add support for dynamically reconfiguring unbound DNS (rhbz#865092)
  
 -* Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.3-18.svn457
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 -
  * Thu Mar  7 2013 Tomáš Mráz <tmraz at redhat.com> - 0.5.3-17.svn457
  - Make it build
  - Remove vpnc-cleanup upstart configuration file