From bcdc17ff7858e1fd4a8f8819007dd805f183198d Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Wed, 10 Aug 2011 17:54:42 +0200 Subject: [PATCH] use timepps header from pps-tools-devel --- .gitignore | 1 - chrony.spec | 6 +----- sources | 1 - 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 18af58d..65b7bcc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -/timepps.h /chrony-1.26.tar.gz diff --git a/chrony.spec b/chrony.spec index 6102bfc..70da98e 100644 --- a/chrony.spec +++ b/chrony.spec @@ -12,15 +12,13 @@ Source2: chrony.keys Source3: chronyd.service Source4: chrony.helper Source5: chrony.logrotate -# wget -O timepps.h 'http://gitweb.enneenne.com/?p=linuxpps;a=blob_plain;f=Documentation/pps/timepps.h;hb=b895b1a28558b83907c691aad231c41a0d14df88' -Source6: timepps.h Source7: chrony.nm-dispatcher Source8: chrony.dhclient Source9: chrony-wait.service %{?gitpatch:Patch0: chrony-%{version}-%{gitpatch}.patch.gz} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libcap-devel libedit-devel bison texinfo +BuildRequires: libcap-devel libedit-devel pps-tools-devel bison texinfo Requires(pre): shadow-utils Requires(post): systemd-units info chkconfig @@ -36,7 +34,6 @@ clocks, system real-time clock or manual input as time references. %prep %setup -q -n %{name}-%{version}%{?prerelease} -mkdir pps; cp -p %{SOURCE6} pps %{?gitpatch:%patch0 -p1} %{?gitpatch: echo %{version}-%{gitpatch} > version.txt} @@ -49,7 +46,6 @@ CFLAGS="$CFLAGS -pie -fPIE" CFLAGS="$CFLAGS -pie -fpie" %endif export CFLAGS -export CPPFLAGS="-Ipps" export LDFLAGS="-Wl,-z,relro,-z,now" %configure \ diff --git a/sources b/sources index bcef65b..7cc8a4c 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -b494eddf72f3455c333eed80642dc20d timepps.h ad6dd619ff1986e4ff780363c64e2246 chrony-1.26.tar.gz