Hello community, here is the log from the commit of package compcache for openSUSE:Factory checked in at 2012-01-10 14:50:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/compcache (Old) and /work/SRC/openSUSE:Factory/.compcache.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "compcache", Maintainer is "tiwai@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/compcache/compcache.changes 2011-09-23 01:53:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.compcache.new/compcache.changes 2012-01-10 14:50:46.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Jan 9 16:22:15 CET 2012 - tiwai@suse.de + +- fix init script for 3.x kernel (bnc#739584) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ compcache.spec ++++++ --- /var/tmp/diff_new_pack.wgYKeK/_old 2012-01-10 14:50:48.000000000 +0100 +++ /var/tmp/diff_new_pack.wgYKeK/_new 2012-01-10 14:50:48.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package compcache # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -14,9 +14,9 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - # nodebuginfo + %if %suse_version <= 1120 %define need_kmp 1 %else @@ -31,13 +31,15 @@ Name: compcache %if %need_kmp -BuildRequires: kernel-source kernel-syms module-init-tools +BuildRequires: kernel-source +BuildRequires: kernel-syms +BuildRequires: module-init-tools %endif -License: GPL-2.0 -Group: System/Kernel Version: 0.6.2 -Release: 6 +Release: 0 Summary: Compressed RAM based swap device +License: GPL-2.0 +Group: System/Kernel Source0: compcache-%{version}.tar.bz2 Source1: sysconfig.compcache Source2: boot.compcache @@ -66,7 +68,6 @@ %if %need_kmp %package KMP -License: GPL-2.0 Summary: Kernel module for compressed RAM based swap device Group: System/Kernel ++++++ boot.compcache ++++++ --- /var/tmp/diff_new_pack.wgYKeK/_old 2012-01-10 14:50:48.000000000 +0100 +++ /var/tmp/diff_new_pack.wgYKeK/_new 2012-01-10 14:50:48.000000000 +0100 @@ -30,15 +30,25 @@ kver=$(uname -r) kver=${kver%%-*} -krel=${kver#2.6.} -krel=${krel%%.*} -if [ "$krel" -ge 36 ]; then - ZRAM=zram - SWAPDEVNM=/dev/zram -else - ZRAM=ramzswap - SWAPDEVNM=/dev/ramzswap -fi +case "$kver" in + 3.*) + ZRAM=zram + SWAPDEVNM=/dev/zram + ;; + 2.6.*) + krel=${kver#2.6.} + krel=${krel%%.*} + if [ "$krel" -ge 36 ]; then + ZRAM=zram + SWAPDEVNM=/dev/zram + else + ZRAM=ramzswap + SWAPDEVNM=/dev/ramzswap + fi + ;; + *) + exit 1;; +esac is_comp_swap_on () { grep -q $1 /proc/swaps -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org