From 2257abe5eb1eebc82e2d5bb4fc591d19eaca9cdc Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@fedoraproject.org>
Date: Fri, 18 May 2007 11:06:59 +0000
Subject: [PATCH 1/4] Initialize branch F-7 for wise2

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

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

From 753bc43e03c4272faa970f488d7d772950fbab33 Mon Sep 17 00:00:00 2001
From: alexlan <alexlan@fedoraproject.org>
Date: Fri, 17 Aug 2007 05:51:12 +0000
Subject: [PATCH 2/4] - Clarify license as BSD and GPLv2+

---
 wise2.spec | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/wise2.spec b/wise2.spec
index 812d6f0..b4482cc 100644
--- a/wise2.spec
+++ b/wise2.spec
@@ -1,10 +1,13 @@
 Name:           wise2
 Version:        2.2.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Tools for comparison of biopolymers
 
 Group:          Applications/Engineering
-License:        GPL
+## Everything is licensed under a BSD-style license except for
+## the HMMer2 libraries and models directory which are GPLv2+
+## see LICENSE files for details. 
+License:        BSD and GPLv2+
 URL:            http://www.ebi.ac.uk/Wise2/
 Source0:        ftp://ftp.ebi.ac.uk/pub/software/unix/wise2/wise%{version}.tar.gz
 Patch0:         wise2-build.patch
@@ -72,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/profile.d/*
 
 %changelog
+* Thu Aug 16 2007 Alex Lancaster <alexl@users.sourceforge.net> 2.2.0-3
+- Clarify license as BSD and GPLv2+
+
 * Mon Apr 12 2007 Alex Lancaster <alexl@users.sourceforge.net> 2.2.0-2
 - Pass $RPM_OPT_FLAGS to compiler as per suggestion from Ralf Corsepius.
 

From 47efb58f33f0704857f2746e7728252075b101e6 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@fedoraproject.org>
Date: Thu, 26 Nov 2009 01:17:27 +0000
Subject: [PATCH 3/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 6b22444..7015d7e 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ NAME := wise2
 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 8c30e233dfa664c8d3890a848f9ffe49e6ceb857 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
Date: Thu, 29 Jul 2010 15:22:05 +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 7015d7e..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: wise2
-# $Id$
-NAME := wise2
-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 c48525c..0000000
--- a/branch
+++ /dev/null
@@ -1 +0,0 @@
-F-7