Mailinglist Archive: opensuse-commit (750 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package rarian for openSUSE:Factory
checked in at Tue Oct 6 02:24:14 CEST 2009.



--------
--- GNOME/rarian/rarian.changes 2009-05-28 18:12:46.000000000 +0200
+++ rarian/rarian.changes       2009-10-02 15:04:15.000000000 +0200
@@ -1,0 +2,7 @@
+Fri Oct  2 14:52:19 CEST 2009 - vuntz@xxxxxxxxxxxx
+
+- Add rarian-no-info.patch to fix a crash of yelp on the livecd
+  because there's no info file. Fix bnc#543130.
+- Add rarian-quiet.patch to remove some debug output.
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


New:
----
  rarian-no-info.patch
  rarian-quiet.patch

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

Other differences:
------------------
++++++ rarian.spec ++++++
--- /var/tmp/diff_new_pack.rcqcuQ/_old  2009-10-06 02:23:35.000000000 +0200
+++ /var/tmp/diff_new_pack.rcqcuQ/_new  2009-10-06 02:23:35.000000000 +0200
@@ -28,7 +28,7 @@
 BuildRequires:  sgml-skel
 Summary:        Rarian is designed to be a replacement for scrollkeeper
 Version:        0.8.1
-Release:        6
+Release:        7
 Source0:        %{name}-%{version}.tar.bz2
 Patch1:         rarian-0.5.6-reg-parse-bugs.patch
 Patch2:         rarian-0.7.1-return.patch
@@ -41,7 +41,11 @@
 Patch6:         rarian-no-warning-X-lines.patch
 # PATCH-FIX-OPENSUSE rarian-no-warning-desktop-entry.patch vuntz@xxxxxxxxxx -- 
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
+# PATCH-FIX-UPSTREAM rarian-no-info.patch fdo24277 vuntz@xxxxxxxxxxxx -- Crash 
when there's no info at all
+Patch8:         rarian-no-info.patch
+# PATCH-FIX-UPSTREAM rarian-quiet.patch fdo24276 vuntz@xxxxxxxxxxxx -- Make 
rarian a bit quieter
+Patch9:         rarian-quiet.patch
+License:        GPL v2 or later ; LGPL v2.1 or later
 Group:          Development/Libraries/C and C++
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Url:            ftp://ftp.gnome.org/pub/gnome/sources/rarian/
@@ -53,14 +57,8 @@
 installed in place of scrollkeeper and everything will work okay (as
 far as my testing indicates)
 
-
-
-Authors:
---------
-    Don Scorgie  <Don@xxxxxxxxxxx>
-
 %package scrollkeeper-compat
-License:        GPL v2 or later; LGPL v2.1 or later
+License:        GPL v2 or later ; LGPL v2.1 or later
 Requires:       %{name} = %{version}
 Summary:        Rarian is designed to be a replacement for scrollkeeper
 Group:          Development/Libraries/C and C++
@@ -78,12 +76,6 @@
 installed in place of scrollkeeper and everything will work okay (as
 far as my testing indicates)
 
-
-
-Authors:
---------
-    Don Scorgie  <Don@xxxxxxxxxxx>
-
 %package devel
 License:        GPL v2 only
 Requires:       %{name} = %{version}
@@ -98,15 +90,8 @@
 This package contains the files for developing applications using
 rarian.
 
-
-
-Authors:
---------
-    Don Scorgie  <Don@xxxxxxxxxxx>
-
 %prep
 %setup -q
-#%setup -q -a 1
 %patch1 -p1
 %patch2
 %patch3 -p1
@@ -114,6 +99,8 @@
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
+%patch9 -p1
 
 %build
 %configure --disable-static --with-pic

++++++ rarian-no-info.patch ++++++
Index: rarian-0.8.1/librarian/rarian-info.c
===================================================================
--- rarian-0.8.1.orig/librarian/rarian-info.c
+++ rarian-0.8.1/librarian/rarian-info.c
@@ -507,12 +507,16 @@ process_info_dir (const char *dir)
       /* Blank line, ignore */
     }
   }
-  if (process_check_file()) {
-    process_add_entry ();
-  } else {
-    free_entry (current_entry);
+
+  if (current_entry) {
+    if (process_check_file()) {
+      process_add_entry ();
+    } else {
+      free_entry (current_entry);
+    }
+    current_entry = NULL;
   }
-  current_entry = NULL;
+
   free (line);
   fclose(fp);
   free (filename);
++++++ rarian-quiet.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
@@ -170,7 +170,7 @@ rrn_reg_parse_suse_manual (char *filenam
                reg->identifier = malloc (sizeof (char)*(strlen(basename)+11));
                sprintf (reg->identifier, "org.other.%s", basename);
                free (basename);
-               printf ("identifier is %s\n", reg->identifier);
+               /* printf ("identifier is %s\n", reg->identifier); */
 
        }
        if (reg)
@@ -321,7 +321,7 @@ rrn_reg_parse_file (char *filename)
                reg->identifier = malloc (sizeof (char)*(strlen(basename)+11));
                sprintf (reg->identifier, "org.other.%s", basename);
                free (basename);
-               printf ("identifier is %s\n", reg->identifier);
+               /* printf ("identifier is %s\n", reg->identifier); */
 
        }
        if (reg)

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



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx