[ntp] move files from /lib

Miroslav Lichvar mlichvar at fedoraproject.org
Thu May 2 16:36:19 UTC 2013


commit 35ecfba6da42a1533a210e40e411189e2568b06f
Author: Miroslav Lichvar <mlichvar at redhat.com>
Date:   Thu May 2 18:25:48 2013 +0200

    move files from /lib

 ntp.spec |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/ntp.spec b/ntp.spec
index 51a0ed2..65ab7be 100644
--- a/ntp.spec
+++ b/ntp.spec
@@ -277,7 +277,7 @@ find $RPM_BUILD_ROOT%{ntpdocdir} -type d | xargs chmod 755
 
 pushd $RPM_BUILD_ROOT
 mkdir -p .%{_sysconfdir}/{ntp/crypto,sysconfig,dhcp/dhclient.d} .%{_libexecdir}
-mkdir -p .%{_localstatedir}/{lib/ntp,log/ntpstats} ./lib/systemd/system
+mkdir -p .%{_localstatedir}/{lib/ntp,log/ntpstats} .%{_unitdir}
 touch .%{_localstatedir}/lib/{ntp/drift,sntp-kod}
 sed -e 's|VENDORZONE\.|%{vendorzone}|' \
 	-e 's|ETCNTP|%{_sysconfdir}/ntp|' \
@@ -296,13 +296,13 @@ sed -e 's|VENDORZONE\.|%{vendorzone}|' \
 touch -r %{SOURCE16} .%{_sysconfdir}/sysconfig/sntp
 install -p -m600 %{SOURCE8} .%{_sysconfdir}/ntp/crypto/pw
 install -p -m755 %{SOURCE10} .%{_sysconfdir}/dhcp/dhclient.d/ntp.sh
-install -p -m644 %{SOURCE12} ./lib/systemd/system/ntpd.service
-install -p -m644 %{SOURCE13} ./lib/systemd/system/ntpdate.service
-install -p -m644 %{SOURCE14} ./lib/systemd/system/ntp-wait.service
-install -p -m644 %{SOURCE15} ./lib/systemd/system/sntp.service
+install -p -m644 %{SOURCE12} .%{_unitdir}/ntpd.service
+install -p -m644 %{SOURCE13} .%{_unitdir}/ntpdate.service
+install -p -m644 %{SOURCE14} .%{_unitdir}/ntp-wait.service
+install -p -m644 %{SOURCE15} .%{_unitdir}/sntp.service
 
-mkdir ./lib/systemd/ntp-units.d
-echo 'ntpd.service' > ./lib/systemd/ntp-units.d/60-ntpd.list
+mkdir .%{_prefix}/lib/systemd/ntp-units.d
+echo 'ntpd.service' > .%{_prefix}/lib/systemd/ntp-units.d/60-ntpd.list
 
 popd
 
@@ -375,15 +375,15 @@ popd
 %{_mandir}/man8/ntpstat.8*
 %{_mandir}/man8/ntptime.8*
 %{_mandir}/man8/tickadj.8*
-/lib/systemd/ntp-units.d
-/lib/systemd/system/ntpd.service
+%{_prefix}/lib/systemd/ntp-units.d
+%{_unitdir}/ntpd.service
 
 %files perl
 %{_sbindir}/ntp-wait
 %{_sbindir}/ntptrace
 %{_mandir}/man8/ntp-wait.8*
 %{_mandir}/man8/ntptrace.8*
-/lib/systemd/system/ntp-wait.service
+%{_unitdir}/ntp-wait.service
 
 %files -n ntpdate
 %doc COPYRIGHT
@@ -394,7 +394,7 @@ popd
 %{_libexecdir}/ntpdate-wrapper
 %{_sbindir}/ntpdate
 %{_mandir}/man8/ntpdate.8*
-/lib/systemd/system/ntpdate.service
+%{_unitdir}/ntpdate.service
 
 %files -n sntp
 %doc sntp/COPYRIGHT
@@ -402,7 +402,7 @@ popd
 %{_sbindir}/sntp
 %{_mandir}/man8/sntp.8*
 %ghost %{_localstatedir}/lib/sntp-kod
-/lib/systemd/system/sntp.service
+%{_unitdir}/sntp.service
 
 %files doc
 %{ntpdocdir}/html


More information about the scm-commits mailing list