[iptables: 2/2] - added fixrestore patch submitted to upstream by fryasu (nfbz#774) (RHBZ#825796)

[Thomas Woerner]

commit 0645ca64a7c4b1c4f6008d9f9ef0e3b5fc17979b
Merge: 243a920 3670a98
Author: Thomas Woerner <twoerner at redhat.com>
Date:   Wed Jul 18 16:17:58 2012 +0200

    - added fixrestore patch submitted to upstream by fryasu (nfbz#774)
      (RHBZ#825796)
    
    Merge commit '3670a98a72eedbbc76cfcab606b27da7094f7488'
    
    Conflicts:
    	iptables.spec

 iptables-1.4.12-fixresore.patch |   28 ++++++++++++++++++++++++++++
 iptables.spec                   |    8 +++++++-
 2 files changed, 35 insertions(+), 1 deletions(-)
---
diff --cc iptables.spec
index 4500b89,2d57361..f5cb397
--- a/iptables.spec
+++ b/iptables.spec
@@@ -22,7 -22,7 +22,7 @@@
  Name: iptables
  Summary: Tools for managing Linux kernel packet filtering capabilities
  Version: 1.4.14
--Release: 2%{?dist}
++Release: 3%{?dist}
  Source: http://www.netfilter.org/projects/iptables/files/%{name}-%{version}.tar.bz2
  Source1: iptables.init
  Source2: iptables-config
@@@ -240,9 -246,10 +242,13 @@@ f
  %{_libdir}/pkgconfig/xtables.pc
  
  %changelog
 -* Wed Jul 18 2012 Thomas Woerner <twoerner at redhat.com> 1.4.14-2
++* Wed Jul 18 2012 Thomas Woerner <twoerner at redhat.com> 1.4.14-3
+ - added fixrestore patch submitted to upstream by fryasu (nfbz#774) 
+   (RHBZ#825796)
+ 
 +* Wed Jul 18 2012 Thomas Woerner <twoerner at redhat.com> 1.4.14-2
 +- disabled libipq, removed upstream, not provided by kernel anymore
 +
  * Wed Jul 18 2012 Thomas Woerner <twoerner at redhat.com> 1.4.14-1
  - new version 1.4.14
    - extensions: add IPv6 capable ECN match extension