Hello community,
here is the log from the commit of package yelp
checked in at Wed Apr 5 17:48:27 CEST 2006.
--------
--- GNOME/yelp/yelp.changes 2006-03-19 08:38:22.000000000 +0100
+++ yelp/yelp.changes 2006-04-05 13:15:13.000000000 +0200
@@ -1,0 +2,5 @@
+Wed Apr 5 13:13:30 CEST 2006 - hpj@suse.de
+
+- Updated patch to be better at finding HTML index files.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yelp.spec ++++++
--- /var/tmp/diff_new_pack.1kCoR0/_old 2006-04-05 17:47:48.000000000 +0200
+++ /var/tmp/diff_new_pack.1kCoR0/_new 2006-04-05 17:47:48.000000000 +0200
@@ -19,7 +19,7 @@
Group: System/GUI/GNOME
Autoreqprov: on
Version: 2.14.0
-Release: 5
+Release: 9
Summary: The GNOME 2.x Desktop Help Browser
Source: ftp://ftp.gnome.org/pub/GNOME/sources/yelp/2.12/%{name}-%{version}.tar.bz2
Source1: help-title.png
@@ -107,6 +107,8 @@
%{prefix}/share/icons/hicolor/192x192/apps/yelp-icon-big.png
%changelog -n yelp
+* Wed Apr 05 2006 - hpj@suse.de
+- Updated patch to be better at finding HTML index files.
* Sun Mar 19 2006 - hpj@suse.de
- Updated patch to resolve even more cases of broken help URIs,
missing DTDs and other external entities. Also fall back to
++++++ yelp-suse-20060319.patch ++++++
--- /var/tmp/diff_new_pack.1kCoR0/_old 2006-04-05 17:47:49.000000000 +0200
+++ /var/tmp/diff_new_pack.1kCoR0/_new 2006-04-05 17:47:49.000000000 +0200
@@ -1,6 +1,6 @@
-diff -urp yelp-2.14.0-pre/configure.in yelp-2.14.0-post/configure.in
---- yelp-2.14.0-pre/configure.in 2006-03-17 18:33:11.000000000 -0600
-+++ yelp-2.14.0-post/configure.in 2006-03-17 18:33:29.000000000 -0600
+diff -upr yelp-2.14.0-pre/configure.in yelp-2.14.0-post/configure.in
+--- yelp-2.14.0-pre/configure.in 2006-04-05 05:49:05.000000000 -0500
++++ yelp-2.14.0-post/configure.in 2006-04-05 05:49:18.000000000 -0500
@@ -81,6 +81,7 @@ PKG_CHECK_MODULES(YELP,
libxslt >= 1.1.1
libexslt >= 0.8.1
@@ -9,9 +9,9 @@
])
AC_SUBST([YELP_CFLAGS])
AC_SUBST([YELP_LIBS])
-diff -urp yelp-2.14.0-pre/configure.in.orig yelp-2.14.0-post/configure.in.orig
+diff -upr yelp-2.14.0-pre/configure.in.orig yelp-2.14.0-post/configure.in.orig
--- yelp-2.14.0-pre/configure.in.orig 2006-03-12 22:36:49.000000000 -0600
-+++ yelp-2.14.0-post/configure.in.orig 2006-03-17 18:33:29.000000000 -0600
++++ yelp-2.14.0-post/configure.in.orig 2006-04-05 05:49:18.000000000 -0500
@@ -77,8 +77,8 @@ PKG_CHECK_MODULES(YELP,
libglade-2.0 >= 2.0.0
libgnome-2.0 >= 2.0.2
@@ -23,9 +23,9 @@
libexslt >= 0.8.1
libstartup-notification-1.0 >= 0.8
])
-diff -urp yelp-2.14.0-pre/data/icons/Makefile.am yelp-2.14.0-post/data/icons/Makefile.am
+diff -upr yelp-2.14.0-pre/data/icons/Makefile.am yelp-2.14.0-post/data/icons/Makefile.am
--- yelp-2.14.0-pre/data/icons/Makefile.am 2005-02-01 15:45:05.000000000 -0600
-+++ yelp-2.14.0-post/data/icons/Makefile.am 2006-03-17 18:33:29.000000000 -0600
++++ yelp-2.14.0-post/data/icons/Makefile.am 2006-04-05 05:49:18.000000000 -0500
@@ -14,6 +14,7 @@ icon_DATA = \
yelp-watermark-blockquote-00BB.png \
yelp-watermark-blockquote-201C.png \
@@ -35,9 +35,9 @@
+ help-title.png
EXTRA_DIST = $(icon_DATA) $(icon192_DATA)
-diff -urp yelp-2.14.0-pre/data/yelp.js yelp-2.14.0-post/data/yelp.js
+diff -upr yelp-2.14.0-pre/data/yelp.js yelp-2.14.0-post/data/yelp.js
--- yelp-2.14.0-pre/data/yelp.js 2005-11-21 14:56:22.000000000 -0600
-+++ yelp-2.14.0-post/data/yelp.js 2006-03-17 18:33:29.000000000 -0600
++++ yelp-2.14.0-post/data/yelp.js 2006-04-05 05:49:18.000000000 -0500
@@ -81,6 +81,50 @@ var slt = {
}
}
@@ -89,9 +89,9 @@
/* addEventListener() is Gecko-only, but so is yelp */
window.addEventListener("load",slt.init,false);
/* load doesn't seem to get fired in Yelp. I might need to tell Gecko
-diff -urp yelp-2.14.0-pre/src/yelp-db-pager.c yelp-2.14.0-post/src/yelp-db-pager.c
+diff -upr yelp-2.14.0-pre/src/yelp-db-pager.c yelp-2.14.0-post/src/yelp-db-pager.c
--- yelp-2.14.0-pre/src/yelp-db-pager.c 2006-01-08 14:56:04.000000000 -0600
-+++ yelp-2.14.0-post/src/yelp-db-pager.c 2006-03-18 22:45:23.000000000 -0600
++++ yelp-2.14.0-post/src/yelp-db-pager.c 2006-04-05 05:49:18.000000000 -0500
@@ -24,6 +24,7 @@
#include
#endif
@@ -189,9 +189,9 @@
if (node_is_chunk (walker)) {
title = BAD_CAST node_get_title (walker, "titleabbrev");
if (!title)
-diff -urp yelp-2.14.0-pre/src/yelp-main.c yelp-2.14.0-post/src/yelp-main.c
+diff -upr yelp-2.14.0-pre/src/yelp-main.c yelp-2.14.0-post/src/yelp-main.c
--- yelp-2.14.0-pre/src/yelp-main.c 2006-02-16 18:10:28.000000000 -0600
-+++ yelp-2.14.0-post/src/yelp-main.c 2006-03-19 00:41:49.000000000 -0600
++++ yelp-2.14.0-post/src/yelp-main.c 2006-04-05 05:49:18.000000000 -0500
@@ -24,6 +24,8 @@
#include
#endif
@@ -261,9 +261,9 @@
/* Commandline parsing is done here */
g_object_get (G_OBJECT (program),
GNOME_PARAM_POPT_CONTEXT, &poptCon,
-diff -urp yelp-2.14.0-pre/src/yelp-search-pager.c yelp-2.14.0-post/src/yelp-search-pager.c
+diff -upr yelp-2.14.0-pre/src/yelp-search-pager.c yelp-2.14.0-post/src/yelp-search-pager.c
--- yelp-2.14.0-pre/src/yelp-search-pager.c 2006-02-27 13:55:10.000000000 -0600
-+++ yelp-2.14.0-post/src/yelp-search-pager.c 2006-03-17 18:33:29.000000000 -0600
++++ yelp-2.14.0-post/src/yelp-search-pager.c 2006-04-05 05:49:18.000000000 -0500
@@ -147,6 +147,7 @@ static gboolean search_pager_proces
static YelpPagerClass *parent_class;
@@ -345,18 +345,18 @@
return;
}
+#endif /* ENABLE_SCROLLKEEPER */
-diff -urp yelp-2.14.0-pre/src/yelp-search-pager.h yelp-2.14.0-post/src/yelp-search-pager.h
+diff -upr yelp-2.14.0-pre/src/yelp-search-pager.h yelp-2.14.0-post/src/yelp-search-pager.h
--- yelp-2.14.0-pre/src/yelp-search-pager.h 2005-10-28 15:37:37.000000000 -0500
-+++ yelp-2.14.0-post/src/yelp-search-pager.h 2006-03-17 18:33:29.000000000 -0600
++++ yelp-2.14.0-post/src/yelp-search-pager.h 2006-04-05 05:49:18.000000000 -0500
@@ -53,4 +53,5 @@ GType yelp_search_pager_get_t
void yelp_search_pager_init (void);
YelpSearchPager *yelp_search_pager_get (YelpDocInfo *doc_info);
+gboolean yelp_search_pager_search_available (void);
#endif /* __YELP_SEARCH_PAGER_H__ */
-diff -urp yelp-2.14.0-pre/src/yelp-settings.c yelp-2.14.0-post/src/yelp-settings.c
+diff -upr yelp-2.14.0-pre/src/yelp-settings.c yelp-2.14.0-post/src/yelp-settings.c
--- yelp-2.14.0-pre/src/yelp-settings.c 2006-01-26 22:49:44.000000000 -0600
-+++ yelp-2.14.0-post/src/yelp-settings.c 2006-03-17 18:33:29.000000000 -0600
++++ yelp-2.14.0-post/src/yelp-settings.c 2006-04-05 05:49:18.000000000 -0500
@@ -34,7 +34,8 @@
#include "yelp-settings.h"
@@ -367,9 +367,9 @@
#define KEY_GNOME_FIXED_FONT KEY_GNOME_DIR "/monospace_font_name"
#define KEY_GNOME_GTK_THEME KEY_GNOME_DIR "/gtk_theme"
-diff -urp yelp-2.14.0-pre/src/yelp-toc-pager.c yelp-2.14.0-post/src/yelp-toc-pager.c
---- yelp-2.14.0-pre/src/yelp-toc-pager.c 2006-03-17 18:33:11.000000000 -0600
-+++ yelp-2.14.0-post/src/yelp-toc-pager.c 2006-03-17 19:00:21.000000000 -0600
+diff -upr yelp-2.14.0-pre/src/yelp-toc-pager.c yelp-2.14.0-post/src/yelp-toc-pager.c
+--- yelp-2.14.0-pre/src/yelp-toc-pager.c 2006-04-05 05:49:05.000000000 -0500
++++ yelp-2.14.0-post/src/yelp-toc-pager.c 2006-04-05 05:49:18.000000000 -0500
@@ -39,6 +39,7 @@
#include
#include
@@ -917,9 +917,9 @@
static void
xslt_yelp_document (xsltTransformContextPtr ctxt,
xmlNodePtr node,
-diff -urp yelp-2.14.0-pre/src/yelp-toc-pager.c.orig yelp-2.14.0-post/src/yelp-toc-pager.c.orig
+diff -upr yelp-2.14.0-pre/src/yelp-toc-pager.c.orig yelp-2.14.0-post/src/yelp-toc-pager.c.orig
--- yelp-2.14.0-pre/src/yelp-toc-pager.c.orig 2006-02-18 10:10:22.000000000 -0600
-+++ yelp-2.14.0-post/src/yelp-toc-pager.c.orig 2006-03-17 18:33:29.000000000 -0600
++++ yelp-2.14.0-post/src/yelp-toc-pager.c.orig 2006-04-05 05:49:18.000000000 -0500
@@ -497,6 +497,15 @@ process_omf_pending (YelpTocPager *pager
XML_PARSE_NONET );
if (!omf_doc) {
@@ -936,9 +936,9 @@
goto done;
}
-diff -urp yelp-2.14.0-pre/src/yelp-utils.c yelp-2.14.0-post/src/yelp-utils.c
+diff -upr yelp-2.14.0-pre/src/yelp-utils.c yelp-2.14.0-post/src/yelp-utils.c
--- yelp-2.14.0-pre/src/yelp-utils.c 2006-01-15 08:41:01.000000000 -0600
-+++ yelp-2.14.0-post/src/yelp-utils.c 2006-03-18 17:37:37.000000000 -0600
++++ yelp-2.14.0-post/src/yelp-utils.c 2006-04-05 06:05:55.000000000 -0500
@@ -70,6 +70,7 @@ struct _YelpDocInfo {
static YelpDocType get_doc_type (gchar *uri);
@@ -1116,7 +1116,7 @@
if (*(++cur) != '\0') {
if (frag_id)
g_free (frag_id);
-@@ -606,6 +702,166 @@ yelp_doc_info_add_uri (YelpDocInfo *doc_
+@@ -606,6 +702,180 @@ yelp_doc_info_add_uri (YelpDocInfo *doc_
/** Convert fancy URIs to file URIs *******************************************/
static gchar *
@@ -1162,6 +1162,20 @@
+ if (result)
+ return result;
+
++ full_path = g_build_filename (path, "index.html", NULL);
++ result = help_uri_check_file (full_path, reference);
++ g_free (full_path);
++ if (result)
++ return result;
++
++ full_identifier = g_strconcat (identifier, ".html", NULL);
++ full_path = g_build_filename (path, full_identifier, NULL);
++ result = help_uri_check_file (full_path, reference);
++ g_free (full_path);
++ g_free (full_identifier);
++ if (result)
++ return result;
++
+ return NULL;
+}
+
@@ -1283,7 +1297,7 @@
locate_file_lang (gchar *path, gchar *file, const gchar *lang)
{
gchar *exts[] = {".xml", ".docbook", ".sgml", ".html", "", NULL};
-@@ -640,6 +896,9 @@ convert_ghelp_uri (gchar *uri)
+@@ -640,6 +910,9 @@ convert_ghelp_uri (gchar *uri)
else
goto done;
@@ -1293,7 +1307,7 @@
if (path && path[0] == '/') {
if ((cur = strchr (path, '?')) || (cur = strchr (path, '#')))
*cur = '\0';
-@@ -913,7 +1172,7 @@ convert_info_uri (gchar *uri)
+@@ -913,7 +1186,7 @@ convert_info_uri (gchar *uri)
goto done;
info_name = g_strndup (path, cur - path);
}
@@ -1302,9 +1316,9 @@
info_name = g_strndup (path, cur - path);
else
info_name = g_strdup (path);
-diff -urp yelp-2.14.0-pre/src/yelp-utils.h yelp-2.14.0-post/src/yelp-utils.h
+diff -upr yelp-2.14.0-pre/src/yelp-utils.h yelp-2.14.0-post/src/yelp-utils.h
--- yelp-2.14.0-pre/src/yelp-utils.h 2006-01-07 13:17:58.000000000 -0600
-+++ yelp-2.14.0-post/src/yelp-utils.h 2006-03-17 18:33:29.000000000 -0600
++++ yelp-2.14.0-post/src/yelp-utils.h 2006-04-05 05:49:18.000000000 -0500
@@ -67,6 +67,7 @@ typedef enum {
YELP_URI_TYPE_TOC = 1 << 4,
YELP_URI_TYPE_EXTERNAL = 1 << 5,
@@ -1323,9 +1337,9 @@
YELP_URI_TYPE_ANY =
YELP_URI_TYPE_FILE |
YELP_URI_TYPE_NO_FILE
-diff -urp yelp-2.14.0-pre/src/yelp-window.c yelp-2.14.0-post/src/yelp-window.c
+diff -upr yelp-2.14.0-pre/src/yelp-window.c yelp-2.14.0-post/src/yelp-window.c
--- yelp-2.14.0-pre/src/yelp-window.c 2006-02-04 09:53:40.000000000 -0600
-+++ yelp-2.14.0-post/src/yelp-window.c 2006-03-17 18:33:29.000000000 -0600
++++ yelp-2.14.0-post/src/yelp-window.c 2006-04-05 05:49:18.000000000 -0500
@@ -1025,9 +1025,11 @@ window_populate (YelpWindow *window)
_("_Search:"),
_("Search for other documentation"),
@@ -1338,9 +1352,9 @@
#endif
priv->ui_manager = gtk_ui_manager_new ();
-diff -urp yelp-2.14.0-pre/stylesheets/toc2html.xsl yelp-2.14.0-post/stylesheets/toc2html.xsl
+diff -upr yelp-2.14.0-pre/stylesheets/toc2html.xsl yelp-2.14.0-post/stylesheets/toc2html.xsl
--- yelp-2.14.0-pre/stylesheets/toc2html.xsl 2006-02-11 23:06:06.000000000 -0600
-+++ yelp-2.14.0-post/stylesheets/toc2html.xsl 2006-03-17 18:33:29.000000000 -0600
++++ yelp-2.14.0-post/stylesheets/toc2html.xsl 2006-04-05 05:49:18.000000000 -0500
@@ -8,6 +8,9 @@
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...