[bluefish] Update to 2.2.0

[Paul Howarth]

commit b8bf989f90e66818fdb38778b1bd4cd96e389bdd
Author: Paul Howarth <paul at city-fan.org>
Date:   Tue Nov 22 13:17:43 2011 +0000

    Update to 2.2.0
    
    - New upstream release 2.2.0
      - New "select block" feature
      - Block stack is displayed on the statusbar
      - Completely rewritten search and replace engine
      - Quickbar feature has been removed
      - Large changes internally for GTK3 compatibility
    - Drop patches, now included upstream
    - Add patch to fix build with gtk 2.22 (Gnome bug 664556)

 .gitignore                       |    2 +-
 bluefish-2.2.0-treepath.patch    |   11 +++++++++
 bluefish.spec                    |   41 ++++++++++++++++-----------------
 bluefish_bug_643150_643153.patch |   46 --------------------------------------
 fedora_bug_683497.patch          |   18 --------------
 fedora_bug_720990.patch          |   15 ------------
 sources                          |    2 +-
 7 files changed, 33 insertions(+), 102 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b52ac8f..4267115 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/bluefish-2.0.3.tar.bz2
+/bluefish-[0-9.]*.tar.bz2
diff --git a/bluefish-2.2.0-treepath.patch b/bluefish-2.2.0-treepath.patch
new file mode 100644
index 0000000..06a90fc
--- /dev/null
+++ b/bluefish-2.2.0-treepath.patch
@@ -0,0 +1,11 @@
+--- bluefish-2.2.0/src/plugin_snippets/snippetsmenu.c.orig	2011-10-26 02:11:46.000000000 +0100
++++ bluefish-2.2.0/src/plugin_snippets/snippetsmenu.c	2011-11-22 11:05:07.092508467 +0000
+@@ -21,7 +21,7 @@
+ #include "../bluefish.h"
+ #include "snippetsmenu.h"
+ 
+-#if !GTK_CHECK_VERSION(2,24,0)
++#if !GTK_CHECK_VERSION(2,22,0)
+ /* this is an ugly hack to expose the treepath internals to this widget */
+ /*typedef struct {
+ 	gint depth;
diff --git a/bluefish.spec b/bluefish.spec
index 74c20e3..80d3928 100644
--- a/bluefish.spec
+++ b/bluefish.spec
@@ -1,6 +1,6 @@
-%global pkgver 2.0.3
+%global pkgver 2.2.0
 #global prerel rc2
-%global rpmrel 4
+%global rpmrel 1
 
 Name:		bluefish
 Version:	%{pkgver}
@@ -10,17 +10,18 @@ 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_bug_643150_643153.patch
-Patch1:		fedora_bug_683497.patch
-Patch2:		fedora_bug_720990.patch
+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
 BuildRequires:	gettext
 BuildRequires:	glib2-devel >= 2.16
-BuildRequires:	gtk2-devel >= 2.12
 %if 0%{?fedora} < 15
+BuildRequires:	gtk2-devel >= 2.12
 BuildRequires:	gucharmap-devel >= 2.20
+%else
+BuildRequires:	gtk3-devel
+BuildRequires:	gucharmap-devel >= 2.90
 %endif
 BuildRequires:	intltool
 BuildRequires:	libxml2-devel
@@ -68,21 +69,9 @@ Files common to every architecture version of %{name}.
 %prep
 %setup -q -n %{name}-%{version}%{?prerel:-%{prerel}}
 
-# A bug in 2.0.3 prevents turning off the highlighting of block delimiters.
-# https://bugzilla.gnome.org/show_bug.cgi?id=643150
-# https://bugzilla.gnome.org/show_bug.cgi?id=643153
-# https://bugzilla.redhat.com/show_bug.cgi?id=680626
-%patch0 -p0
-
-# Workaround for a crash-on-close bug
-# https://bugzilla.gnome.org/show_bug.cgi?id=637990
-# https://bugzilla.redhat.com/show_bug.cgi?id=683497
-%patch1 -p0
-
-# Fix crash in _gtk_text_btree_get_chars_changed_stamp
-# https://bugzilla.gnome.org/show_bug.cgi?id=654838
-# https://bugzilla.redhat.com/show_bug.cgi?id=720990
-%patch2 -p0
+# 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 \
@@ -160,6 +149,16 @@ fi
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Tue Nov 22 2011 Paul Howarth <paul at city-fan.org> - 2.2.0-1
+- Update to 2.2.0
+  - New "select block" feature
+  - Block stack is displayed on the statusbar
+  - Completely rewritten search and replace engine
+  - Quickbar feature has been removed
+  - Large changes internally for GTK3 compatibility
+- Drop patches, now included upstream
+- Add patch to fix build with gtk 2.22 (Gnome bug 664556)
+
 * Fri Jul 22 2011 Paul Howarth <paul at city-fan.org> - 2.0.3-4
 - Fix crash in _gtk_text_btree_get_chars_changed_stamp
   (Gnome bug 654838, #720990)
diff --git a/sources b/sources
index ab49db0..c8b8992 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4c062fcb1f90f91a35687b877d37d6dd  bluefish-2.0.3.tar.bz2
+23d894e065585d35dbc74c246c15cc9d  bluefish-2.2.0.tar.bz2