[yast-commit] [ci_new_pac] JFYI yast2-ntp-client -> sle12
Script 'mail_helper' called by ro Hello packager, This is just FYI. Your package was checked in in distribution "sle12" by autobuild-member: ro. Here comes the log... ---------------------------%<------------------------------ Hi, here is the log from ci_new_pac /mounts/work_src_done/SLE12/yast2-ntp-client -> sle12 ## BNC# 871367 : "yast2-ntp-client configures not existant feature in ntp" (NEW/) Changes: -------- --- /work/SRC/SUSE:SLE-12:GA/yast2-ntp-client/yast2-ntp-client.changes 2014-03-28 16:30:52.000000000 +0100 +++ /mounts/work_src_done/SLE12/yast2-ntp-client/yast2-ntp-client.changes 2014-04-01 13:41:55.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Apr 1 11:22:41 UTC 2014 - coolo@suse.com + +- adapt to new ntp service name (see bnc#871367) +- 3.1.6 + +------------------------------------------------------------------- calling whatdependson for sle12-i586 Packages directly triggered for rebuild: - yast2-ntp-client - yast2-schema ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/SUSE:SLE-12:GA/yast2-ntp-client (Old) and /mounts/work_src_done/SLE12/yast2-ntp-client (BS:build ID:35314 MAIL:yast-commit@opensuse.org) (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-ntp-client", Maintainer is "yast-commit@opensuse.org" Old: ---- yast2-ntp-client-3.1.5.tar.bz2 New: ---- yast2-ntp-client-3.1.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ntp-client.spec ++++++ --- /var/tmp/diff_new_pack.HvY5Gd/_old 2014-04-01 14:49:33.000000000 +0200 +++ /var/tmp/diff_new_pack.HvY5Gd/_new 2014-04-01 14:49:33.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package yast2-ntp-client # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 @@ -17,15 +17,13 @@ Name: yast2-ntp-client -Version: 3.1.5 +Version: 3.1.6 Release: 0 - +Summary: YaST2 - NTP Client Configuration +License: GPL-2.0+ +Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %{name}-%{version}.tar.bz2 - - -Group: System/YaST -License: GPL-2.0+ BuildRequires: perl-XML-Writer BuildRequires: update-desktop-files BuildRequires: yast2 >= 3.1.11 @@ -37,20 +35,17 @@ # Wizard::SetDesktopTitleAndIcon Requires: yast2 >= 3.1.11 Requires: yast2-country-data - -BuildArch: noarch - Requires: yast2-ruby-bindings >= 1.0.0 +BuildArch: noarch -Summary: YaST2 - NTP Client Configuration %description This package contains the YaST2 component for NTP client configuration. %package devel-doc Requires: yast2-ntp-client = %version -Group: System/YaST Summary: YaST2 - NTP Client - Development Documentation +Group: System/YaST %description devel-doc This package contains development documentation for using the API @@ -65,7 +60,6 @@ %install %yast_install - %files %defattr(-,root,root) %dir %{yast_yncludedir}/ntp-client ++++++ yast2-ntp-client-3.1.5.tar.bz2 -> yast2-ntp-client-3.1.6.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ntp-client-3.1.5/package/yast2-ntp-client.changes new/yast2-ntp-client-3.1.6/package/yast2-ntp-client.changes --- old/yast2-ntp-client-3.1.5/package/yast2-ntp-client.changes 2014-03-28 14:35:00.000000000 +0100 +++ new/yast2-ntp-client-3.1.6/package/yast2-ntp-client.changes 2014-04-01 13:38:19.000000000 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Apr 1 11:22:41 UTC 2014 - coolo@suse.com + +- adapt to new ntp service name (see bnc#871367) +- 3.1.6 + +------------------------------------------------------------------- Fri Mar 28 13:31:07 UTC 2014 - vmoravec@suse.com - Fix failing testsuite diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ntp-client-3.1.5/package/yast2-ntp-client.spec new/yast2-ntp-client-3.1.6/package/yast2-ntp-client.spec --- old/yast2-ntp-client-3.1.5/package/yast2-ntp-client.spec 2014-03-28 14:35:00.000000000 +0100 +++ new/yast2-ntp-client-3.1.6/package/yast2-ntp-client.spec 2014-04-01 13:38:19.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package yast2-ntp-client # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 @@ -17,15 +17,13 @@ Name: yast2-ntp-client -Version: 3.1.5 +Version: 3.1.6 Release: 0 - +Summary: YaST2 - NTP Client Configuration +License: GPL-2.0+ +Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: %{name}-%{version}.tar.bz2 - - -Group: System/YaST -License: GPL-2.0+ BuildRequires: perl-XML-Writer BuildRequires: update-desktop-files BuildRequires: yast2 >= 3.1.11 @@ -36,21 +34,18 @@ # Hostname::CurrentDomain # Wizard::SetDesktopTitleAndIcon Requires: yast2 >= 3.1.11 -Requires: yast2-country-data - -BuildArch: noarch - +Requires: yast2-country-data Requires: yast2-ruby-bindings >= 1.0.0 +BuildArch: noarch -Summary: YaST2 - NTP Client Configuration %description This package contains the YaST2 component for NTP client configuration. %package devel-doc Requires: yast2-ntp-client = %version -Group: System/YaST Summary: YaST2 - NTP Client - Development Documentation +Group: System/YaST %description devel-doc This package contains development documentation for using the API @@ -65,7 +60,6 @@ %install %yast_install - %files %defattr(-,root,root) %dir %{yast_yncludedir}/ntp-client diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ntp-client-3.1.5/src/modules/NtpClient.rb new/yast2-ntp-client-3.1.6/src/modules/NtpClient.rb --- old/yast2-ntp-client-3.1.5/src/modules/NtpClient.rb 2014-03-28 14:35:00.000000000 +0100 +++ new/yast2-ntp-client-3.1.6/src/modules/NtpClient.rb 2014-04-01 13:38:19.000000000 +0200 @@ -67,7 +67,7 @@ @cron_file = "/etc/cron.d/novell.ntp-synchronize" # Service name of the NTP daemon - @service_name = "ntp" + @service_name = "ntpd" # Should the daemon be started in chroot environment? @run_chroot = false @@ -858,17 +858,23 @@ Progress.set(progress_orig) end - if !Service.Adjust(@service_name, @run_service ? "enable" : "disable") + adjusted = false + if @run_service && Service.Enable(@service_name) + adjusted = true + end + if !@run_service && Service.Disable(@service_name) + adjusted = true + end + unless adjusted # error report Report.Error(Message.CannotAdjustService("NTP")) end - if @run_service && !@write_only && - 0 != Service.RunInitScript(@service_name, "restart") + if @run_service && !@write_only && Service.Restart(@service_name) # error report Report.Error(_("Cannot restart the NTP daemon.")) end - Service.RunInitScript(@service_name, "stop") if !@run_service + Service.Stop(@service_name) if !@run_service if @synchronize_time SCR.Write( path(".target.string"), continue with "q"... Checked in at Tue Apr 1 14:49:49 CEST 2014 by ro Remember to have fun... -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org
participants (1)
-
ro