[bluefish] Update to 2.2.1

[Paul Howarth]

commit 974419900048e150aab50363988b8726b0f0aec8
Author: Paul Howarth <paul at city-fan.org>
Date:   Fri Dec 23 16:11:24 2011 +0000

    Update to 2.2.1
    
    - New upstream release 2.2.1
      - New feature: Zencoding support
      - Fix to build on Gtk+-2.22
      - Fix for PCRE regular expression searching
      - Layout fixes for Gtk+-3.2
      - Several obscure segfault fixes
      - Fix for autocompletion of variables in PHP
      - <img> dialog fixes
      - Memory-leak fixes
    - Drop patch, now included upstream
    - BR: python2-devel

 bluefish-2.2.0-treepath.patch |   11 -----------
 bluefish.spec                 |   24 +++++++++++++++++-------
 sources                       |    2 +-
 3 files changed, 18 insertions(+), 19 deletions(-)
---
diff --git a/bluefish.spec b/bluefish.spec
index 80d3928..936b493 100644
--- a/bluefish.spec
+++ b/bluefish.spec
@@ -1,4 +1,4 @@
-%global pkgver 2.2.0
+%global pkgver 2.2.1
 #global prerel rc2
 %global rpmrel 1
 
@@ -10,7 +10,6 @@ Group:		Development/Tools
 License:	GPLv3+
 URL:		http://bluefish.openoffice.nl/
 Source0:	http://www.bennewitz.com/bluefish/stable/source/bluefish-%{version}%{?prerel:-%{prerel}}.tar.bz2
-Patch0:		bluefish-2.2.0-treepath.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
 BuildRequires:	desktop-file-utils
 BuildRequires:	enchant-devel >= 1.4.2
@@ -25,6 +24,7 @@ BuildRequires:	gucharmap-devel >= 2.90
 %endif
 BuildRequires:	intltool
 BuildRequires:	libxml2-devel
+BuildRequires:	python2-devel
 # Needed to check man pages
 BuildRequires:	/usr/bin/man
 # For the Advanced Open function
@@ -69,10 +69,6 @@ Files common to every architecture version of %{name}.
 %prep
 %setup -q -n %{name}-%{version}%{?prerel:-%{prerel}}
 
-# Version check wrong in snippets menu breaks build with GTK 2.22
-# https://bugzilla.gnome.org/show_bug.cgi?id=664556
-%patch0 -p1
-
 %build
 %configure	--disable-dependency-tracking \
 		--disable-static \
@@ -93,7 +89,8 @@ make install DESTDIR=%{buildroot} INSTALL="install -p"
 %find_lang %{name}_plugin_htmlbar
 %find_lang %{name}_plugin_infbrowser
 %find_lang %{name}_plugin_snippets
-cat %{name}_plugin_{about,charmap,entities,htmlbar,infbrowser,snippets}.lang >> \
+%find_lang %{name}_plugin_zencoding
+cat %{name}_plugin_{about,charmap,entities,htmlbar,infbrowser,snippets,zencoding}.lang >> \
 	%{name}.lang
 
 desktop-file-validate \
@@ -149,6 +146,19 @@ fi
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Fri Dec 23 2011 Paul Howarth <paul at city-fan.org> - 2.2.1-1
+- Update to 2.2.1
+  - New feature: Zencoding support
+  - Fix to build on Gtk+-2.22
+  - Fix for PCRE regular expression searching
+  - Layout fixes for Gtk+-3.2
+  - Several obscure segfault fixes
+  - Fix for autocompletion of variables in PHP
+  - <img> dialog fixes
+  - Memory-leak fixes
+- Drop patch, now included upstream
+- BR: python2-devel
+
 * Tue Nov 22 2011 Paul Howarth <paul at city-fan.org> - 2.2.0-1
 - Update to 2.2.0
   - New "select block" feature
diff --git a/sources b/sources
index c8b8992..f692cf0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-23d894e065585d35dbc74c246c15cc9d  bluefish-2.2.0.tar.bz2
+991ac54a6067281017ccbced5b43f2b6  bluefish-2.2.1.tar.bz2