packages: ntp/ntp.spec - drop upstart package (include in main pkg), add nt...

[glen]

Author: glen                         Date: Thu Jul 21 10:36:11 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- drop upstart package (include in main pkg), add ntpdate upstart script

---- Files affected:
packages/ntp:
   ntp.spec (1.147 -> 1.148) 

---- Diffs:

================================================================
Index: packages/ntp/ntp.spec
diff -u packages/ntp/ntp.spec:1.147 packages/ntp/ntp.spec:1.148
--- packages/ntp/ntp.spec:1.147	Tue Jul  5 15:55:27 2011
+++ packages/ntp/ntp.spec	Thu Jul 21 12:36:06 2011
@@ -12,7 +12,7 @@
 Summary(pt_BR.UTF-8):	Network Time Protocol versão 4
 Name:		ntp
 Version:	4.2.6p3
-Release:	1
+Release:	2
 License:	distributable
 Group:		Networking/Daemons
 Source0:	http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/%{name}-%{version}.tar.gz
@@ -25,7 +25,8 @@
 Source6:	%{name}-client.sysconfig
 Source7:	%{name}-manpages.tar.gz
 # Source7-md5:	208fcc9019e19ab26d28e4597290bffb
-Source8:	%{name}.upstart
+Source8:	ntpd.upstart
+Source9:	ntpdate.upstart
 Patch0:		%{name}-time.patch
 Patch1:		%{name}-no_libelf.patch
 Patch2:		%{name}-ipv6.patch
@@ -108,6 +109,7 @@
 Provides:	user(ntp)
 Obsoletes:	ntp < 4.2.4p8-6
 Obsoletes:	ntpdaemon
+Obsoletes:	ntpd-upstart
 Obsoletes:	openntpd
 Obsoletes:	xntp3
 
@@ -136,19 +138,6 @@
 sincronizarão o relógio do seu computador com o horário universal
 (UTC) através do protocolo NTP e utilizando servidores NTP públicos.
 
-%package -n ntpd-upstart
-Summary:	Upstart job description for the NTP daemon
-Summary(pl.UTF-8):	Opis zadania Upstart dla demona NTP
-Group:		Daemons
-Requires:	ntpd = %{version}-%{release}
-Requires:	upstart >= 0.6
-
-%description -n ntpd-upstart
-Upstart job description for the NTP daemon.
-
-%description -n ntpd-upstart -l pl.UTF-8
-Opis zadania Upstart dla demona NTP.
-
 %package -n ntpdate
 Summary:	Utility to set the date and time via NTP
 Summary(pl.UTF-8):	Klient do synchronizacji czasu po NTP (Network Time Protocol)
@@ -288,7 +277,8 @@
 install -p %{SOURCE5} $RPM_BUILD_ROOT/etc/rc.d/init.d/ntpdate
 cp -a %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/ntpd
 cp -a %{SOURCE6} $RPM_BUILD_ROOT/etc/sysconfig/ntpdate
-install -p %{SOURCE8} $RPM_BUILD_ROOT/etc/init/ntpd.conf
+cp -p %{SOURCE8} $RPM_BUILD_ROOT/etc/init/ntpd.conf
+cp -p %{SOURCE9} $RPM_BUILD_ROOT/etc/init/ntpdate.conf
 cp -a man/*.1 $RPM_BUILD_ROOT%{_mandir}/man1
 
 install -d $RPM_BUILD_ROOT/var/lib/ntp
@@ -320,12 +310,6 @@
 	rm -f /var/lib/ntp/drift
 fi
 
-%post -n ntpd-upstart
-%upstart_post ntpd
-
-%postun -n ntpd-upstart
-%upstart_postun ntpd
-
 %postun -n ntp
 if [ "$1" = "0" ]; then
 	%userremove ntp
@@ -378,6 +362,7 @@
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/ntpd
 %attr(754,root,root) /etc/rc.d/init.d/ntpd
+%config(noreplace) %verify(not md5 mtime size) /etc/init/ntpd.conf
 %attr(755,root,root) %{_sbindir}/ntpd
 %attr(755,root,root) %{_sbindir}/ntpdc
 %attr(755,root,root) %{_sbindir}/ntp-keygen
@@ -395,17 +380,12 @@
 %dir %attr(770,root,ntp) /var/lib/ntp
 %attr(640,ntp,ntp) %ghost /var/lib/ntp/drift
 
-%if "%{pld_release}" != "ti"
-%files -n ntpd-upstart
-%defattr(644,root,root,755)
-%config(noreplace) %verify(not md5 mtime size) /etc/init/ntpd.conf
-%endif
-
 %files -n ntpdate
 %defattr(644,root,root,755)
 %doc COPYRIGHT
 %attr(755,root,root) %{_sbindir}/ntpdate
 %attr(754,root,root) /etc/rc.d/init.d/ntpdate
+%config(noreplace) %verify(not md5 mtime size) /etc/init/ntpdate.conf
 %attr(754,root,root) /etc/cron.hourly/ntpdate
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/ntpdate
 %{_mandir}/man1/ntpdate*
@@ -436,6 +416,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.148  2011/07/21 10:36:06  glen
+- drop upstart package (include in main pkg), add ntpdate upstart script
+
 Revision 1.147  2011/07/05 13:55:27  lisu
 - Titanium will not support upstart
 
================================================================

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