packages: ntp/ntp.spec - files conflict with openntpd; make upgradeable via...

[glen]

Author: glen                         Date: Sun Dec  6 22:19:23 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- files conflict with openntpd; make upgradeable via obsolete; rel 3

---- Files affected:
packages/ntp:
   ntp.spec (1.107 -> 1.108) 

---- Diffs:

================================================================
Index: packages/ntp/ntp.spec
diff -u packages/ntp/ntp.spec:1.107 packages/ntp/ntp.spec:1.108
--- packages/ntp/ntp.spec:1.107	Sat Aug  8 18:14:56 2009
+++ packages/ntp/ntp.spec	Sun Dec  6 23:19:17 2009
@@ -1,11 +1,13 @@
 # $Revision$, $Date$
+# TODO
+# - switch trigger from-to ntpd<>openntpd
 %include	/usr/lib/rpm/macros.perl
 Summary:	Network Time Protocol utilities
 Summary(pl.UTF-8):	Narzędzia do synchronizacji czasu (Network Time Protocol)
 Summary(pt_BR.UTF-8):	Network Time Protocol versão 4
 Name:		ntp
 Version:	4.2.4p7
-Release:	2
+Release:	3
 License:	distributable
 Group:		Daemons
 Source0:	http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/%{name}-%{version}.tar.gz
@@ -36,6 +38,7 @@
 BuildRequires:	rpmbuild(macros) >= 1.268
 Requires(post,preun):	/sbin/chkconfig
 Requires:	rc-scripts >= 0.4.0.10
+Obsoletes:	openntpd
 Obsoletes:	xntp3
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -227,6 +230,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.108  2009/12/06 22:19:17  glen
+- files conflict with openntpd; make upgradeable via obsolete; rel 3
+
 Revision 1.107  2009/08/08 16:14:56  hawk
 - fix build errors
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ntp/ntp.spec?r1=1.107&r2=1.108&f=u