[golly] Updated revision and restored changelong entries for Perl mass rebuild.

[Eric Smith]

commit 9f719db00900323e7be63751e96df1528ddf473a
Author: Eric Smith <eric at brouhaha.com>
Date:   Tue Jul 26 02:04:22 2011 -0600

    Updated revision and restored changelong entries for Perl mass rebuild.

 golly.spec |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)
---
diff --git a/golly.spec b/golly.spec
index 21f8a12..da60393 100644
--- a/golly.spec
+++ b/golly.spec
@@ -1,6 +1,6 @@
 Name:		golly
 Version:	2.2
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Cellular automata simulator (includes Conway's Game of Life)
 Group:		Amusements/Games
 # The license for the code is GPLv2+
@@ -20,6 +20,9 @@ Source1:	http://www.argentum.freeserve.co.uk/lex_home.htm
 # patch to use %{_datadir}/%{name} for supplied files, rather than current dir
 Patch0:		golly-appdir.patch
 
+# patch for compatibility with Perl 5.14
+Patch1:		golly-2.2-perl-5.14.patch
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	wxGTK-devel
 BuildRequires:	perl-devel perl-ExtUtils-Embed
@@ -57,6 +60,7 @@ Development files for Golly celluar automata simulator.
 %prep
 %setup -q -n %{name}-%{version}-src
 %patch -P 0 -p1 -b .appdir
+%patch -P 1 -p1 -b .perl514
 
 cp %{SOURCE1} .
 
@@ -128,6 +132,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Jul 26 2011 Eric Smith <eric at brouhaha.com> 2.2-6
+- Added patch for compatibility with Perl 5.14, from Toby Corkindale.
+
 * Thu Jul 21 2011 Petr Sabata <contyk at redhat.com> - 2.2-5
 - Perl mass rebuild