Hello community,

here is the log from the commit of package yelp for openSUSE:Factory
checked in at Fri Sep 9 12:29:10 CEST 2011.



--------
--- GNOME/yelp/yelp.changes     2011-06-14 11:09:49.000000000 +0200
+++ /mounts/work_src_done/STABLE/yelp/yelp.changes      2011-09-06 
19:29:29.000000000 +0200
@@ -1,0 +2,30 @@
+Tue Sep  6 17:21:36 UTC 2011 - [email protected]
+
+- Drop yelp-handle-help-uri.patch: the help: URI scheme are now
+  used for the new XDG help system, so we can't support the old
+  meaning. No need to try to rebase this patch. Fix bnc#689978.
+- Add yelp-lang-bundle.patch: support help documents in lang
+  bundles. Fix bnc#689979.
+
+-------------------------------------------------------------------
+Tue Sep  6 06:08:00 UTC 2011 - [email protected]
+
+- Update to version 3.1.3:
+  + Fixed URI in location entry after link click in help URIs
+    (bgo#658023)
+  + Fixed crashes on info documents
+  + Updated translations.
+
+-------------------------------------------------------------------
+Mon Aug 15 17:35:59 CEST 2011 - [email protected]
+
+- Update to version 3.1.2:
+  + Added Unity to OnlyShowIn
+  + Added support for the install: action scheme
+  + Don't try to search with NULL URI, bgo#655124
+  + Fixed crash when opening URI after closing a window
+  + Fixed search crash on 64-bit systems
+  + Changed the DocBook chunking rules to match yelp-xsl
+  + Updated translations.
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
  yelp-3.1.1.tar.bz2
  yelp-handle-help-uri.patch

New:
----
  yelp-3.1.3.tar.bz2
  yelp-lang-bundle.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yelp.spec ++++++
--- /var/tmp/diff_new_pack.XImWF2/_old  2011-09-09 12:29:05.000000000 +0200
+++ /var/tmp/diff_new_pack.XImWF2/_new  2011-09-09 12:29:05.000000000 +0200
@@ -34,16 +34,16 @@
 BuildRequires:  update-desktop-files
 License:        GPLv2+ ; LGPLv2.1+
 Group:          System/GUI/GNOME
-Version:        3.1.1
+Version:        3.1.3
 Release:        1
 Summary:        Help Browser for the GNOME Desktop
-Source:         
ftp://ftp.gnome.org/pub/GNOME/sources/yelp/2.12/%{name}-%{version}.tar.bz2
+Source:         
http://download.gnome.org/sources/yelp/3.1/%{name}-%{version}.tar.bz2
 Url:            http://www.gnome.org
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 # PATCH-FEATURE-OPENSUSE yelp-2.13.5-use-susehelp.patch -- make gnome-help a 
symlink to susehelp for better cross-desktop compatibility
-Patch6:         yelp-2.13.5-use-susehelp.patch
-# PATCH-NEEDS-REBASE yelp-handle-help-uri.patch [email protected] -- handle 
help: URI (WAS: PATCH-FEATURE-OPENSUSE)
-Patch9:         yelp-handle-help-uri.patch
+Patch0:         yelp-2.13.5-use-susehelp.patch
+# PATCH-FEATURE-OPENSUSE yelp-lang-bundle.patch bnc#689979 [email protected] 
-- Support help documents shipped in bundles
+Patch1:         yelp-lang-bundle.patch
 Provides:       suse_help_viewer
 Requires:       susehelp
 # We need the stylesheets from yelp-xsl
@@ -81,12 +81,11 @@
 %prep
 %setup -q
 translation-update-upstream
-%patch6 -p1
-# need rebase
-#%patch9 -p1
+%patch0 -p1
+%patch1 -p1
 
 %build
-# needed by patch6
+# needed by patch0
 autoreconf
 %configure --disable-static
 make %{?jobs:-j%jobs}

++++++ yelp-3.1.1.tar.bz2 -> yelp-3.1.3.tar.bz2 ++++++
++++ 34070 lines of diff (skipped)

++++++ yelp-lang-bundle.patch ++++++
Index: yelp-3.1.3/libyelp/yelp-uri.c
===================================================================
--- yelp-3.1.3.orig/libyelp/yelp-uri.c
+++ yelp-3.1.3/libyelp/yelp-uri.c
@@ -623,8 +623,21 @@ resolve_data_dirs (YelpUri      *ret,
                                                langfirst ? docid : 
langs[lang_i],
                                                NULL);
             if (!g_file_test (helpdir, G_FILE_TEST_IS_DIR)) {
+                gchar *bundle_subdir = g_strdup_printf ("%s-bundle", subdir);
+
                 g_free (helpdir);
-                continue;
+
+                helpdir = g_build_filename (datadirs[datadir_i],
+                                            bundle_subdir,
+                                            langfirst ? langs[lang_i] : docid,
+                                            langfirst ? docid : langs[lang_i],
+                                            NULL);
+                g_free (bundle_subdir);
+
+                if (!g_file_test (helpdir, G_FILE_TEST_IS_DIR)) {
+                    g_free (helpdir);
+                    continue;
+                }
             }
 
             if (searchi + 1 >= searchmax) {

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to