From 00ed6c0e826390d620dc0ba24134314fc3f58f14 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 19 2015 15:43:24 +0000 Subject: import yelp-3.14.2-1.el7 --- diff --git a/.gitignore b/.gitignore index 40c010c..7071dd6 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/yelp-3.8.1.tar.xz +SOURCES/yelp-3.14.2.tar.xz diff --git a/.yelp.metadata b/.yelp.metadata index 996b8ac..bc861da 100644 --- a/.yelp.metadata +++ b/.yelp.metadata @@ -1 +1 @@ -ee93e25e97e85eea53260e4d49a05127b75b6e33 SOURCES/yelp-3.8.1.tar.xz +5725ddbeedd8904c1a5193dcc329b81f1fa897e8 SOURCES/yelp-3.14.2.tar.xz diff --git a/SOURCES/0001-Don-t-steal-focus-optionally.patch b/SOURCES/0001-Don-t-steal-focus-optionally.patch deleted file mode 100644 index 5fb935e..0000000 --- a/SOURCES/0001-Don-t-steal-focus-optionally.patch +++ /dev/null @@ -1,62 +0,0 @@ -From b76206bbdeb710853f585942377badff0a4c1df9 Mon Sep 17 00:00:00 2001 -From: Matthias Clasen -Date: Thu, 8 Nov 2012 21:43:31 -0500 -Subject: [PATCH] Don't steal focus, optionally - -It is somewhat rude to steal focus like this, and it actively -interferes with some use cases for launching yelp in the background. -Add a commandline option --dont-steal-focus, to make those -use cases work. ---- - src/yelp-application.c | 20 ++++++++++++-------- - 1 file changed, 12 insertions(+), 8 deletions(-) - -diff --git a/src/yelp-application.c b/src/yelp-application.c -index 057cafd..2d004c2 100644 ---- a/src/yelp-application.c -+++ b/src/yelp-application.c -@@ -43,6 +43,7 @@ - #define DEFAULT_URI "help:gnome-help" - - static gboolean editor_mode = FALSE; -+static gboolean dont_steal_focus = FALSE; - - enum { - READ_LATER_CHANGED, -@@ -63,6 +64,7 @@ option_version_cb (const gchar *option_name, - - static const GOptionEntry entries[] = { - {"editor-mode", 0, 0, G_OPTION_ARG_NONE, &editor_mode, N_("Turn on editor mode"), NULL}, -+ {"dont-steal-focus", 0, 0, G_OPTION_ARG_NONE, &dont_steal_focus, N_("Don't steal focus"), NULL}, - { "version", 0, G_OPTION_FLAG_NO_ARG | G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_CALLBACK, option_version_cb, NULL, NULL }, - { NULL } - }; -@@ -472,15 +474,17 @@ application_uri_resolved (YelpUri *uri, - if (gdk_window) - gdk_x11_window_move_to_current_desktop (gdk_window); - -- /* Ensure we actually present the window when invoked from the command -- * line. This is somewhat evil, but the minor evil of Yelp stealing -- * focus (after you requested it) is outweighed for me by the major -- * evil of no help window appearing when you click Help. -- */ -- if (data->timestamp == 0) -- data->timestamp = gdk_x11_get_server_time (gtk_widget_get_window (GTK_WIDGET (window))); -+ if (!dont_steal_focus) { -+ /* Ensure we actually present the window when invoked from the command -+ * line. This is somewhat evil, but the minor evil of Yelp stealing -+ * focus (after you requested it) is outweighed for me by the major -+ * evil of no help window appearing when you click Help. -+ */ -+ if (data->timestamp == 0) -+ data->timestamp = gdk_x11_get_server_time (gtk_widget_get_window (GTK_WIDGET (window))); - -- gtk_window_present_with_time (GTK_WINDOW (window), data->timestamp); -+ gtk_window_present_with_time (GTK_WINDOW (window), data->timestamp); -+ } - - g_object_unref (uri); - g_free (data); --- -1.7.12.1 - diff --git a/SOURCES/yelp-keywords.patch b/SOURCES/yelp-keywords.patch deleted file mode 100644 index fc3794e..0000000 --- a/SOURCES/yelp-keywords.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up yelp-3.8.1/po/ml.po.keywords yelp-3.8.1/po/ml.po ---- yelp-3.8.1/po/ml.po.keywords 2013-05-14 00:32:15.995943682 -0400 -+++ yelp-3.8.1/po/ml.po 2013-05-14 00:32:58.319944317 -0400 -@@ -561,7 +561,7 @@ msgstr "ഗ്നോം സഹായം - - #: ../yelp.desktop.in.in.h:3 - msgid "documentation;information;manual;" --msgstr "പ്രമാണശേഖരണം;വിവരം;ഉപയോഗസഹായി" -+msgstr "പ്രമാണശേഖരണം;വിവരം;ഉപയോഗസഹായി;" - - #~ msgid "GNU Info Pages" - #~ msgstr "GNU വിവര പേജുകള്‍" diff --git a/SPECS/yelp.spec b/SPECS/yelp.spec index a0e1237..7f8f218 100644 --- a/SPECS/yelp.spec +++ b/SPECS/yelp.spec @@ -3,21 +3,17 @@ Summary: Help browser for the GNOME desktop Name: yelp Epoch: 1 -Version: 3.8.1 -Release: 7%{?dist} +Version: 3.14.2 +Release: 1%{?dist} #VCS: git:git://git.gnome.org/yelp -Source: http://download.gnome.org/sources/yelp/3.8/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/yelp/3.14/%{name}-%{version}.tar.xz -# https://bugzilla.gnome.org/show_bug.cgi?id=687957 -Patch0: 0001-Don-t-steal-focus-optionally.patch # https://bugzilla.gnome.org/show_bug.cgi?id=687960 Patch1: 0001-Center-new-windows.patch -Patch2: yelp-keywords.patch URL: http://live.gnome.org/Yelp License: GPLv2+ Group: Applications/System -Requires: gnome-user-docs Requires: yelp-libs%{?_isa} = %{epoch}:%{version}-%{release} Requires: yelp-xsl @@ -35,8 +31,6 @@ BuildRequires: bzip2-devel BuildRequires: gettext-devel BuildRequires: intltool BuildRequires: sqlite-devel -BuildRequires: folks-devel -BuildRequires: libgee-devel BuildRequires: itstool %description @@ -64,9 +58,7 @@ the libraries in the yelp-libs package. %prep %setup -q -%patch0 -p1 %patch1 -p1 -%patch2 -p1 %build %configure --disable-static @@ -125,6 +117,9 @@ gtk-update-icon-cache %{_datadir}icons/hicolor &> /dev/null || : %changelog +* Mon May 18 2015 David King - 1:3.14.2-1 +- Update to 3.14.2 (#1174713) + * Fri Jan 24 2014 Daniel Mach - 1:3.8.1-7 - Mass rebuild 2014-01-24