Hello community, here is the log from the commit of package rarian checked in at Mon Nov 3 14:19:41 CET 2008. -------- --- GNOME/rarian/rarian.changes 2008-09-18 21:28:49.000000000 +0200 +++ /mounts/work_src_done/STABLE/rarian/rarian.changes 2008-10-31 06:28:36.000000000 +0100 @@ -1,0 +2,11 @@ +Fri Oct 31 06:27:01 CET 2008 - vuntz@novell.com + +- Update rarian-opensuse-manuals.patch: no need to output an error + for many localized files we won't file anyway. +- Add rarian-no-warning-X-lines.patch to make rarian not output + a warning for lines starting with X-. +- Add rarian-no-warning-desktop-entry.patch to make rarian not + output a warning for standard .desktop entry keys (since we make + it parse the .desktop files). + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- rarian-no-warning-desktop-entry.patch rarian-no-warning-X-lines.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rarian.spec ++++++ --- /var/tmp/diff_new_pack.I18928/_old 2008-11-03 14:19:25.000000000 +0100 +++ /var/tmp/diff_new_pack.I18928/_new 2008-11-03 14:19:25.000000000 +0100 @@ -28,7 +28,7 @@ BuildRequires: sgml-skel Summary: Rarian is designed to be a replacement for scrollkeeper Version: 0.8.1 -Release: 4 +Release: 5 Source0: %{name}-%{version}.tar.bz2 Patch1: rarian-0.5.6-reg-parse-bugs.patch Patch2: rarian-0.7.1-return.patch @@ -37,6 +37,10 @@ Patch4: rarian-opensuse-manuals.patch # PATCH-FIX-OPENSUSE rarian-help-bundle.patch vuntz@novell.com -- Grab manual in /usr/share/gnome/help-bundle when it makes sense Patch5: rarian-help-bundle.patch +# PATCH-FIX-UPSTREAM rarian-no-warning-X-lines.patch bfo18317 vuntz@novell.com -- No warning on X- lines +Patch6: rarian-no-warning-X-lines.patch +# PATCH-FIX-OPENSUSE rarian-no-warning-desktop-entry.patch vuntz@novell.com -- We have a patch to read .desktop file, but we don't want lots of warnings because of this... +Patch7: rarian-no-warning-desktop-entry.patch License: GPL v2 or later; LGPL v2.1 or later Group: Development/Libraries/C and C++ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -89,6 +93,8 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 +%patch7 -p1 %build %configure --disable-static --with-pic --disable-scrollkeeper-compat @@ -122,10 +128,18 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Fri Oct 31 2008 vuntz@novell.com +- Update rarian-opensuse-manuals.patch: no need to output an error + for many localized files we won't file anyway. +- Add rarian-no-warning-X-lines.patch to make rarian not output + a warning for lines starting with X-. +- Add rarian-no-warning-desktop-entry.patch to make rarian not + output a warning for standard .desktop entry keys (since we make + it parse the .desktop files). * Thu Sep 18 2008 jpr@novell.com - Remove parts of rarian-0.5.6-reg-parse-bugs.patch that are being applied upstream now and were causing a crash -* Wed Sep 10 2008 maw@suse.de +* Thu Sep 11 2008 maw@suse.de - Update to version 0.8.1: + Bugs fixed: bfo#15755, bfo#15654, bfo#15274, bfo#11839, bfo#14872, and bfo#12515. @@ -144,7 +158,7 @@ - Add rarian-opensuse-manuals.patch to list openSUSE manuals. This is a temporary fix, until we can get the manuals packages to install rarian metadata files. -* Tue Apr 22 2008 vuntz@suse.de +* Wed Apr 23 2008 vuntz@suse.de - Update rarian-0.5.6-docs-from-desktop-entries-and-bundles.patch to use help: URI instead of ghelp: URI when creating an entry from a desktop file. Yelp won't understand those ghelp: URI, so @@ -175,7 +189,7 @@ * Fix copyright headers * Fallback languages now work correctly * Fix potential off-by-one issue in sk-preinstall -* Thu Sep 13 2007 hpj@suse.de +* Fri Sep 14 2007 hpj@suse.de - Add --disable-scrollkeeper-compat flag, so we don't get binaries that conflict with scrollkeeper's. * Mon Sep 10 2007 maw@suse.de @@ -194,7 +208,7 @@ rolled them into the same patch. - Rename rarian-0.5.6-eof-crash.patch to rarian-0.5.6-reg-parse-bugs.patch. -* Tue Sep 04 2007 maw@suse.de +* Wed Sep 05 2007 maw@suse.de - Respin rarian-0.5.6-docs-from-desktop-entries.patch, teaching rarian to look inside help-bundle in addition to help subdirectories; rename it to @@ -206,7 +220,7 @@ (bugs.freedesktop.org #12226). - Add rarian-0.5.6-docs-from-desktop-entries.patch, which lets us find documentation specified by applications' .desktop files. -* Fri Aug 03 2007 maw@suse.de +* Sat Aug 04 2007 maw@suse.de - BuildRequire gcc-c++ and pkg-config - s#%%run_ldconfig#/sbin/ldconfig# in %%post and add it to %%postun - Add abuild.patch ++++++ rarian-no-warning-desktop-entry.patch ++++++ Index: rarian-0.8.1/librarian/rarian-reg-utils.c =================================================================== --- rarian-0.8.1.orig/librarian/rarian-reg-utils.c +++ rarian-0.8.1/librarian/rarian-reg-utils.c @@ -505,6 +505,25 @@ process_pair (RrnReg *reg, char *key, ch reg->identifier = strdup (value); } else if (!strcmp (key, "X-DOC-Weight")) { reg->weight = atoi (value); + } else if (!strcmp (key, "Exec") || + !strcmp (key, "Encoding") || + !strcmp (key, "Exec") || + !strcmp (key, "FilePattern") || + !strncmp (key, "GenericName", strlen ("GenericName")) || + !strcmp (key, "Hidden") || + !strcmp (key, "MimeType") || + !strcmp (key, "NotShowIn") || + !strcmp (key, "Path") || + !strcmp (key, "OnlyShowIn") || + !strcmp (key, "StartupNotify") || + !strcmp (key, "SwallowExec") || + !strcmp (key, "SwallowTitle") || + !strcmp (key, "Terminal") || + !strcmp (key, "TryExec") || + !strcmp (key, "Type") || + !strcmp (key, "Version") || + 0) { + /* ignore */ } else if (!strncmp (key, "X-", 2)) { /* ignore */ } else { ++++++ rarian-no-warning-X-lines.patch ++++++ Index: rarian-0.8.1/librarian/rarian-reg-full.c =================================================================== --- rarian-0.8.1.orig/librarian/rarian-reg-full.c +++ rarian-0.8.1/librarian/rarian-reg-full.c @@ -338,6 +338,8 @@ process_pair_full (RrnRegFull *reg, char } } else if (!strcmp (key, "Icon")){ reg->icon = strdup (value); + } else if (!strncmp (key, "X-", 2)) { + /* ignore */ } else { fprintf (stderr, "WARNING: Unknown element %s: %s\n", key, value); } @@ -627,6 +629,8 @@ process_sect_pair_full (RrnSectFull *sec sect->uri = rrn_full_add_field (sect->uri, value, lang); } else if (!strcmp (key, "SectionDocument") || !strcmp (key, "sectiondocument")) { sect->owner = strdup (value); + } else if (!strncmp (key, "X-", 2)) { + /* ignore */ } else { fprintf (stderr, "WARNING: Unknown element for section %s: %s\n", key, value); } Index: rarian-0.8.1/librarian/rarian-reg-utils.c =================================================================== --- rarian-0.8.1.orig/librarian/rarian-reg-utils.c +++ rarian-0.8.1/librarian/rarian-reg-utils.c @@ -505,6 +505,8 @@ process_pair (RrnReg *reg, char *key, ch reg->identifier = strdup (value); } else if (!strcmp (key, "X-DOC-Weight")) { reg->weight = atoi (value); + } else if (!strncmp (key, "X-", 2)) { + /* ignore */ } else { fprintf (stderr, "WARNING: Unknown element %s: %s\n", key, value); } @@ -847,6 +849,8 @@ process_sect_pair (RrnSect *sect, char * process_field (&(sect->uri), NULL, key, value); } else if (!strcmp (key, "SectionDocument") || !strcmp (key, "sectiondocument")) { sect->owner = strdup (value); + } else if (!strncmp (key, "X-", 2)) { + /* ignore */ } else { fprintf (stderr, "WARNING: Unknown element for section %s: %s\n", key, value); } ++++++ rarian-opensuse-manuals.patch ++++++ --- /var/tmp/diff_new_pack.I18928/_old 2008-11-03 14:19:26.000000000 +0100 +++ /var/tmp/diff_new_pack.I18928/_new 2008-11-03 14:19:26.000000000 +0100 @@ -1,6 +1,7 @@ -diff -aurp rarian-0.7.1/librarian/rarian-main.c rarian-0.7.1-patched/librarian/rarian-main.c ---- rarian-0.7.1/librarian/rarian-main.c 2008-04-24 13:49:01.000000000 +0200 -+++ rarian-0.7.1-patched/librarian/rarian-main.c 2008-04-24 13:45:49.000000000 +0200 +Index: rarian-0.8.1/librarian/rarian-main.c +=================================================================== +--- rarian-0.8.1.orig/librarian/rarian-main.c ++++ rarian-0.8.1/librarian/rarian-main.c @@ -76,6 +76,7 @@ static void process_locale_dirs (char * #if ENABLE_OMF_READ static void process_omf_dir (char *dir); @@ -18,7 +19,7 @@ if (int_path && *int_path) { free (int_path); } -@@ -639,3 +642,90 @@ rrn_shutdown () +@@ -640,3 +643,90 @@ rrn_shutdown () head = tail = NULL; return; } @@ -109,9 +110,10 @@ + + insert_orphans (); +} -diff -aurp rarian-0.7.1/librarian/rarian-reg-utils.c rarian-0.7.1-patched/librarian/rarian-reg-utils.c ---- rarian-0.7.1/librarian/rarian-reg-utils.c 2008-04-24 13:49:01.000000000 +0200 -+++ rarian-0.7.1-patched/librarian/rarian-reg-utils.c 2008-04-24 13:25:25.000000000 +0200 +Index: rarian-0.8.1/librarian/rarian-reg-utils.c +=================================================================== +--- rarian-0.8.1.orig/librarian/rarian-reg-utils.c ++++ rarian-0.8.1/librarian/rarian-reg-utils.c @@ -37,6 +37,7 @@ static void process_sect_pair (RrnSe static int rrn_reg_add_sect (RrnReg *reg, RrnSect *sect); static void process_path (RrnReg *reg); @@ -132,7 +134,7 @@ + char *buf; + + if (access(filename, R_OK)) { -+ fprintf (stderr, "WARNING: cannot access file %s\n", filename); ++ /* fprintf (stderr, "WARNING: cannot access file %s\n", filename); */ + return NULL; + } + reg = rrn_reg_new (); @@ -241,7 +243,7 @@ rrn_reg_parse_file (char *filename) { RrnReg *reg = NULL; -@@ -386,6 +501,12 @@ process_pair (RrnReg *reg, char *key, ch +@@ -384,6 +499,12 @@ process_pair (RrnReg *reg, char *key, ch reg->default_section = strdup (value); } else if (!strcmp (key, "Icon")) { reg->icon = strdup (value); @@ -254,9 +256,10 @@ } else { fprintf (stderr, "WARNING: Unknown element %s: %s\n", key, value); } -diff -aurp rarian-0.7.1/librarian/rarian-reg-utils.h rarian-0.7.1-patched/librarian/rarian-reg-utils.h ---- rarian-0.7.1/librarian/rarian-reg-utils.h 2008-01-07 23:21:51.000000000 +0100 -+++ rarian-0.7.1-patched/librarian/rarian-reg-utils.h 2008-04-24 13:17:41.000000000 +0200 +Index: rarian-0.8.1/librarian/rarian-reg-utils.h +=================================================================== +--- rarian-0.8.1.orig/librarian/rarian-reg-utils.h ++++ rarian-0.8.1/librarian/rarian-reg-utils.h @@ -73,6 +73,7 @@ RrnSect * rrn_sect_new (); RrnReg * rrn_reg_parse_file (char *filename); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org