- rel 2; treat kver 3.x just like 2.6

Changed files:
    laptop-mode-tools-kver.patch -> 1.1
    laptop-mode-tools.spec -> 1.26

diff --git a/laptop-mode-tools-kver.patch b/laptop-mode-tools-kver.patch
new file mode 100644 (file)
index 0000000..7472262
--- /dev/null
+++ b/laptop-mode-tools-kver.patch
@@ -0,0 +1,30 @@
+--- laptop-mode-tools_1.57/usr/sbin/laptop_mode~       2011-02-27 08:22:20.000000000 +0100
++++ laptop-mode-tools_1.57/usr/sbin/laptop_mode        2011-06-26 12:17:09.705723581 +0200
+@@ -504,6 +504,7 @@
+     case "$KLEVEL" in
+           "2.4" ) ;;
+           "2.6" ) ;;
++          3.* ) ;;
+           *)
+                   log "ERR" "Unhandled kernel version: $KLEVEL ('uname -r' = '$(uname -r)')" >&2
+                   exit 1
+--- laptop-mode-tools_1.57/usr/share/laptop-mode-tools/modules/laptop-mode~    2011-02-27 08:22:20.000000000 +0100
++++ laptop-mode-tools_1.57/usr/share/laptop-mode-tools/modules/laptop-mode     2011-06-26 12:29:14.496372260 +0200
+@@ -193,7 +193,7 @@
+                       set_sysctl /proc/sys/vm/laptop_mode   1
+                       set_sysctl /proc/sys/vm/bdflush       "30 500 0 0 $AGE $AGE 60 20 0"
+                       ;;
+-              "2.6")
++              "2.6"|3.*)
+                       log "VERBOSE" "Adjusting 2.6 kernel parameters to enable laptop mode."
+                       set_sysctl /proc/sys/vm/laptop_mode               "$LM_SECONDS_BEFORE_SYNC"
+                       set_sysctl /proc/sys/vm/dirty_writeback_centisecs "$AGE"
+@@ -321,7 +321,7 @@
+                       log "VERBOSE" "Adjusting 2.4 kernel parameters to disable laptop mode."
+                       set_sysctl /proc/sys/vm/bdflush "30 500 0 0 $U_AGE $B_AGE 60 20 0"
+                       ;;
+-              "2.6")
++              "2.6"|3.*)
+                       log "VERBOSE" "Adjusting 2.6 kernel parameters to disable laptop mode."
+                       set_sysctl /proc/sys/vm/dirty_writeback_centisecs   "$U_AGE"
+                       set_sysctl /proc/sys/vm/dirty_expire_centisecs      "$B_AGE"

diff --git a/laptop-mode-tools.spec b/laptop-mode-tools.spec
index 96658a942aa373045487bb870390d41d9a8f0415..cf65331b71877dbc84d2784ca91f6340d93fb601 100644 (file)
--- a/laptop-mode-tools.spec
+++ b/laptop-mode-tools.spec
@@ -18,12 +18,13 @@ Summary:    Laptop Mode Tools
 Summary(pl.UTF-8):     Narzędzia do trybu laptopowego
 Name:          laptop-mode-tools
 Version:       1.57
-Release:       1
+Release:       2
 License:       GPL
 Group:         Applications/System
 Source0:       http://samwel.tk/laptop_mode/tools/downloads/%{name}_%{version}.tar.gz
 # Source0-md5: 1d9e4f4e3ff3f16d298e1653483f3f58
 Source1:       %{name}.init
+Patch0:                %{name}-kver.patch
 URL:           http://www.samwel.tk/laptop_mode/
 BuildRequires: rpmbuild(macros) >= 1.268
 Requires(post,preun):  /sbin/chkconfig
@@ -82,6 +83,7 @@ Skrypty APM dla narzędzi do trybu laptopowego.
 
 %prep
 %setup -q -n %{name}_%{version}
+%patch0 -p1
 
 %install
 rm -rf $RPM_BUILD_ROOT