Hello community, here is the log from the commit of package yelp for openSUSE:Factory checked in at Wed Nov 25 15:00:23 CET 2009. -------- --- GNOME/yelp/yelp.changes 2009-09-21 23:21:50.000000000 +0200 +++ /mounts/work_src_done/STABLE/yelp/yelp.changes 2009-11-13 22:58:57.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Nov 13 22:58:06 CET 2009 - dimstar@opensuse.org + +- Refresh patches to apply with fuzz=0. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yelp.spec ++++++ --- /var/tmp/diff_new_pack.T6Dror/_old 2009-11-25 14:59:45.000000000 +0100 +++ /var/tmp/diff_new_pack.T6Dror/_new 2009-11-25 14:59:45.000000000 +0100 @@ -43,7 +43,7 @@ License: GPL v2 or later ; LGPL v2.1 or later Group: System/GUI/GNOME Version: 2.28.0 -Release: 1 +Release: 2 Summary: The GNOME 2.x Desktop Help Browser Source: ftp://ftp.gnome.org/pub/GNOME/sources/yelp/2.12/%{name}-%{version}.tar.bz2 Url: http://www.gnome.org ++++++ yelp-2.13.5-use-susehelp.patch ++++++ --- /var/tmp/diff_new_pack.T6Dror/_old 2009-11-25 14:59:45.000000000 +0100 +++ /var/tmp/diff_new_pack.T6Dror/_new 2009-11-25 14:59:45.000000000 +0100 @@ -1,8 +1,10 @@ ---- yelp-2.15.91/src/Makefile.am -+++ yelp-2.15.91/src/Makefile.am -@@ -201,7 +201,7 @@ +Index: yelp-2.28.0/src/Makefile.am +=================================================================== +--- yelp-2.28.0.orig/src/Makefile.am ++++ yelp-2.28.0/src/Makefile.am +@@ -224,7 +224,7 @@ EXTRA_DIST = yelp-marshal.list yelp-info - install-exec-local: + install-exec-hook: rm -f $(DESTDIR)$(bindir)/gnome-help && \ - $(LN_S) yelp $(DESTDIR)$(bindir)/gnome-help + $(LN_S) /usr/bin/susehelp $(DESTDIR)$(bindir)/gnome-help ++++++ yelp-handle-help-uri.patch ++++++ --- /var/tmp/diff_new_pack.T6Dror/_old 2009-11-25 14:59:45.000000000 +0100 +++ /var/tmp/diff_new_pack.T6Dror/_new 2009-11-25 14:59:45.000000000 +0100 @@ -2,10 +2,11 @@ have to handle things this way, and hopefully a common doc metadata format will solve this kind of issues in the future. -diff -aurp yelp-2.22.1/src/yelp-utils.c yelp-2.22.1-patched//src/yelp-utils.c ---- yelp-2.22.1/src/yelp-utils.c 2008-04-07 20:02:52.000000000 +0200 -+++ yelp-2.22.1-patched//src/yelp-utils.c 2008-04-23 01:09:41.000000000 +0200 -@@ -40,6 +40,8 @@ +Index: yelp-2.28.0/src/yelp-utils.c +=================================================================== +--- yelp-2.28.0.orig/src/yelp-utils.c ++++ yelp-2.28.0/src/yelp-utils.c +@@ -39,6 +39,8 @@ YelpRrnType resolve_process_ghelp (char *uri, gchar **result); @@ -14,7 +15,7 @@ gchar * resolve_get_section (const gchar *uri); gboolean resolve_is_man_path (const gchar *path, const gchar *encoding); -@@ -315,6 +317,25 @@ yelp_uri_resolve (gchar *uri, gchar **re +@@ -378,6 +380,25 @@ yelp_uri_resolve (gchar *uri, gchar **re if (*result) { *section = intern_section; } @@ -40,8 +41,8 @@ } else if (!strncmp (uri, "man:", 4)) { ret = resolve_man_page (&uri[4], result, section); if (ret == YELP_RRN_TYPE_ERROR) { -@@ -439,3 +460,204 @@ yelp_uri_resolve (gchar *uri, gchar **re - +@@ -531,3 +552,204 @@ yelp_uri_resolve (gchar *uri, gchar **re + g_free (intern_uri); return ret; } + ++++++ yelp-remove-debug.patch ++++++ --- /var/tmp/diff_new_pack.T6Dror/_old 2009-11-25 14:59:45.000000000 +0100 +++ /var/tmp/diff_new_pack.T6Dror/_new 2009-11-25 14:59:45.000000000 +0100 @@ -1,8 +1,8 @@ -Index: yelp-2.27.1/src/yelp-utils.c +Index: yelp-2.28.0/src/yelp-utils.c =================================================================== ---- yelp-2.27.1.orig/src/yelp-utils.c -+++ yelp-2.27.1/src/yelp-utils.c -@@ -456,7 +456,6 @@ yelp_uri_resolve (gchar *uri, gchar **re +--- yelp-2.28.0.orig/src/yelp-utils.c ++++ yelp-2.28.0/src/yelp-utils.c +@@ -487,7 +487,6 @@ yelp_uri_resolve (gchar *uri, gchar **re new_uri = g_strdup_printf ("%s/%s", current_path, intern_uri); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org