rpms/system-config-date/F-8 scd-no-xen-error.patch, NONE, 1.1 system-config-date.spec, 1.85, 1.86

Jeremy Katz (katzj) fedora-extras-commits at redhat.com
Tue Oct 30 21:17:42 UTC 2007


Author: katzj

Update of /cvs/pkgs/rpms/system-config-date/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8048

Modified Files:
	system-config-date.spec 
Added Files:
	scd-no-xen-error.patch 
Log Message:
* Tue Oct 30 2007 Jeremy Katz <katzj at redhat.com> - 1.9.15-2
- don't show error on syncing hardware clock to avoid problems when 
  running on xen (#357311)


scd-no-xen-error.patch:

--- NEW FILE scd-no-xen-error.patch ---
diff -r 90c72002b72e src/scdMainWindow.py
--- a/src/scdMainWindow.py	Tue Oct 23 17:13:12 2007 +0200
+++ b/src/scdMainWindow.py	Tue Oct 30 17:11:34 2007 -0400
@@ -97,9 +97,7 @@ class scdMainWindow:
             if not self.dateBackend.writeDateConfig (sysDate, sysTime):
                 self.showErrorDialog (_("Failed to set time and date."))
                 return
-            if not self.dateBackend.syncHardwareClock ():
-                self.showErrorDialog (_("Failed to synchronize hardware clock."))
-                return
+            self.dateBackend.syncHardwareClock ()
             self.closeParent = True
             self.dateBackend.chkconfigOff ()
 


Index: system-config-date.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/F-8/system-config-date.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- system-config-date.spec	23 Oct 2007 15:08:03 -0000	1.85
+++ system-config-date.spec	30 Oct 2007 21:17:10 -0000	1.86
@@ -1,7 +1,7 @@
 Summary: A graphical interface for modifying system date and time
 Name: system-config-date
 Version: 1.9.15
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/date
 License: GPLv2+
 Group: System Environment/Base
@@ -10,6 +10,7 @@
 # We are upstream, thus the source is only available from within this source
 # package.
 Source0: %{name}-%{version}.tar.bz2
+Patch0: scd-no-xen-error.patch
 Obsoletes: timetool < 3.0
 Obsoletes: dateconfig < 1.2
 Obsoletes: timeconfig < 3.2.10
@@ -49,6 +50,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 make %{?_smp_mflags}
@@ -102,6 +104,10 @@
 %config(noreplace) %{_sysconfdir}/ntp/ntpservers
 
 %changelog
+* Tue Oct 30 2007 Jeremy Katz <katzj at redhat.com> - 1.9.15-2
+- don't show error on syncing hardware clock to avoid problems when 
+  running on xen (#357311)
+
 * Tue Oct 23 2007 Nils Philippsen <nphilipp at redhat.com> 1.9.15-1
 - cope with comments in /etc/ntp/step-tickers (#333881)
 




More information about the fedora-extras-commits mailing list