rpms/system-config-date/devel .cvsignore, 1.117, 1.118 sources, 1.129, 1.130 system-config-date.spec, 1.138, 1.139

[Nils Philippsen]

Author: nphilipp

Update of /cvs/pkgs/rpms/system-config-date/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv8452

Modified Files:
	.cvsignore sources system-config-date.spec 
Log Message:
version 1.9.59


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/devel/.cvsignore,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -p -r1.117 -r1.118
--- .cvsignore	22 Jun 2010 12:45:08 -0000	1.117
+++ .cvsignore	30 Jun 2010 15:06:49 -0000	1.118
@@ -1 +1 @@
-system-config-date-1.9.58.tar.bz2
+system-config-date-1.9.59.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/devel/sources,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -p -r1.129 -r1.130
--- sources	22 Jun 2010 12:45:08 -0000	1.129
+++ sources	30 Jun 2010 15:06:49 -0000	1.130
@@ -1 +1 @@
-1e0c02506af54aec553d5aa2294a8e6d  system-config-date-1.9.58.tar.bz2
+620fccc1b3aa8bfcc36021cb8d83fefc  system-config-date-1.9.59.tar.bz2


Index: system-config-date.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-date/devel/system-config-date.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -p -r1.138 -r1.139
--- system-config-date.spec	22 Jun 2010 12:45:08 -0000	1.138
+++ system-config-date.spec	30 Jun 2010 15:06:49 -0000	1.139
@@ -15,9 +15,16 @@
 %bcond_with console_util
 %endif
 
+# Enterprise versions pull in docs automatically
+%if 0%{?rhel} > 0
+%bcond_without require_docs
+%else
+%bcond_with require_docs
+%endif
+
 Summary: A graphical interface for modifying system date and time
 Name: system-config-date
-Version: 1.9.58
+Version: 1.9.59
 Release: 1%{?dist}
 URL: http://fedorahosted.org/%{name}
 License: GPLv2+
@@ -30,6 +37,9 @@ Source0: http://fedorahosted.org/release
 # package system-config-date-docs. The following ensures that updating from
 # earlier versions gives you both the main package and documentation.
 Obsoletes: system-config-date < 1.9.35
+%if %{with require_docs}
+Requires: system-config-date-docs
+%endif
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
 BuildRequires: intltool
@@ -38,7 +48,7 @@ BuildRequires: python-devel
 
 Requires: ntp
 Requires: python >= 2.0
-Requires: python-slip >= 0.2.3
+Requires: python-slip >= 0.2.11
 Requires: pygtk2 >= 2.12.0
 Requires: pygtk2-libglade
 Requires: gnome-python2-canvas
@@ -119,6 +129,12 @@ fi
 #%{python_sitelib}/scdate.dbus-%{version}-py%{python_version}.egg-info
 
 %changelog
+* Wed Jun 30 2010 Nils Philippsen <nils at redhat.com> - 1.9.59-1
+- require docs in enterprise builds
+- configure iburst mode instead of ntpdate upon boot (original patch by Radek
+  Nováček)
+- fix configuring ntp.conf template
+
 * Tue Jun 22 2010 Nils Philippsen <nils at redhat.com> - 1.9.58-1
 - pick up additional translations