From 0e86a1c8961318340b4e85df221702ea0544bb5b Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@fedoraproject.org>
Date: Tue, 2 Oct 2007 16:06:43 +0000
Subject: [PATCH 1/4] Initialize branch FC-6 for aasaver

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

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

From 57119093593dab82932173f094c48e949bdb1495 Mon Sep 17 00:00:00 2001
From: oddsocks <oddsocks@fedoraproject.org>
Date: Tue, 2 Oct 2007 19:43:29 +0000
Subject: [PATCH 2/4] *** empty log message ***

---
 aasaver.spec | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 sources      |  1 +
 2 files changed, 53 insertions(+)
 create mode 100644 aasaver.spec

diff --git a/aasaver.spec b/aasaver.spec
new file mode 100644
index 0000000..de29b38
--- /dev/null
+++ b/aasaver.spec
@@ -0,0 +1,52 @@
+Name:           aasaver
+Version:        0.3.2
+Release:        1%{?dist}
+Summary:        A screensaver for KDE which presents an ASCII aquarium
+Group:          Amusements/Graphics
+License:        GPLv2+
+URL:            http://www.kde-apps.org/content/show.php/KDE+Asciiquarium?content=29207
+# Actual source URL is:
+# http://www.kde-apps.org/content/download.php?content=29207
+Source0:        29207-%{name}-%{version}.tar.bz2
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:  kdebase-devel
+BuildRequires:  scons
+Requires:       xscreensaver-base
+
+%description
+KDE Asciiquarium is a KDE screensaver based on Kirk Baucom's fabulous
+asciiquarium program (http://www.robobunny.com/projects/asciiquarium/). It's a
+simulation of an animated ocean scene using ASCII art.
+
+
+%prep
+%setup -q
+sed -i 's|rpath||' SConstruct
+
+
+%build
+export CFLAGS="%{optflags}"
+# Not a true configure script
+./configure
+make %{?_smp_mflags}
+
+
+%install
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}/usr
+
+
+%clean
+rm -rf %{buildroot}
+
+
+%files
+%defattr(-,root,root,-)
+%{_bindir}/asciiquarium.kss
+%{_datadir}/applnk/System/ScreenSavers/asciiquarium.desktop
+%config(noreplace) %{_datadir}/config.kcfg/asciiquarium.kcfg
+
+
+%changelog
+* Sun Sep 30 2007 Ian Chapman <packages[AT]amiga-hardware.com> 0.3.2-1
+- Initial release
\ No newline at end of file
diff --git a/sources b/sources
index e69de29..63a6ae7 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+dfc6780c196883f25ec01b4663dfaca3  29207-aasaver-0.3.2.tar.bz2

From e6ccaae4c7bc63c3e6cff19106f05f7394a315ec Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@fedoraproject.org>
Date: Thu, 26 Nov 2009 01:24:06 +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 e1f947c..356a633 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ NAME := aasaver
 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 7c5f6dbc8d63b6b59a4c791c4010163e6af29fb1 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
Date: Wed, 28 Jul 2010 09:30:10 +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 356a633..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: aasaver
-# $Id$
-NAME := aasaver
-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 d5b6362..0000000
--- a/branch
+++ /dev/null
@@ -1 +0,0 @@
-FC-6