[devhelp/f14/master] 2.31.6

[Matthias Clasen]

commit ee335a5d62aa58e03158c0dcc6b87423e55536d7
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Sat Aug 7 00:43:45 2010 -0400

    2.31.6

 .gitignore   |    1 +
 devhelp.spec |   23 ++++++++++++-----------
 sources      |    2 +-
 3 files changed, 14 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 41f92fe..7f2b857 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 devhelp-2.90.5.tar.bz2
+devhelp-2.31.6.tar.bz2
diff --git a/devhelp.spec b/devhelp.spec
index 49b6b4d..fa1b32d 100644
--- a/devhelp.spec
+++ b/devhelp.spec
@@ -1,19 +1,19 @@
 # Last updated for 0.22
-%define gtk_version 2.90.0
+%define gtk_version 2.20
 %define libwnck_version 2.10.0
 
 ### Abstract ###
 
 Name: devhelp
-Version: 2.90.5
-Release: 3%{?dist}
+Version: 2.31.6
+Release: 1%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: Development/Tools
 Summary: API documention browser
 URL: http://developer.imendio.com/projects/devhelp
 #VCS: git:git://git.gnome.org/devhelp
-Source: http://download.gnome.org/sources/devhelp/2.90/devhelp-%{version}.tar.bz2
+Source: http://download.gnome.org/sources/devhelp/2.31/devhelp-%{version}.tar.bz2
 
 # upstream fix
 Patch0: devhelp-gtk3.patch
@@ -29,10 +29,10 @@ Requires(post): GConf2 >= 2.14
 BuildRequires: desktop-file-utils >= 0.3
 BuildRequires: gettext
 BuildRequires: intltool
-BuildRequires: gtk3-devel
-BuildRequires: webkitgtk3-devel
+BuildRequires: gtk2-devel
+BuildRequires: webkitgtk-devel
 BuildRequires: GConf2-devel
-BuildRequires: unique3-devel
+BuildRequires: unique-devel
 BuildRequires: autoconf automake libtool
 
 %description
@@ -43,8 +43,8 @@ It works natively with API documentation generated by gtk-doc.
 Summary: Library to embed Devhelp in other applications
 Group: Development/Libraries
 Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires: gtk3-devel >= %{gtk_version}
-Requires: webkitgtk3-devel
+Requires: gtk-devel >= %{gtk_version}
+Requires: webkitgtk-devel
 
 %description devel
 Devhelp is an API documentation browser for the GNOME desktop.
@@ -141,8 +141,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 %{_libdir}/pkgconfig/*
 
 %changelog
-* Sat Aug  7 2010 Matthias Clasen <mclasen at redhat.com> - 1:2.90.5-3
-- Add epoch to stay ahead of F14
+* Sat Aug  7 2010 Matthias Clasen <mclasen at redhat.com> - 1:2.31.6-1
+- Update to 2.31.6
+- Build against gtk2 again
 
 * Wed Jul 14 2010 Matthias Clasen <mclasen at redhat.com> - 2.90.5-2
 - Fix platform check to work with GTK3
diff --git a/sources b/sources
index 0f3f518..7330588 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-258e321ee924fad0bb8cd0d908f7bf98  devhelp-2.90.5.tar.bz2
+51279587752ad280ebdc6fd7be5a9a6c  devhelp-2.31.6.tar.bz2