[gtkwave] Update to 3.3.21

[Paul Howarth]

commit 187899cd0bf1718c7095fc9c2585d513994e4377
Author: Paul Howarth <paul at city-fan.org>
Date:   Sat Apr 30 17:47:46 2011 +0100

    Update to 3.3.21
    
    - New upstream release 3.3.21
      - fixed crash in LXT2 reader on malformed files (#690920)
      - fixed reload crash when -o flag used on non-VCD files (#695444)
    - Drop patch now included in upstream release

 .gitignore                    |    6 +++---
 gtkwave-3.3.20-bz690920.patch |   35 -----------------------------------
 gtkwave.spec                  |   14 ++++++++------
 sources                       |    6 +++---
 4 files changed, 14 insertions(+), 47 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0ad5db2..8c4b8f7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-/gtkwave-3.3.20.tar.gz
-/gtkwave-48.png
-/gtkwave-32.png
+/gtkwave-3.3.21.tar.gz
 /gtkwave-16.png
+/gtkwave-32.png
+/gtkwave-48.png
diff --git a/gtkwave.spec b/gtkwave.spec
index fadcf8f..5a5dd24 100644
--- a/gtkwave.spec
+++ b/gtkwave.spec
@@ -5,13 +5,12 @@
 
 Summary:	Waveform Viewer
 Name:		gtkwave
-Version:	3.3.20
-Release:	%{?prerel:0.}2%{?prerel:.%{prerel}}%{?dist}
+Version:	3.3.21
+Release:	%{?prerel:0.}1%{?prerel:.%{prerel}}%{?dist}
 License:	GPLv2+
 Group:		Applications/Engineering
 URL:		http://gtkwave.sourceforge.net/
 Source0:	http://gtkwave.sourceforge.net/gtkwave-%{version}%{?prerel}.tar.gz
-Patch0:		gtkwave-3.3.20-bz690920.patch
 Source1:	gtkwave.desktop
 Source2:	gtkwave-16.png
 Source3:	gtkwave-32.png
@@ -36,9 +35,6 @@ tools.
 %setup -q -n gtkwave-%{version}%{?prerel}
 cp -p .gtkwaverc gtkwaverc.sample
 
-# Tentative upstream fix for crash when reading malformed LXT file (#690920)
-%patch0 -p1
-
 %build
 %{configure} --disable-dependency-tracking \
 %if 0%{?fedora} < 2 && 0%{?rhel} < 4
@@ -134,6 +130,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_mandir}/man5/gtkwaverc.5*
 
 %changelog
+* Sat Apr 30 2011 Paul Howarth <paul at city-fan.org> 3.3.21-1
+- update to 3.3.21
+  - fixed crash in LXT2 reader on malformed files (#690920)
+  - fixed reload crash when -o flag used on non-VCD files (#695444)
+- drop patch now included in upstream release
+
 * Tue Mar 29 2011 Paul Howarth <paul at city-fan.org> 3.3.20-2
 - tentative upstream fix for crash when reading malformed LXT file (#690920)
 - nobody else likes macros for commands
diff --git a/sources b/sources
index 94330ff..26a858a 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-91f35ce56817b1a0b37a904be4e5f021  gtkwave-3.3.20.tar.gz
-4fdb2fec2b6d9732e2f111c6cd63b788  gtkwave-48.png
-410c50539074403d3a3240f7c9209b11  gtkwave-32.png
+ae3a99a2304f45703471629c7b614ef6  gtkwave-3.3.21.tar.gz
 2cc7754492918591242bc38a0b11d2a5  gtkwave-16.png
+410c50539074403d3a3240f7c9209b11  gtkwave-32.png
+4fdb2fec2b6d9732e2f111c6cd63b788  gtkwave-48.png