Hello community,
here is the log from the commit of package yelp
checked in at Sat Sep 15 12:04:35 CEST 2007.
--------
--- GNOME/yelp/yelp.changes 2007-09-01 06:50:44.000000000 +0200
+++ /mounts/work_src_done/STABLE/yelp/yelp.changes 2007-09-14 21:29:10.626296000 +0200
@@ -1,0 +2,13 @@
+Fri Sep 14 21:28:10 CEST 2007 - hpj@suse.de
+
+- Update yelp-suse-20060319.patch to find docs in the help-bundle/
+ dir in addition to help/.
+
+-------------------------------------------------------------------
+Fri Sep 14 17:23:00 CEST 2007 - jpr@suse.de
+
+- Revert to 2.18.1
+- Add yelp-2.18.1-empty-doc-crash.patch, which prevents a crash
+ when trying to load an empty doc.
+
+-------------------------------------------------------------------
Old:
----
abuild.patch
mp-search-parser.patch
yelp-2.19.90-freed-memory-crash-2.patch
yelp-2.19.90-freed-memory-crash.patch
yelp-2.19.90-no-mime-type-crash.patch
yelp-2.19.90.tar.bz2
New:
----
yelp-2.18.1-empty-doc-crash.patch
yelp-2.18.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yelp.spec ++++++
--- /var/tmp/diff_new_pack.Y22875/_old 2007-09-15 12:04:20.000000000 +0200
+++ /var/tmp/diff_new_pack.Y22875/_new 2007-09-15 12:04:20.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yelp (Version 2.19.90)
+# spec file for package yelp (Version 2.18.1)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,16 +12,16 @@
Name: yelp
%define xulrunner_version 181
-BuildRequires: fdupes gcc-c++ gnome-common gnome-doc-utils-devel gnome-menus-devel intltool libbeagle-devel libglade2-devel libgnomeui-devel libxslt-devel mDNSResponder-devel perl-XML-Parser rarian-devel startup-notification-devel susehelp update-desktop-files
+BuildRequires: fdupes gcc-c++ gnome-common gnome-doc-utils-devel gnome-menus-devel intltool libbeagle-devel libglade2-devel libgnomeui-devel libxslt-devel mDNSResponder-devel perl-XML-Parser startup-notification-devel susehelp update-desktop-files
Requires: gnome-utils susehelp
License: GPL v2 or later, LGPL v2 or later
Group: System/GUI/GNOME
-Version: 2.19.90
-Release: 1
+Version: 2.18.1
+Release: 44
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
-URL: http://www.gnome.org
+Url: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Patch1: yelp-libxslt.patch
Patch2: yelp-onlyshowin.patch
@@ -30,14 +30,9 @@
Patch6: yelp-2.13.5-use-susehelp.patch
Patch8: yelp-2.14.0-process-suse-manuals.patch
Patch9: yelp-autobuild-warning.patch
-Patch10: mp-search-parser.patch
-# FIXME: this is surely not the correct approach to take.
-Patch11: abuild.patch
-Patch12: yelp-2.19.90-freed-memory-crash.patch
-Patch13: yelp-2.19.90-freed-memory-crash-2.patch
-Patch14: yelp-2.19.90-no-mime-type-crash.patch
+Patch10: yelp-2.18.1-empty-doc-crash.patch
PreReq: filesystem gconf2
-Requires: gnome-doc-utils rarian
+Requires: gnome-doc-utils
Requires: libbeagle >= 0.2.0
%if %suse_version > 1010 || 0%{?opensuse_bs}
BuildRequires: mozilla-xulrunner%{xulrunner_version}-devel
@@ -52,9 +47,8 @@
%endif
%endif
Provides: suse_help_viewer
-Autoreqprov: on
+AutoReqProv: on
Requires: %{name}-lang = %{version}
-
%gconf_schemas_prereq
%description
@@ -71,19 +65,12 @@
%patch1 -p0
%endif
%patch2 -p1
-# FIXME: This patch is breaking the build.
-#%patch4 -p1
+%patch4 -p1
%patch5
%patch6 -p1
-# FIXME: This patch is breaking the build.
-#%patch8 -p1
-# FIXME: This patch is breaking the build.
-#%patch9
+%patch8 -p1
+%patch9
%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
# Use nds for Low Saxon (Northern Frisian Enclave)
# Northern Frisian Enclave is not ISO-3166 country code:
rename nds@NFE nds po/nds@NFE.*
@@ -102,14 +89,12 @@
%find_lang %{name}
%find_gconf_schemas
cat %{name}.schemas_list >%{name}.lst
-
%fdupes $RPM_BUILD_ROOT
%clean
rm -rf $RPM_BUILD_ROOT
%pre -f %{name}.schemas_pre
-
%posttrans -f %{name}.schemas_posttrans
%preun -f %{name}.schemas_preun
@@ -125,6 +110,13 @@
%files lang -f %{name}.lang
%changelog
+* Fri Sep 14 2007 - hpj@suse.de
+- Update yelp-suse-20060319.patch to find docs in the help-bundle/
+ dir in addition to help/.
+* Fri Sep 14 2007 - jpr@suse.de
+- Revert to 2.18.1
+- Add yelp-2.18.1-empty-doc-crash.patch, which prevents a crash
+ when trying to load an empty doc.
* Sat Sep 01 2007 - hpj@suse.de
- Add yelp-2.19.90-freed-memory-crash.patch (BGO #469436).
- Add yelp-2.19.90-freed-memory-crash-2.patch (BGO #469438).
++++++ yelp-2.18.1-empty-doc-crash.patch ++++++
diff -upr yelp-2.18.1-pre/src/yelp-xslt-pager.c yelp-2.18.1-post/src/yelp-xslt-pager.c
--- yelp-2.18.1-pre/src/yelp-xslt-pager.c 2007-03-07 13:28:48.000000000 -0600
+++ yelp-2.18.1-post/src/yelp-xslt-pager.c 2007-09-12 16:51:27.000000000 -0500
@@ -549,13 +564,17 @@ xslt_yelp_cache (xsltTransformContextPtr
ctxt->output = old_output;
ctxt->insert = old_insert;
- /* this copy of the node we put in the cache */
- tmpnode = xmlCopyNode (new_doc->children, 1);
- g_hash_table_insert (keyhash, key, tmpnode);
-
- /* this copy of the node gets attached to the result tree */
- tmpnode2 = xmlDocCopyNode (tmpnode, tmpnode->doc, 1);
- xmlAddChild (ctxt->insert, tmpnode2);
+ if (new_doc->children) {
+ /* this copy of the node we put in the cache */
+ tmpnode = xmlCopyNode (new_doc->children, 1);
+ g_hash_table_insert (keyhash, key, tmpnode);
+
+ if (tmpnode) {
+ /* this copy of the node gets attached to the result tree */
+ tmpnode2 = xmlDocCopyNode (tmpnode, tmpnode->doc, 1);
+ xmlAddChild (ctxt->insert, tmpnode2);
+ }
+ }
while (gtk_events_pending ())
gtk_main_iteration ();
++++++ yelp-2.19.90.tar.bz2 -> yelp-2.18.1.tar.bz2 ++++++
++++ 85872 lines of diff (skipped)
++++++ yelp-suse-20060319.patch ++++++
--- /var/tmp/diff_new_pack.Y22875/_old 2007-09-15 12:04:23.000000000 +0200
+++ /var/tmp/diff_new_pack.Y22875/_new 2007-09-15 12:04:23.000000000 +0200
@@ -1,6 +1,6 @@
-diff -upr yelp-2.16.1-pre/configure.in yelp-2.16.1-post/configure.in
---- yelp-2.16.1-pre/configure.in 2006-10-02 12:26:19.000000000 -0500
-+++ yelp-2.16.1-post/configure.in 2006-10-26 11:11:49.000000000 -0500
+diff -upr yelp-2.18.1-pre/configure.in yelp-2.18.1-post/configure.in
+--- yelp-2.18.1-pre/configure.in 2007-04-09 11:46:52.000000000 -0500
++++ yelp-2.18.1-post/configure.in 2007-09-14 10:39:24.000000000 -0500
@@ -73,10 +73,11 @@ PKG_CHECK_MODULES(YELP,
libglade-2.0 >= 2.0.0
libgnome-2.0 >= 2.14.0
@@ -15,9 +15,9 @@
dbus-glib-1
])
AC_SUBST([YELP_CFLAGS])
-diff -upr yelp-2.16.1-pre/data/icons/Makefile.am yelp-2.16.1-post/data/icons/Makefile.am
---- yelp-2.16.1-pre/data/icons/Makefile.am 2005-02-01 15:45:05.000000000 -0600
-+++ yelp-2.16.1-post/data/icons/Makefile.am 2006-10-26 11:11:49.000000000 -0500
+diff -upr yelp-2.18.1-pre/data/icons/Makefile.am yelp-2.18.1-post/data/icons/Makefile.am
+--- yelp-2.18.1-pre/data/icons/Makefile.am 2007-03-07 13:28:48.000000000 -0600
++++ yelp-2.18.1-post/data/icons/Makefile.am 2007-09-14 10:39:24.000000000 -0500
@@ -14,6 +14,7 @@ icon_DATA = \
yelp-watermark-blockquote-00BB.png \
yelp-watermark-blockquote-201C.png \
@@ -27,9 +27,9 @@
+ help-title.png
EXTRA_DIST = $(icon_DATA) $(icon192_DATA)
-diff -upr yelp-2.16.1-pre/data/yelp.js yelp-2.16.1-post/data/yelp.js
---- yelp-2.16.1-pre/data/yelp.js 2005-11-21 14:56:22.000000000 -0600
-+++ yelp-2.16.1-post/data/yelp.js 2006-10-26 11:11:49.000000000 -0500
+diff -upr yelp-2.18.1-pre/data/yelp.js yelp-2.18.1-post/data/yelp.js
+--- yelp-2.18.1-pre/data/yelp.js 2007-03-07 13:28:48.000000000 -0600
++++ yelp-2.18.1-post/data/yelp.js 2007-09-14 10:39:24.000000000 -0500
@@ -81,6 +81,50 @@ var slt = {
}
}
@@ -81,9 +81,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 -upr yelp-2.16.1-pre/src/yelp-db-pager.c yelp-2.16.1-post/src/yelp-db-pager.c
---- yelp-2.16.1-pre/src/yelp-db-pager.c 2006-06-11 23:39:59.000000000 -0500
-+++ yelp-2.16.1-post/src/yelp-db-pager.c 2006-10-26 11:11:49.000000000 -0500
+diff -upr yelp-2.18.1-pre/src/yelp-db-pager.c yelp-2.18.1-post/src/yelp-db-pager.c
+--- yelp-2.18.1-pre/src/yelp-db-pager.c 2007-03-07 13:28:48.000000000 -0600
++++ yelp-2.18.1-post/src/yelp-db-pager.c 2007-09-14 10:39:24.000000000 -0500
@@ -24,6 +24,7 @@
#include