From 96326decc4efb9fe68986a0648f5c61903edacfc Mon Sep 17 00:00:00 2001
From: Jesse Keating <jkeating@fedoraproject.org>
Date: Tue, 29 Sep 2009 05:51:27 +0000
Subject: [PATCH 1/4] Initialize branch F-12 for pcapdiff

---
 branch | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 branch

diff --git a/branch b/branch
new file mode 100644
index 0000000..06de2d2
--- /dev/null
+++ b/branch
@@ -0,0 +1 @@
+F-12

From e9d7846106937ec64cd1ef82e1f99689151064f4 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@fedoraproject.org>
Date: Thu, 26 Nov 2009 01:49:22 +0000
Subject: [PATCH 2/4] Fix typo that causes a failure to update the common
 directory. (releng     #2781)

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 5feaa8a..bd4e836 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
 # Makefile for source rpm: pcapdiff
-# $Id$
+# $Id: Makefile,v 1.1 2007/12/07 17:01:56 kevin Exp $
 NAME := pcapdiff
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
 endef
 
 MAKEFILE_COMMON := $(shell $(find-makefile-common))

From d4c5adede55ab9ae9e4eafa02d8e47cd6d7136ee Mon Sep 17 00:00:00 2001
From: Jon Ciesla <limb@fedoraproject.org>
Date: Tue, 30 Mar 2010 20:27:02 +0000
Subject: [PATCH 3/4] Crash fix.

---
 pcapdiff.py   | 3 +--
 pcapdiff.spec | 5 ++++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pcapdiff.py b/pcapdiff.py
index 87ad9db..65b9419 100644
--- a/pcapdiff.py
+++ b/pcapdiff.py
@@ -2,5 +2,4 @@
 if __name__ == '__main__':
     import sys
     sys.path.insert(0, '/usr/share/pcapdiff')
-    from pcapdiff import main
-    main()
+    import pcapdiff
diff --git a/pcapdiff.spec b/pcapdiff.spec
index 91999ae..30e0194 100644
--- a/pcapdiff.spec
+++ b/pcapdiff.spec
@@ -1,6 +1,6 @@
 Name: pcapdiff
 Version: 0.1
-Release:  6%{?dist}
+Release:  7%{?dist}
 Summary: Compares packet captures, detects forged, dropped or mangled packets
 
 Group: Development/Languages
@@ -69,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pcapdiff/*.pyo
 
 %changelog
+* Tue Mar 20 2010 Jon Ciesla <limb@jcomserv.net> - 0.1-7
+- Fix for crash, BZ 557733.
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.1-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 

From b679a04aa802a54dcbb81193b1c100aa3743627b Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
Date: Thu, 29 Jul 2010 05:36:54 +0000
Subject: [PATCH 4/4] dist-git conversion

---
 .cvsignore => .gitignore |  0
 Makefile                 | 21 ---------------------
 branch                   |  1 -
 3 files changed, 22 deletions(-)
 rename .cvsignore => .gitignore (100%)
 delete mode 100644 Makefile
 delete mode 100644 branch

diff --git a/.cvsignore b/.gitignore
similarity index 100%
rename from .cvsignore
rename to .gitignore
diff --git a/Makefile b/Makefile
deleted file mode 100644
index bd4e836..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: pcapdiff
-# $Id: Makefile,v 1.1 2007/12/07 17:01:56 kevin Exp $
-NAME := pcapdiff
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/branch b/branch
deleted file mode 100644
index 06de2d2..0000000
--- a/branch
+++ /dev/null
@@ -1 +0,0 @@
-F-12