Crash fix.

Fix typo that causes a failure to update the common directory. (releng
#2781)
2010-03-30 20:27:02 +00:00 · 2009-11-26 01:49:22 +00:00 · 2009-09-29 05:51:27 +00:00
4 changed files with 8 additions and 5 deletions
--- a/4
+++ b/4
@ -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))
--- a/1
+++ b/1
@ -0,0 +1 @@
+F-12
--- 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
--- 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
Author	SHA1	Message	Date
Jon Ciesla	d4c5adede5	Crash fix.	2010-03-30 20:27:02 +00:00
Bill Nottingham	e9d7846106	Fix typo that causes a failure to update the common directory. (releng #2781)	2009-11-26 01:49:22 +00:00
Jesse Keating	96326decc4	Initialize branch F-12 for pcapdiff	2009-09-29 05:51:27 +00:00