[tcpcopy/el6: 6/6] Merge branch 'master' into el6

[Christopher Meng]

commit 9e6253c89b008b15fe4ebcd4d7d57625904cee82
Merge: 2a11a59 4b61c74
Author: Christopher Meng <i at cicku.me>
Date:   Fri Feb 14 10:17:14 2014 +0800

    Merge branch 'master' into el6
    
    Conflicts:
    	sources
    	tcpcopy.spec

 .gitignore   |    2 ++
 sources      |    2 +-
 tcpcopy.spec |   26 ++++++++++++++------------
 3 files changed, 17 insertions(+), 13 deletions(-)
---
diff --cc tcpcopy.spec
index 3bbe908,3a61709..9253adc
--- a/tcpcopy.spec
+++ b/tcpcopy.spec
@@@ -4,9 -4,10 +4,9 @@@ Release:        1%{?dist
  Summary:        An online request replication tool
  License:        BSD
  URL:            https://github.com/wangbin579/tcpcopy
- Source0:        https://tcpcopy.googlecode.com/files/%{name}-%{version}.tar.gz
+ Source0:        https://github.com/wangbin579/tcpcopy/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
  BuildRequires:  autoconf
  BuildRequires:  automake
 -BuildRequires:  libnetfilter_queue-devel
  BuildRequires:  libtool
  Requires:       iptables