Author: jdsn Date: Tue Oct 18 17:22:33 2011 New Revision: 66486 URL: http://svn.opensuse.org/viewcvs/yast?rev=66486&view=rev Log: use latest xulrunner 1.9.2 for yastbrowser (bnc#724209) 2.17.35.3 Modified: branches/SuSE-Code-11-SP1-Branch/registration/VERSION branches/SuSE-Code-11-SP1-Branch/registration/package/yast2-registration.changes branches/SuSE-Code-11-SP1-Branch/registration/src/clients/inst_suse_register.ycp branches/SuSE-Code-11-SP1-Branch/registration/yast2-registration.spec.in Modified: branches/SuSE-Code-11-SP1-Branch/registration/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/registration/VERSION?rev=66486&r1=66485&r2=66486&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/registration/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/registration/VERSION Tue Oct 18 17:22:33 2011 @@ -1 +1 @@ -2.17.35.2 +2.17.35.3 Modified: branches/SuSE-Code-11-SP1-Branch/registration/package/yast2-registration.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/registration/package/yast2-registration.changes?rev=66486&r1=66485&r2=66486&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/registration/package/yast2-registration.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/registration/package/yast2-registration.changes Tue Oct 18 17:22:33 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Oct 14 17:52:05 CEST 2011 - jdsn@suse.de + +- use latest xulrunner 1.9.2 for yastbrowser (bnc#724209) +- 2.17.35.3 + +------------------------------------------------------------------- Thu Jun 30 21:21:56 CEST 2011 - jdsn@suse.de - cleanup xauth export after interactive registration (bnc#702638) Modified: branches/SuSE-Code-11-SP1-Branch/registration/src/clients/inst_suse_register.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/registration/src/clients/inst_suse_register.ycp?rev=66486&r1=66485&r2=66486&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/registration/src/clients/inst_suse_register.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/registration/src/clients/inst_suse_register.ycp Tue Oct 18 17:22:33 2011 @@ -551,19 +551,20 @@ else { bcmd = " MOZ_DISABLE_PANGO=1 /usr/bin/xulrunner /usr/share/YaST2/yastbrowser/application.ini -url "; - required_package = "mozilla-xulrunner190"; + required_package = "mozilla-xulrunner192"; checkBinary = "/usr/bin/xulrunner"; } // (bnc#443781) - cmd_ok = (integer) SCR::Execute(.target.bash, sformat("test -x %1", checkBinary)) == 0 ? true:false; + // updating to xulrunner 1.9.2 (bnc#724209) + cmd_ok = (integer) SCR::Execute(.target.bash, sformat("test -x %1 && %2 -v 2>&1 | grep -qi \"^Mozilla XULRunner 1.9\" ", checkBinary, checkBinary)) == 0 ? true:false; if ( ! cmd_ok ) { if (!Package::Installed(required_package)) { Package::InstallAllMsg([required_package], nil); } - cmd_ok = (integer) SCR::Execute(.target.bash, sformat("test -x %1", checkBinary)) == 0 ? true:false; + cmd_ok = (integer) SCR::Execute(.target.bash, sformat("test -x %1 && %2 -v 2>&1 | grep -qi \"^Mozilla XULRunner 1.9\" ", checkBinary, checkBinary)) == 0 ? true:false; } if ( ! cmd_ok ) Modified: branches/SuSE-Code-11-SP1-Branch/registration/yast2-registration.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/registration/yast2-registration.spec.in?rev=66486&r1=66485&r2=66486&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/registration/yast2-registration.spec.in (original) +++ branches/SuSE-Code-11-SP1-Branch/registration/yast2-registration.spec.in Tue Oct 18 17:22:33 2011 @@ -25,7 +25,7 @@ Requires: perl-TimeDate limal limal-perl limal-ca-mgm-perl Requires: yast2-pkg-bindings >= 2.17.20 Requires: yast2-registration-branding -Requires(post): sed grep +Requires(post): sed ## do never require "mozilla-xulrunner190" (bnc#436900) PreReq: %fillup_prereq @@ -42,7 +42,7 @@ Source1: org.opensuse.yast.modules.ysr.policy %description -Performs the Registration +Performs the Registration of the installed system in order to receive updates and support @PREP@ @@ -60,6 +60,7 @@ Requires: yast2-registration Provides: yast2-registration-branding Conflicts: otherproviders(yast2-registration-branding) +Supplements:packageand(yast2-registration:branding-SLE) Summary: Branding for yast2-registration for SLE products Group: System/YaST %description branding-SLE @@ -69,6 +70,7 @@ Requires: yast2-registration Provides: yast2-registration-branding Conflicts: otherproviders(yast2-registration-branding) +Supplements:packageand(yast2-registration:branding-openSUSE) Summary: Branding for yast2-registration for openSUSE Group: System/YaST %description branding-openSUSE -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org