rpms/system-config-date/devel .cvsignore, 1.58, 1.59 sources, 1.62, 1.63 system-config-date.spec, 1.67, 1.68

[fedora-cvs-commits at redhat.com]

Author: nphilipp

Update of /cvs/dist/rpms/system-config-date/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8462

Modified Files:
	.cvsignore sources system-config-date.spec 
Log Message:
handle missing /etc/ntp.conf gracefully (#237777)
versionize obsoletes
pick up updated translations
Resolves: #237777



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/system-config-date/devel/.cvsignore,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- .cvsignore	24 Apr 2007 09:53:04 -0000	1.58
+++ .cvsignore	25 Apr 2007 12:36:51 -0000	1.59
@@ -1 +1 @@
-system-config-date-1.8.95.tar.bz2
+system-config-date-1.8.96.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/system-config-date/devel/sources,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- sources	24 Apr 2007 09:53:04 -0000	1.62
+++ sources	25 Apr 2007 12:36:51 -0000	1.63
@@ -1 +1 @@
-c19817e07fb16197237efa022365254e  system-config-date-1.8.95.tar.bz2
+81e2dc017d862d850038554d2d6618e6  system-config-date-1.8.96.tar.bz2


Index: system-config-date.spec
===================================================================
RCS file: /cvs/dist/rpms/system-config-date/devel/system-config-date.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- system-config-date.spec	24 Apr 2007 09:53:04 -0000	1.67
+++ system-config-date.spec	25 Apr 2007 12:36:51 -0000	1.68
@@ -1,6 +1,6 @@
 Summary: A graphical interface for modifying system date and time
 Name: system-config-date
-Version: 1.8.95
+Version: 1.8.96
 Release: 1%{?dist}
 URL: http://fedoraproject.org/wiki/SystemConfig/date
 License: GPL
@@ -11,10 +11,10 @@
 # We are upstream, thus the source is only available from within this source
 # package.
 Source0: %{name}-%{version}.tar.bz2
-Obsoletes: timetool
-Obsoletes: dateconfig
-Obsoletes: timeconfig
-Obsoletes: redhat-config-date
+Obsoletes: timetool < 3.0
+Obsoletes: dateconfig < 1.2
+Obsoletes: timeconfig < 3.2.10
+Obsoletes: redhat-config-date < 1.5.26
 BuildRequires: desktop-file-utils
 BuildRequires: gettext
 BuildRequires: intltool
@@ -96,6 +96,11 @@
 %config(noreplace) %{_sysconfdir}/ntp/ntpservers
 
 %changelog
+* Wed Apr 25 2007 Nils Philippsen <nphilipp at redhat.com> 1.8.96
+- handle missing /etc/ntp.conf gracefully (#237777)
+- versionize obsoletes
+- pick up updated translations
+
 * Tue Apr 24 2007 Nils Philippsen <nphilipp at redhat.com> 1.8.95
 - move zoom scale to the left of the canvas