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

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 45d6ab2..d69645a 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ NAME := dissy
 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 568fff11c14fe7b662eb95c6bde25e9357c22a10 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <ausil@fedoraproject.org>
Date: Sat, 8 May 2010 01:47:10 +0000
Subject: [PATCH 2/4] Initialize branch EL-6 for dissy

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

diff --git a/branch b/branch
new file mode 100644
index 0000000..46381b9
--- /dev/null
+++ b/branch
@@ -0,0 +1 @@
+EL-6

From 62c3e1254889cf07ebcce145f64411cf1ef26f1f Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak@fedoraproject.org>
Date: Thu, 8 Jul 2010 22:23:17 +0000
Subject: [PATCH 3/4] - Package egg info in RHEL 6

---
 dissy.spec | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/dissy.spec b/dissy.spec
index d7f440b..eb93b4b 100644
--- a/dissy.spec
+++ b/dissy.spec
@@ -2,7 +2,7 @@
 
 Name:           dissy
 Version:        8
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Graphical frontend to the objdump disassembler
 
 Group:          Development/Tools
@@ -66,10 +66,16 @@ rm -rf $RPM_BUILD_ROOT
 %if 0%{?fedora} > 8
 %{python_sitelib}/*.egg-info
 %endif
+%if 0%{?rhel} > 5
+%{python_sitelib}/*.egg-info
+%endif
 %doc COPYING README
 
 
 %changelog
+* Fri Jul 09 2010 Lubomir Rintel <lkundrak@v3.sk> - 8-5
+- Package egg info in RHEL 6
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 8-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 

From 5438306408dd4103817d395eb937ef14fc36c919 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
Date: Wed, 28 Jul 2010 13:03:18 +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 d69645a..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: dissy
-# $Id$
-NAME := dissy
-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 46381b9..0000000
--- a/branch
+++ /dev/null
@@ -1 +0,0 @@
-EL-6