From bc3aa1e60b3de5705bb670d4a87f6878953e6563 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Mon, 25 Apr 2011 22:56:03 -0400
Subject: [PATCH 1/2] sync with f15

---
 .gitignore | 1 +
 sources    | 2 +-
 yelp.spec  | 7 +++++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index ce0beb6..3673e5d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ yelp-2.31.7.tar.bz2
 /yelp-2.91.92.tar.bz2
 /yelp-3.0.0.tar.bz2
 /yelp-3.0.1.tar.bz2
+/yelp-3.0.2.tar.bz2
diff --git a/sources b/sources
index 78c0c88..4e26ccd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-21d03731080acdb039dddc1937396cbb  yelp-3.0.1.tar.bz2
+4ea6e6ae2fdff0d3768201e980a4ea27  yelp-3.0.2.tar.bz2
diff --git a/yelp.spec b/yelp.spec
index 8558f7b..50ad2de 100644
--- a/yelp.spec
+++ b/yelp.spec
@@ -1,7 +1,7 @@
 Summary: Help browser for the GNOME desktop
 Name: yelp
 Epoch: 1
-Version: 3.0.1
+Version: 3.0.2
 Release: 1%{?dist}
 #VCS: git:git://git.gnome.org/yelp
 Source: http://download.gnome.org/sources/yelp/3.0/%{name}-%{version}.tar.bz2
@@ -19,7 +19,7 @@ BuildRequires: libxml2-devel >= 2.6.5
 BuildRequires: libxslt-devel >= 1.1.4
 BuildRequires: webkitgtk3-devel
 BuildRequires: desktop-file-utils
-BuildRequires: yelp-xsl-devel >= 2.31.3
+BuildRequires: yelp-xsl-devel >= 3.0.1
 BuildRequires: xz-devel
 BuildRequires: bzip2-devel
 BuildRequires: gettext-devel
@@ -116,6 +116,9 @@ gtk-update-icon-cache %{_datadir}icons/hicolor &> /dev/null || :
 
 
 %changelog
+* Mon Apr 25 2011 Matthias Clasen <mclasen@redhat.com> 1:3.0.2-1
+- Update to 3.0.2
+
 * Sun Apr 10 2011 Christopher Aillon <caillon@redhat.com> 1:3.0.1-1
 - Update to 3.0.1
 

From 6e2e4db6cbab200ffe20fe825f78396bf5c035e9 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Thu, 28 Apr 2011 07:41:47 -0400
Subject: [PATCH 2/2] Fix untranslated strings

---
 yelp-gettext.patch | 15 +++++++++++++++
 yelp.spec          | 10 +++++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 yelp-gettext.patch

diff --git a/yelp-gettext.patch b/yelp-gettext.patch
new file mode 100644
index 0000000..916da8a
--- /dev/null
+++ b/yelp-gettext.patch
@@ -0,0 +1,15 @@
+diff -up yelp-3.0.2/src/yelp.c.gettext yelp-3.0.2/src/yelp.c
+--- yelp-3.0.2/src/yelp.c.gettext	2011-04-28 07:38:27.792883667 -0400
++++ yelp-3.0.2/src/yelp.c	2011-04-28 07:37:51.174341461 -0400
+@@ -40,6 +40,11 @@ main (int argc, char **argv) 
+     g_thread_init (NULL);
+     g_type_init ();
+ 
++    setlocale (LC_ALL, "");
++    textdomain (GETTEXT_PACKAGE);
++    bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
++    bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
++
+     app = yelp_application_new ();
+ 
+     return g_application_run (G_APPLICATION (app), argc, argv);
diff --git a/yelp.spec b/yelp.spec
index 50ad2de..f7997ad 100644
--- a/yelp.spec
+++ b/yelp.spec
@@ -2,9 +2,13 @@ Summary: Help browser for the GNOME desktop
 Name: yelp
 Epoch: 1
 Version: 3.0.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 #VCS: git:git://git.gnome.org/yelp
 Source: http://download.gnome.org/sources/yelp/3.0/%{name}-%{version}.tar.bz2
+
+# https://bugzilla.gnome.org/show_bug.cgi?id=648840
+Patch0: yelp-gettext.patch
+
 URL: http://live.gnome.org/Yelp
 License: GPLv2+
 Group: Applications/System
@@ -52,6 +56,7 @@ the libraries in the yelp-libs package.
 
 %prep
 %setup -q
+%patch0 -p1 -b .gettext
 
 %build
 %configure
@@ -116,6 +121,9 @@ gtk-update-icon-cache %{_datadir}icons/hicolor &> /dev/null || :
 
 
 %changelog
+* Thu Apr 28 2011 Matthias Clasen <mclasen@redhat.com> 1:3.0.2-2
+- Fix some strings appearing untranslated (e.g. 'Show Text Cursor')
+
 * Mon Apr 25 2011 Matthias Clasen <mclasen@redhat.com> 1:3.0.2-1
 - Update to 3.0.2