- rebuild with libevent 2.1.9

[packages/ntp.git] / ntp.spec

diff --git a/ntp.spec b/ntp.spec
index 325e51ba853ac93324a419fefe46b2c6fc621c00..5c178ccf918e71cdb639595b0348bb3ed0dc3f80 100644 (file)
--- a/ntp.spec
+++ b/ntp.spec
@@ -2,21 +2,24 @@
 # - enable and package ntpdsim?
 # - net-snmp-ntpd needs initscript
 # - update FC patches
+# - update man pages (from Debian?)
 #
 # Conditional build:
-%bcond_without avahi  # disable DNS-SD support via Avahi
+%bcond_without avahi   # disable DNS-SD support via Avahi
+%bcond_without sntp    # disable building sntp and sntp/tests
+%bcond_with    seccomp         # enable experimental support for libseccomp sandboxing
 
 %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.8
-Release:       3
+Version:       4.2.8p8
+Release:       7
 License:       distributable
 Group:         Networking/Daemons
-Source0:       http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/%{name}-%{version}.tar.gz
-# Source0-md5: 6972a626be6150db8cfbd0b63d8719e7
+Source0:       https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/%{name}-%{version}.tar.gz
+# Source0-md5: 4a8636260435b230636f053ffd070e34
 Source1:       %{name}.conf
 Source2:       %{name}.keys
 Source3:       %{name}d.init
@@ -29,12 +32,11 @@ Source10:   %{name}date-wrapper
 Source11:      %{name}d.service
 Source12:      %{name}date.service
 Source13:      http://www.ietf.org/timezones/data/leap-seconds.list
-# Source13-md5:        e99a84cf28b14c77fba76c05565604ac
+# Source13-md5:        daabf9679b23c4c4d8ba99dbb89bfdc8
 Patch0:                %{name}-build.patch
 Patch1:                %{name}-no_libelf.patch
 Patch2:                %{name}-ipv6.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,14 +48,14 @@ Patch108:   %{name}-4.2.6p1-rtnetlink.patch
 Patch110:      %{name}-logdefault.patch
 Patch111:      %{name}-4.2.6p1-mlock.patch
 URL:           http://www.ntp.org/
-BuildRequires: autoconf
-BuildRequires: autogen-devel
-BuildRequires: automake
+BuildRequires: autoconf >= 2.61
+BuildRequires: autogen-devel >= 5.18.12
+BuildRequires: automake >= 1:1.10
 %{?with_avahi:BuildRequires:   avahi-compat-libdns_sd-devel}
 BuildRequires: libcap-devel
-BuildRequires: libevent-devel
+%{?with_sntp:BuildRequires:    libevent-devel >= 2.0}
 BuildRequires: libnl-devel
-BuildRequires: libseccomp-devel
+%{?with_seccomp:BuildRequires: libseccomp-devel}
 BuildRequires: libtool
 BuildRequires: net-snmp-devel
 BuildRequires: openssl-devel >= 0.9.7d
@@ -104,6 +106,7 @@ Requires(pre):      /usr/sbin/useradd
 Requires(post,preun,postun):   systemd-units >= 38
 Requires:      rc-scripts >= 0.4.3.0
 Requires:      systemd-units >= 38
+Requires:      autogen-libs >= 5.18.12
 Provides:      group(ntp)
 Provides:      ntp = %{version}-%{release}
 Provides:      ntpdaemon
@@ -174,6 +177,9 @@ Summary:    MIBs for NTP time entities
 Summary(pl.UTF-8):     Pliki MIB dla elementów czasu NTP
 Group:         Applications/System
 Requires:      mibs-dirs
+%if "%{_rpmversion}" >= "5"
+BuildArch:     noarch
+%endif
 
 %description -n mibs-ntp
 The Management Information Base for NTP time entities.
@@ -219,6 +225,9 @@ Summary:    HTML documentation for ntp
 Summary(pl.UTF-8):     Dokumentacja HTML dla ntp
 Summary(pt_BR.UTF-8):  Documentação adicional para o pacote ntp
 Group:         Documentation
+%if "%{_rpmversion}" >= "5"
+BuildArch:     noarch
+%endif
 
 %description doc-html
 HTML documentation for ntp.
@@ -235,7 +244,6 @@ Este pacote contém documentação adicional sobre o NTP versão 4.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%{!?with_avahi:%patch4 -p1}
 
 ## FC patches
 #%patch101 -p1
@@ -260,17 +268,24 @@ echo 'AM_CONDITIONAL([NEED_LIBOPTS], false)' >> sntp/configure.ac
 %{__automake}
 cd sntp
 %{__libtoolize}
-%{__aclocal} -I libopts/m4 -I libevent/m4
+%{__aclocal} -I m4 -I libopts/m4 -I libevent/m4
 %{__autoconf}
 %{__automake}
-cd ..
+cd libevent
+%{__libtoolize}
+%{__aclocal} -I m4
+%{__autoconf}
+%{__automake}
+cd ../..
 
 CPPFLAGS="%{rpmcppflags} -I/usr/include/readline"
 %configure \
+       --disable-silent-rules \
        --with-binsubdir=sbin \
        --enable-linuxcaps \
        --enable-getifaddrs \
-       --enable-libseccomp \
+       %{?with_seccomp:--enable-libseccomp} \
+       %{__with_without sntp} \
        --enable-ipv6 \
        --enable-ntp-signd \
        --with-lineeditlibs=readline \
@@ -324,7 +339,7 @@ EOF
 install -d $RPM_BUILD_ROOT%{mibdir}
 cp -p ntpsnmpd/ntpv4-mib.mib $RPM_BUILD_ROOT%{mibdir}
 
-%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/{ntp4,sntp}
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/{ntp,sntp}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -409,7 +424,7 @@ fi
 %attr(750,root,root) %dir %{_sysconfdir}
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/keys
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ntp.conf
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ntp.leapseconds
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ntp.leapseconds
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/ntpd
 %attr(754,root,root) /etc/rc.d/init.d/ntpd
 %{systemdunitdir}/ntpd.service
@@ -460,11 +475,13 @@ fi
 %attr(755,root,root) %{_sbindir}/calc_tickadj
 %attr(755,root,root) %{_sbindir}/ntp-wait
 %attr(755,root,root) %{_sbindir}/ntptrace
+%attr(755,root,root) %{_sbindir}/update-leap
 %dir %{_datadir}/ntp
 %{_datadir}/ntp/lib
 %{_mandir}/man1/calc_tickadj.1*
 %{_mandir}/man1/ntp-wait.1*
 %{_mandir}/man1/ntptrace.1*
+%{_mandir}/man1/update-leap.1*
 
 %files doc-html
 %defattr(644,root,root,755)