From 6fa09e8f74571ee229ca428a8242a056b7009fe1 Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Thu, 9 Aug 2018 16:46:49 +0200 Subject: [PATCH] update to 20180805gita27407 --- .gitignore | 6 +++--- linuxptp.spec | 14 +++++++++----- sources | 6 +++--- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 9fd4727..f90dba6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -/linuxptp-1.9.2.tgz -/clknetsim-5b4d14.tar.gz -/linuxptp-testsuite-892052.tar.gz +/linuxptp-a27407.tar.gz +/clknetsim-42b693.tar.gz +/linuxptp-testsuite-f6a640.tar.gz diff --git a/linuxptp.spec b/linuxptp.spec index a2468a3..c908671 100644 --- a/linuxptp.spec +++ b/linuxptp.spec @@ -1,6 +1,9 @@ +%global gitfullver a2740768b6025c2c4241ac858a45dd3c6554fced +%global gitver %(c=%{gitfullver}; echo ${c:0:6}) +%global gitdate 20180805 %global _hardened_build 1 -%global testsuite_ver 892052 -%global clknetsim_ver 5b4d14 +%global testsuite_ver f6a640 +%global clknetsim_ver 42b693 Name: linuxptp Version: 1.9.2 @@ -11,7 +14,8 @@ Group: System Environment/Base License: GPLv2+ URL: http://linuxptp.sourceforge.net/ -Source0: https://downloads.sourceforge.net/%{name}/%{name}-%{version}.tgz +#Source0: https://downloads.sourceforge.net/%{name}/%{name}-%{version}.tgz +Source0: https://github.com/richardcochran/%{name}/archive/%{gitver}/%{name}-%{gitver}.tar.gz Source1: phc2sys.service Source2: ptp4l.service Source3: timemaster.service @@ -46,7 +50,7 @@ make %{?_smp_mflags} \ %makeinstall mkdir -p $RPM_BUILD_ROOT{%{_sysconfdir}/sysconfig,%{_unitdir},%{_mandir}/man5} -install -m 644 -p default.cfg $RPM_BUILD_ROOT%{_sysconfdir}/ptp4l.conf +install -m 644 -p configs/default.cfg $RPM_BUILD_ROOT%{_sysconfdir}/ptp4l.conf install -m 644 -p %{SOURCE1} %{SOURCE2} %{SOURCE3} $RPM_BUILD_ROOT%{_unitdir} install -m 644 -p %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir} @@ -74,7 +78,7 @@ PATH=..:$PATH ./run %systemd_postun_with_restart phc2sys.service ptp4l.service timemaster.service %files -%doc COPYING README.org default.cfg gPTP.cfg +%doc COPYING README.org configs %config(noreplace) %{_sysconfdir}/ptp4l.conf %config(noreplace) %{_sysconfdir}/sysconfig/phc2sys %config(noreplace) %{_sysconfdir}/sysconfig/ptp4l diff --git a/sources b/sources index 2ca9a56..124d21a 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linuxptp-1.9.2.tgz) = f6bd4fd9a6b5e137272ebb845a7521e19a25973e8b15aa8748128c148391b0ba69a4ad9424d73bf68e66622107fc6fff0bea75290f34f414e3351d88b66401e8 -SHA512 (clknetsim-5b4d14.tar.gz) = 6fc12fec423af00bb7329ee903e49021d38285e891cdb855e2c48ebf335d4142cc742acce85f37a51f97ed33643ff54d9da9a1adf6365b8e5a719a409334020c -SHA512 (linuxptp-testsuite-892052.tar.gz) = 7232b966f90a0c42ef743ae4111254d4018b877ed79f0d921d3772ef2bbed94cde2b319211ea859927e601c507127cebef67ffab85f449494606560594106695 +SHA512 (linuxptp-a27407.tar.gz) = 8b467b5de128fddf5317f8ea7ce9e5582100959e3cd45d6bed709d4ce717a2b71e50e3a95c55d29ff46d2b0d3ffc205d846195408bd6db146e4aa8fd82037c5f +SHA512 (clknetsim-42b693.tar.gz) = ca30bef7c42e1371f34696a943755dcb6c7f2fe08a1d61602eccbd7232caa2e01a7bad0264d33086c36ed4f4d98aeae5e73c3058c99acaeb2f5e97c179e21037 +SHA512 (linuxptp-testsuite-f6a640.tar.gz) = e03648ed156ee467cd2422df25394e7ff6b1e33b7b036f35d77ed1d57b5bc4964f38b739fdb9e9aa409074e52297222c2cfd52c3e9881b2cb144fb6c55cf4750