[arch-commits] Commit in chrony/trunk (PKGBUILD service)

[Daniel Micay]

    Date: Sunday, May 12, 2013 @ 06:56:00
  Author: thestinger
Revision: 90366

move chronyd from /usr/sbin to /usr/bin

Modified:
  chrony/trunk/PKGBUILD
  chrony/trunk/service

----------+
 PKGBUILD |   25 ++++++++++++++-----------
 service  |    2 +-
 2 files changed, 15 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-12 04:45:35 UTC (rev 90365)
+++ PKGBUILD	2013-05-12 04:56:00 UTC (rev 90366)
@@ -1,7 +1,7 @@
 # $Id$
-# Maintainer:  Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Maintainer:  Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
-# Maintainer:  Daniel Micay <danielmicay at gmail.com>
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Maintainer: Daniel Micay <danielmicay at gmail.com>
+# Contributor: Bartłomiej Piotrowski <nospam at bpiotrowski.pl>
 # Contributor: Patrick Leslie Polzer <leslie.polzer at gmx.net>
 # Contributor: cdhotfire <cdhotfire at gmail.com>
 # Contributor: Shinlun Hsieh <yngwiexx at yahoo.com.tw>
@@ -9,7 +9,7 @@
 
 pkgname=chrony
 pkgver=1.27
-pkgrel=2
+pkgrel=3
 pkgdesc='Lightweight NTP client and server'
 arch=('i686' 'x86_64')
 url="http://chrony.tuxfamily.org/"
@@ -20,26 +20,29 @@
 source=(http://download.tuxfamily.org/chrony/${pkgname}-${pkgver}.tar.gz
         service)
 sha256sums=('d44835ee2180a9a0f4f320fc498c39d59dec33d35c2aa05b446fe65a2a83ae9d'
-            'b4f68b335820b6a8429591750da294e5a9fafc1e8f6af8d865f6604516ecb306')
+            'bef4305fa7e5828e1a1fd43aa8e631f22f21902f6cdc2d3b5b41a57bd9a175dc')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
 
-  install -Dm0644 $srcdir/$pkgname-$pkgver/examples/chrony.conf.example $pkgdir/etc/chrony.conf
+  install -Dm0644 "$srcdir/$pkgname-$pkgver/examples/chrony.conf.example" "$pkgdir/etc/chrony.conf"
 
   # Arch's kernel has enhanced RTC support, make chrony use it by default
-  sed -ie '/^! \(rtconutc\|rtcfile \/etc\/chrony.rtc\)$/ s/^! //' \
+  sed -i '/^! \(rtconutc\|rtcfile \/etc\/chrony.rtc\)$/ s/^! //' \
     "$pkgdir/etc/chrony.conf"
 
-  install -Dm644  $srcdir/service $pkgdir/usr/lib/systemd/system/chrony.service
+  mv "$pkgdir/usr/sbin/chronyd" "$pkgdir/usr/bin"
+  rmdir "$pkgdir/usr/sbin"
 
+  install -Dm644 "$srcdir/service" "$pkgdir/usr/lib/systemd/system/chrony.service"
+
   install -dm755 "$pkgdir/usr/lib/systemd/ntp-units.d"
   echo "$pkgname.service" > "$pkgdir/usr/lib/systemd/ntp-units.d/$pkgname.list"
 }

Modified: service
===================================================================
--- service	2013-05-12 04:45:35 UTC (rev 90365)
+++ service	2013-05-12 04:56:00 UTC (rev 90366)
@@ -4,7 +4,7 @@
 
 [Service]
 Type=forking
-ExecStart=/usr/sbin/chronyd
+ExecStart=/usr/bin/chronyd
 PIDFile=/var/run/chronyd.pid
 
 [Install]