Hello community,

here is the log from the commit of package gkrellm for openSUSE:Factory checked 
in at 2014-06-10 14:38:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gkrellm (Old)
 and      /work/SRC/openSUSE:Factory/.gkrellm.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "gkrellm"

Changes:
--------
--- /work/SRC/openSUSE:Factory/gkrellm/gkrellm.changes  2014-02-19 
06:55:12.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.gkrellm.new/gkrellm.changes     2014-06-10 
14:38:41.000000000 +0200
@@ -1,0 +2,6 @@
+Sun Apr 27 18:41:11 UTC 2014 - [email protected]
+
+- add gkrellm-2.3.5-fix-sdX-sort-order.patch to fix sort order of
+  sda,sdb,sdc,... disks
+
+-------------------------------------------------------------------

New:
----
  gkrellm-2.3.5-fix-sdX-sort-order.patch

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

Other differences:
------------------
++++++ gkrellm.spec ++++++
--- /var/tmp/diff_new_pack.8cOpHh/_old  2014-06-10 14:38:41.000000000 +0200
+++ /var/tmp/diff_new_pack.8cOpHh/_new  2014-06-10 14:38:41.000000000 +0200
@@ -36,6 +36,8 @@
 Patch0:         %{name}-libsensors.patch
 # PATCH-FIX-OPENSUSE gkrellm-lib64-plugins-dir.patch [email protected] -- look 
also into /usr/lib64/gkrellm2/plugins
 Patch1:         %{name}-lib64-plugins-dir.patch
+# PATCH-FIX-OPENSUSE gkrellm-2.3.5-fix-sdX-sort-order.patch 
[email protected] -- fix sort order for scsi-style disks sda,sdb,sdc,...
+Patch2:         %{name}-2.3.5-fix-sdX-sort-order.patch
 BuildRequires:  gtk2-devel
 BuildRequires:  libsensors4-devel
 %if 0%{?suse_version} > 1220
@@ -101,6 +103,7 @@
 %setup -q
 %patch0
 %patch1
+%patch2 -p1
 
 %build
 cd src


++++++ gkrellm-2.3.5-fix-sdX-sort-order.patch ++++++
diff --git a/src/sysdeps/linux.c b/src/sysdeps/linux.c
index 427fe6e..a81305a 100644
--- a/src/sysdeps/linux.c
+++ b/src/sysdeps/linux.c
@@ -484,6 +484,8 @@ gkrellm_sys_disk_order_from_name(const gchar *name)
                }
        if (i >= table_size)
                i = -1;
+       if (i > 9) /* > hda */
+               i += (i - 10) * 16 + suffix - dm->suffix_base;
        return i;
        }
 



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

Reply via email to