- do not write "options i2c-algo-bit bit_test=1" line to

  /etc/modprobe.d/50-tv.conf file, remove the option during upgrade
  (bnc#712023)
- 2.21.4

svn path=/trunk/tv/; revision=66234

VERSION

@@ -1 +1 @@
-2.21.3
+2.21.4

package/yast2-tv.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Oct  4 13:13:35 UTC 2011 - lslezak@suse.cz
+
+- do not write "options i2c-algo-bit bit_test=1" line to 
+  /etc/modprobe.d/50-tv.conf file, remove the option during upgrade
+  (bnc#712023)
+- 2.21.4
+
 -------------------------------------------------------------------
 Thu Sep 22 14:31:32 CEST 2011 - visnov@suse.cz
 

src/Tv.ycp

@@ -1816,9 +1816,6 @@ Use the firmware file anyway?
 	y2debug ("Writing char-major-81 (videodev) to /etc/modprobe.d/50-tv.conf");
 	SCR::Write (.modprobe_tv.alias."char-major-81", "videodev");
 
-	// fix of bug #18033: (slow initialization on some machines)
-	SCR::Write (add(.modprobe_tv.options,"i2c-algo-bit"),$["bit_test":"1"]);
-
 	// reset the old settings (all char-major-81-* aliases)
 	foreach (string alias, GetMajor81Aliases (.modprobe_tv), {
 	    SCR::Write ( add (.modprobe_tv.alias, alias) , nil);

yast2-tv.spec.in

@@ -16,6 +16,7 @@ Provides:	yast2-lib-hardware
 Obsoletes:	yast2-lib-hardware
 Provides:	yast2-trans-tv
 Obsoletes:	yast2-trans-tv
+PreRequires:	sed
 
 BuildArchitectures:	noarch
 
@@ -38,6 +39,12 @@ if test -e /etc/modprobe.d/tv; then
     mv -f /etc/modprobe.d/tv /etc/modprobe.d/50-tv.conf
 fi
 
+# comment out bit_test option (bnc#712023)
+if test -e /etc/modprobe.d/50-tv.conf; then
+    sed -i -e 's/^\([ \t]*options[ \t]*i2c-algo-bit[ \t]*bit_test=1\)/# \1/' /etc/modprobe.d/50-tv.conf
+fi
+
+
 %files
 %defattr(-,root,root)
 %dir @yncludedir@/tv