[ntp] buildrequire pps-tools-devel
Miroslav Lichvar
mlichvar at fedoraproject.org
Thu Oct 6 15:30:10 UTC 2011
commit b0de4a279f1c67574203e7cffe142624b46c9015
Author: Miroslav Lichvar <mlichvar at redhat.com>
Date: Wed Aug 10 17:57:40 2011 +0200
buildrequire pps-tools-devel
.gitignore | 1 -
ntp.spec | 6 +-----
sources | 1 -
3 files changed, 1 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b71a2cf..c899b41 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
ntpstat-0.2.tgz
-timepps.h
ntp-4.2.6p3.tar.gz
diff --git a/ntp.spec b/ntp.spec
index 9c8ded2..6eac943 100644
--- a/ntp.spec
+++ b/ntp.spec
@@ -41,8 +41,6 @@ Source7: ntpdate.wrapper
Source8: ntp.cryptopw
Source9: ntpdate.sysconfig
Source10: ntp.dhclient
-# taken from git://git.enneenne.com/pps-tools
-Source11: timepps.h
Source12: ntpd.service
Source13: ntpdate.service
Source14: ntp-wait.service
@@ -99,6 +97,7 @@ Requires(preun): systemd-units
Requires(postun): systemd-units
Requires: ntpdate = %{version}-%{release}
BuildRequires: libcap-devel openssl-devel libedit-devel perl-HTML-Parser
+BuildRequires: pps-tools-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%description
@@ -152,8 +151,6 @@ This package contains NTP documentation in HTML format.
%prep
%setup -q -a 5
-cp %{SOURCE11} include
-
%patch1 -p1 -b .sleep
%patch2 -p1 -b .droproot
%patch3 -p1 -b .bcast
@@ -197,7 +194,6 @@ if echo 'int main () { return 0; }' | gcc -pie -fPIE -O2 -xc - -o pietest 2>/dev
./pietest && export CFLAGS="$CFLAGS -pie -fPIE"
rm -f pietest
fi
-export CPPFLAGS="-Iinclude"
export LDFLAGS="-Wl,-z,relro,-z,now"
%configure \
--sysconfdir=%{_sysconfdir}/ntp/crypto \
diff --git a/sources b/sources
index 8ef8904..cbff2a2 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
6b2bedefe2e7c63ea52609b222022121 ntpstat-0.2.tgz
-b494eddf72f3455c333eed80642dc20d timepps.h
59876a9009b098ff59767ee45a88ebd2 ntp-4.2.6p3.tar.gz
More information about the scm-commits
mailing list