Hello community,

here is the log from the commit of package grub2 for openSUSE:Factory checked 
in at 2014-04-26 11:44:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
 and      /work/SRC/openSUSE:Factory/.grub2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "grub2"

Changes:
--------
--- /work/SRC/openSUSE:Factory/grub2/grub2.changes      2014-04-12 
22:03:23.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2014-04-26 
11:44:56.000000000 +0200
@@ -1,0 +2,9 @@
+Tue Apr 15 08:36:46 UTC 2014 - tchva...@suse.com
+
+- Fix sorting of RC kernels to be older than first regular of the
+  series. Fixes bnc#827531.
+
+- added patches:
+  * grub2-use-rpmsort-for-version-sorting.patch
+
+-------------------------------------------------------------------

New:
----
  grub2-use-rpmsort-for-version-sorting.patch

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

Other differences:
------------------
++++++ grub2.spec ++++++
--- /var/tmp/diff_new_pack.D2OAl1/_old  2014-04-26 11:44:58.000000000 +0200
+++ /var/tmp/diff_new_pack.D2OAl1/_new  2014-04-26 11:44:58.000000000 +0200
@@ -139,6 +139,7 @@
 Patch36:        0001-look-for-DejaVu-also-in-usr-share-fonts-truetype.patch
 Patch37:        grub2-use-Unifont-for-starfield-theme-terminal.patch
 Patch38:        
grub2-s390x-01-Changes-made-and-files-added-in-order-to-allow-s390x.patch
+Patch39:        grub2-use-rpmsort-for-version-sorting.patch
 # Btrfs snapshot booting related patches
 Patch101:       0002-btrfs-add-ability-to-boot-from-subvolumes.patch
 Patch102:       0003-cmdline-add-envvar-loader_cmdline_append.patch
@@ -329,6 +330,7 @@
 %patch36 -p1
 %patch37 -p1
 %patch38 -p1
+%patch39 -p1
 %patch101 -p1
 %patch102 -p1
 %patch103 -p1

++++++ grub2-use-rpmsort-for-version-sorting.patch ++++++
diff -urN grub-2.02~beta2.old/util/grub-mkconfig_lib.in 
grub-2.02~beta2/util/grub-mkconfig_lib.in
--- grub-2.02~beta2.old/util/grub-mkconfig_lib.in       2014-04-11 
15:20:42.451394845 +0200
+++ grub-2.02~beta2/util/grub-mkconfig_lib.in   2014-04-11 15:58:02.940618803 
+0200
@@ -229,7 +229,7 @@
     version_test_numeric_a="$version_test_numeric_b"
     version_test_numeric_b="$version_test_numeric_c"
   fi
-  if (echo "$version_test_numeric_a" ; echo "$version_test_numeric_b") | 
version_sort | head -n 1 | grep -qx "$version_test_numeric_b" ; then
+  if [ "`printf '%s\n' "$version_test_gt_a" "$version_test_gt_b" | 
/usr/lib/rpm/rpmsort -r | head -n1`" = "$version_test_gt_a" ] ; then
     return 0
   else
     return 1
-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to