From 3f697d482539c1eb1275db66dffd691a2d0b543dec2f2b4ae419a5e0127e05f4 Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@opensuse.org>
Date: Wed, 12 Oct 2011 13:13:54 +0000
Subject: [PATCH] Accepting request 87516 from home:vuntz:branches:GNOME:Apps

Update to 2.90.6

OBS-URL: https://build.opensuse.org/request/show/87516
OBS-URL: https://build.opensuse.org/package/show/GNOME:Apps/gtranslator?expand=0&rev=29
---
 gtranslator-2.90.5.tar.bz2   |  3 ---
 gtranslator-2.90.6.tar.bz2   |  3 +++
 gtranslator-gtkspell3.patch  |  6 +++---
 gtranslator-libgda-5.0.patch |  2 +-
 gtranslator.changes          | 11 +++++++++++
 gtranslator.spec             |  6 +++---
 6 files changed, 21 insertions(+), 10 deletions(-)
 delete mode 100644 gtranslator-2.90.5.tar.bz2
 create mode 100644 gtranslator-2.90.6.tar.bz2

diff --git a/gtranslator-2.90.5.tar.bz2 b/gtranslator-2.90.5.tar.bz2
deleted file mode 100644
index 330a897..0000000
--- a/gtranslator-2.90.5.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:26425b2687f00658dd34eb5cc598d456f9e13bcc432991f455258cb0770b0505
-size 4623962
diff --git a/gtranslator-2.90.6.tar.bz2 b/gtranslator-2.90.6.tar.bz2
new file mode 100644
index 0000000..1e47eff
--- /dev/null
+++ b/gtranslator-2.90.6.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:415b7cdc891f898ecf4d2096f9dde1007eb1e802047629a68a2ad85e16a67310
+size 5191973
diff --git a/gtranslator-gtkspell3.patch b/gtranslator-gtkspell3.patch
index 0d236a1..f5ee622 100644
--- a/gtranslator-gtkspell3.patch
+++ b/gtranslator-gtkspell3.patch
@@ -5,7 +5,7 @@ diff -u -r gtranslator-2.90.5-orig/configure.ac gtranslator-2.90.5/configure.ac
  GDA_REQUIRED=4.2.3
  PEAS_REQUIRED=1.0.0
  GDICT_OPTIONAL=0.11.0
--GTKSPELL_OPTIONAL=100
+-GTKSPELL_OPTIONAL=2.0.16
 +GTKSPELL_OPTIONAL=3.0.0
  JSON_GLIB_OPTIONAL=0.12.0
  
@@ -18,12 +18,12 @@ diff -u -r gtranslator-2.90.5-orig/configure.ac gtranslator-2.90.5/configure.ac
 +dnl Check for gtkspell >= 3.0 and use it if found
  dnl -------------------------------------------------------------------
  have_gtkspell=no
- AC_ARG_WITH(gtkspell,
+ AC_ARG_WITH(gtkspell3,
 @@ -177,7 +177,7 @@
  if test x"$with_gtkspell" != "xno"
  then
          PKG_CHECK_MODULES([GTKSPELL], [
--                gtkspell-2.0 >= $GTKSPELL_OPTIONAL
+-                gtkspell3-2.0 >= $GTKSPELL_OPTIONAL
 +                gtkspell-3.0 >= $GTKSPELL_OPTIONAL
          ], have_gtkspell=yes, have_gtkspell=no)
  
diff --git a/gtranslator-libgda-5.0.patch b/gtranslator-libgda-5.0.patch
index 3c10d94..3cd9188 100644
--- a/gtranslator-libgda-5.0.patch
+++ b/gtranslator-libgda-5.0.patch
@@ -10,7 +10,7 @@ Index: gtranslator-2.90.5/configure.ac
 +GDA_REQUIRED=4.2.3
  PEAS_REQUIRED=1.0.0
  GDICT_OPTIONAL=0.11.0
- GTKSPELL_OPTIONAL=100
+ GTKSPELL_OPTIONAL=2.0.16
  JSON_GLIB_OPTIONAL=0.12.0
  
 +AC_ARG_WITH(gda,
diff --git a/gtranslator.changes b/gtranslator.changes
index 31c33a2..04c383f 100644
--- a/gtranslator.changes
+++ b/gtranslator.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Wed Oct 12 12:23:12 UTC 2011 - vuntz@opensuse.org
+
+- Update to version 2.90.6:
+  + Misc bugfixes.
+  + Updated translations.
+- Rebase gtranslator-libgda-5.0.patch and
+  gtranslator-gtkspell3.patch.
+- Change --with-gtkspell configure option to --with-gtkspell3,
+  following upstream change.
+
 -------------------------------------------------------------------
 Thu Oct  6 21:53:32 UTC 2011 - vuntz@opensuse.org
 
diff --git a/gtranslator.spec b/gtranslator.spec
index 50caebe..ddb117a 100644
--- a/gtranslator.spec
+++ b/gtranslator.spec
@@ -18,13 +18,13 @@
 
 
 Name:           gtranslator
-Version:        2.90.5
+Version:        2.90.6
 Release:        1
 License:        GPLv3+
 Summary:        A GNOME po file editor with many bells and whistles
 Url:            http://gtranslator.sourceforge.net
 Group:          Development/Tools/Other
-Source:         http://www.kabalak.net/gtranslator/download/releases/%{version}/%{name}-%{version}.tar.bz2
+Source:         http://download.gnome.org/sources/gtranslator/2.90/%{name}-%{version}.tar.bz2
 # PATCH-FIX-UPSTREAM gtranslator-libgda-5.0.patch bgo#652639 dimstar@opensuse.org -- Add support for libgda 5.0
 Patch0:         gtranslator-libgda-5.0.patch
 # PATCH-FIX-UPSTREAM gtranslator-gtkspell3.patch bgo#660709 gankov@opensuse.org -- Add support for gtkspell3
@@ -84,7 +84,7 @@ NOCONFIGURE=1 gnome-autogen.sh
 %configure \
 	--disable-static \
 	--disable-scrollkeeper \
-	--with-gtkspell \
+	--with-gtkspell3 \
 	--with-dictionary \
 	--with-gda=$(rpm -q --provides $(rpm -q --whatprovides libgda-devel) | grep "pkgconfig(libgda-[45].0)" | cut -b 18-20)
 %{__make} %{?_smp_mflags}