Hello community, here is the log from the commit of package yelp checked in at Sun Aug 5 11:51:21 CEST 2007. -------- --- GNOME/yelp/yelp.changes 2007-05-10 11:10:17.000000000 +0200 +++ /mounts/work_src_done/STABLE/yelp/yelp.changes 2007-08-04 00:21:50.465910000 +0200 @@ -1,0 +2,18 @@ +Sat Aug 4 00:13:53 CEST 2007 - maw@suse.de + +- Buildrequire rarian-devel, not rarian +- Use %fdupes +- Add abuild.patch. + +------------------------------------------------------------------- +Fri Aug 3 22:07:57 CEST 2007 - mauro@suse.de + +- Update to version 2.19.2 +- Test programs are disabled for now. +- Merge of the yelp rework branch. +- New themes are working now. +- Make loading of files directly work again. +- Search across is using Rarian now. +- mp-search-parser.patch was added to fix search-parser.c + +------------------------------------------------------------------- Old: ---- yelp-2.18.1.tar.bz2 New: ---- abuild.patch mp-search-parser.patch yelp-2.19.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yelp.spec ++++++ --- /var/tmp/diff_new_pack.sX8514/_old 2007-08-05 11:51:04.000000000 +0200 +++ /var/tmp/diff_new_pack.sX8514/_new 2007-08-05 11:51:04.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yelp (Version 2.18.1) +# spec file for package yelp (Version 2.19.1) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -12,12 +12,12 @@ Name: yelp %define xulrunner_version 181 -BuildRequires: 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 +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 Requires: gnome-utils susehelp -License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL) +License: GPL v2 or later, LGPL v2 or later Group: System/GUI/GNOME -Version: 2.18.1 -Release: 10 +Version: 2.19.1 +Release: 1 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 @@ -30,8 +30,11 @@ 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 PreReq: filesystem gconf2 -Requires: gnome-doc-utils +Requires: gnome-doc-utils rarian Requires: libbeagle >= 0.2.0 %if %suse_version > 1010 || 0%{?opensuse_bs} BuildRequires: mozilla-xulrunner%{xulrunner_version}-devel @@ -63,11 +66,16 @@ %patch1 -p0 %endif %patch2 -p1 -%patch4 -p1 +# FIXME: This patch is breaking the build. +#%patch4 -p1 %patch5 %patch6 -p1 -%patch8 -p1 -%patch9 +# FIXME: This patch is breaking the build. +#%patch8 -p1 +# FIXME: This patch is breaking the build. +#%patch9 +%patch10 -p1 +%patch11 -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.* @@ -87,6 +95,8 @@ %find_gconf_schemas cat %{name}.lang %{name}.schemas_list >%{name}.lst +%fdupes $RPM_BUILD_ROOT + %clean rm -rf $RPM_BUILD_ROOT @@ -105,6 +115,18 @@ %{_datadir}/yelp %changelog +* Sat Aug 04 2007 - maw@suse.de +- Buildrequire rarian-devel, not rarian +- Use %%fdupes +- Add abuild.patch. +* Fri Aug 03 2007 - mauro@suse.de +- Update to version 2.19.2 +- Test programs are disabled for now. +- Merge of the yelp rework branch. +- New themes are working now. +- Make loading of files directly work again. +- Search across is using Rarian now. +- mp-search-parser.patch was added to fix search-parser.c * Thu May 10 2007 - pgajdos@suse.cz - removed gnome-icon-theme from BuildRequires [#247450] * Thu Apr 12 2007 - maw@suse.de ++++++ abuild.patch ++++++ Index: yelp-2.19.1/src/yelp-settings.c =================================================================== --- yelp-2.19.1.orig/src/yelp-settings.c +++ yelp-2.19.1/src/yelp-settings.c @@ -289,10 +289,11 @@ yelp_settings_get_icon (YelpIconType ico g_return_val_if_fail (icon < YELP_NUM_ICONS, NULL); - /*info = gtk_icon_theme_lookup_icon (icon_theme, + /* info = gtk_icon_theme_lookup_icon (icon_theme, icon_names[icon], 36, 0);*/ - return info; + // return info; + return NULL; } gchar * ++++++ mp-search-parser.patch ++++++ diff -Naur yelp-2.19.1/src/yelp-search-parser.c yelp-2.19.1-mp/src/yelp-search-parser.c --- yelp-2.19.1/src/yelp-search-parser.c 2007-07-31 00:11:53.000000000 +0200 +++ yelp-2.19.1-mp/src/yelp-search-parser.c 2007-08-03 23:54:15.000000000 +0200 @@ -398,6 +398,7 @@ static gboolean check_lang (const char *lang) { int i; + const gchar * const * langs = g_get_language_names (); for (i = 0; langs[i]; i++) { if (!strncmp (lang, langs[i], 2)) { debug_print (DB_DEBUG, "%s preferred\n", lang); ++++++ yelp-2.18.1.tar.bz2 -> yelp-2.19.1.tar.bz2 ++++++ ++++ 52859 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org