- updated to 4.2.6p5

[packages/ntp.git] / ntp.spec

diff --git a/ntp.spec b/ntp.spec
index 530f14d9924fa6b6ab3b80bf301720d83aa3b3b3..eac780c098c84a0f173f4a11b30908a5a62e4bbb 100644 (file)
--- a/ntp.spec
+++ b/ntp.spec
@@ -10,12 +10,12 @@ 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.6p1
-Release:       0.5
+Version:       4.2.6p5
+Release:       1
 License:       distributable
 Group:         Networking/Daemons
 Source0:       http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/%{name}-%{version}.tar.gz
-# Source0-md5: 0510396dfbde40678b92f808ec07c0d2
+# Source0-md5: 00df80a84ec9528fcfb09498075525bc
 Source1:       %{name}.conf
 Source2:       %{name}.keys
 Source3:       %{name}.init
@@ -24,14 +24,13 @@ Source5:    %{name}-client.init
 Source6:       %{name}-client.sysconfig
 Source7:       %{name}-manpages.tar.gz
 # Source7-md5: 208fcc9019e19ab26d28e4597290bffb
-Source8:       %{name}.upstart
+Source8:       ntp.upstart
+Source9:       ntpdate.upstart
 Patch0:                %{name}-time.patch
 Patch1:                %{name}-no_libelf.patch
 Patch2:                %{name}-ipv6.patch
-Patch3:                %{name}-openssl_check.patch
-Patch4:                %{name}-nano.patch
-Patch5:                %{name}-ntpdc-link_order.patch
-Patch6:                %{name}-no_avahi.patch
+Patch3:                %{name}-nano.patch
+Patch4:                %{name}-no_avahi.patch
 # FC patches + 100
 Patch101:      %{name}-4.2.6p1-sleep.patch
 Patch102:      %{name}-4.2.6p1-droproot.patch
@@ -46,6 +45,10 @@ Patch110:    %{name}-4.2.6p1-htmldoc.patch
 Patch112:      %{name}-4.2.4p7-getprecision.patch
 Patch113:      %{name}-4.2.6p1-logdefault.patch
 Patch114:      %{name}-4.2.6p1-mlock.patch
+Patch116:      %{name}-4.2.6p3-nosyspeer.patch
+Patch117:      %{name}-4.2.6p3-broadcastdelay.patch
+Patch118:      %{name}-4.2.6p3-delaycalib.patch
+Patch119:      %{name}-4.2.6p3-ntpdaterecv.patch
 URL:           http://www.ntp.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -55,6 +58,7 @@ BuildRequires:        libnl-devel
 BuildRequires: libtool
 BuildRequires: net-snmp-devel
 BuildRequires: openssl-devel >= 0.9.7d
+BuildRequires: pciutils-devel
 BuildRequires: readline-devel >= 4.2
 BuildRequires: rpm-perlprov >= 4.1-13
 BuildRequires: rpmbuild(macros) >= 1.561
@@ -105,6 +109,7 @@ Provides:   ntpdaemon
 Provides:      user(ntp)
 Obsoletes:     ntp < 4.2.4p8-6
 Obsoletes:     ntpdaemon
+Obsoletes:     ntpd-upstart
 Obsoletes:     openntpd
 Obsoletes:     xntp3
 
@@ -133,19 +138,6 @@ referência de horário. Este pacote contém utilitários e servidores que
 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)
@@ -157,6 +149,7 @@ Requires(pre):      /bin/id
 Requires(pre): /usr/bin/getgid
 Requires(pre): /usr/sbin/groupadd
 Requires(pre): /usr/sbin/useradd
+Requires:      rc-scripts >= 0.4.3.0
 Provides:      group(ntp)
 Provides:      user(ntp)
 Conflicts:     ntp < 4.2.0-3
@@ -224,9 +217,7 @@ Este pacote contém documentação adicional sobre o NTP versão 4.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%{!?with_avahi:%patch6 -p1}
+%{!?with_avahi:%patch4 -p1}
 
 ## FC patches
 %patch101 -p1
@@ -237,18 +228,26 @@ Este pacote contém documentação adicional sobre o NTP versão 4.
 %patch106 -p1
 %patch107 -p1
 %patch108 -p1
-%patch109 -p1
-%patch110 -p1
+# already applied
+#%patch109 -p1
+# already applied
+#%patch110 -p1
 %patch112 -p1
 %patch113 -p1
 %patch114 -p1
+# already applied
+#%patch116 -p1
+%patch117 -p1
+%patch118 -p1
+# already applied
+#%patch119 -p1
 
 echo 'AM_CONDITIONAL([NEED_LIBOPTS], false)' >> configure.ac
 echo 'AM_CONDITIONAL([NEED_LIBOPTS], false)' >> sntp/configure.ac
 
 %build
 %{__libtoolize}
-%{__aclocal} -I m4 -I libopts/m4
+%{__aclocal} -I m4 -I sntp/libopts/m4
 %{__autoconf}
 %{__automake}
 cd sntp
@@ -282,7 +281,8 @@ install -p %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/ntpd
 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
@@ -314,12 +314,6 @@ if [ "$1" = "0" ]; then
        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
@@ -372,6 +366,7 @@ fi
 %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
@@ -389,15 +384,12 @@ fi
 %dir %attr(770,root,ntp) /var/lib/ntp
 %attr(640,ntp,ntp) %ghost /var/lib/ntp/drift
 
-%files -n ntpd-upstart
-%defattr(644,root,root,755)
-%config(noreplace) %verify(not md5 mtime size) /etc/init/ntpd.conf
-
 %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*