[arch-commits] Commit in shairport-sync/trunk (5 files)

[Anatol Pomozov]

    Date: Sunday, September 6, 2015 @ 05:21:51
  Author: anatolik
Revision: 139248

upgpkg: shairport-sync 2.4-1

Modified:
  shairport-sync/trunk/PKGBUILD
  shairport-sync/trunk/shairport-sync.install
Deleted:
  shairport-sync/trunk/remove-init.d.patch
  shairport-sync/trunk/shairport-sync.conf
  shairport-sync/trunk/shairport-sync.service

------------------------+
 PKGBUILD               |   26 +++++++-------------------
 remove-init.d.patch    |   12 ------------
 shairport-sync.conf    |    2 --
 shairport-sync.install |    4 +++-
 shairport-sync.service |   14 --------------
 5 files changed, 10 insertions(+), 48 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-09-06 00:43:14 UTC (rev 139247)
+++ PKGBUILD	2015-09-06 03:21:51 UTC (rev 139248)
@@ -1,34 +1,23 @@
 # Maintainer: Anatol Pomozov <anatol.pomozov at gmail.com>
 
 pkgname=shairport-sync
-pkgver=2.2.5
+pkgver=2.4
 pkgrel=1
 pkgdesc='Emulates an AirPort Express for the purpose of streaming music from iTunes and compatible iPods and iPhones'
 url='https://github.com/mikebrady/shairport-sync'
 arch=(i686 x86_64)
 license=(GPL)
-backup=(etc/conf.d/shairport-sync)
+backup=(etc/shairport-sync.conf)
 install=shairport-sync.install
-depends=(openssl avahi libsoxr popt alsa-lib)
-source=(shairport-sync-$pkgver.zip::https://github.com/mikebrady/shairport-sync/archive/$pkgver.zip
-        shairport-sync.service
-        shairport-sync.conf
-        remove-init.d.patch)
-sha1sums=('8e87177836b60695f45ff1c6c1385894230912a2'
-          '5b998234e1fbc31645285d8b1fbc5ea6cd69e850'
-          'eb937e306436af2e47e7ff1bec1eba88b14e0d81'
-          '48174838de1ef4672bd71511753f05fd845b7137')
+depends=(openssl avahi libsoxr popt alsa-lib libconfig libpulse)
+source=(shairport-sync-$pkgver.zip::https://github.com/mikebrady/shairport-sync/archive/$pkgver.zip)
+sha1sums=('38306dbad5916e60507cc112346151359fa93f17')
 
-prepare() {
-  cd shairport-sync-$pkgver
-  patch -p1 < ../remove-init.d.patch
-}
-
 build() {
   cd shairport-sync-$pkgver
 
   autoreconf -i -f
-  ./configure --prefix=/usr --with-alsa --with-avahi --with-ssl=openssl --with-soxr --with-dns_sd
+  ./configure --prefix=/usr --with-alsa --with-pulseaudio --with-avahi --with-ssl=openssl --with-soxr --with-dns_sd --with-pkg-config --with-systemd --with-configfiles
   make
 }
 
@@ -36,6 +25,5 @@
   cd shairport-sync-$pkgver
   make DESTDIR="$pkgdir" install
   install -D -m664 LICENSES "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-  install -D -m644 "$srcdir"/shairport-sync.service "$pkgdir"/usr/lib/systemd/system/shairport-sync.service
-  install -D -m644 "$srcdir"/shairport-sync.conf "$pkgdir"/etc/conf.d/shairport-sync
+  rm "$pkgdir"/etc/shairport-sync.conf.sample
 }

Deleted: remove-init.d.patch
===================================================================
--- remove-init.d.patch	2015-09-06 00:43:14 UTC (rev 139247)
+++ remove-init.d.patch	2015-09-06 03:21:51 UTC (rev 139248)
@@ -1,12 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index ce1f0ba..9b32c2c 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -35,7 +35,3 @@ endif
- if USE_DNS_SD
- shairport_sync_SOURCES += mdns_dns_sd.c
- endif
--
--install-exec-hook:
--	[ -f /etc/init.d/shairport-sync ] || cp scripts/shairport-sync /etc/init.d/
--	update-rc.d shairport-sync defaults 90 10

Deleted: shairport-sync.conf
===================================================================
--- shairport-sync.conf	2015-09-06 00:43:14 UTC (rev 139247)
+++ shairport-sync.conf	2015-09-06 03:21:51 UTC (rev 139248)
@@ -1,2 +0,0 @@
-# ShairportSync Daemon options
-SHAIRPORT_ARGS=""

Modified: shairport-sync.install
===================================================================
--- shairport-sync.install	2015-09-06 00:43:14 UTC (rev 139247)
+++ shairport-sync.install	2015-09-06 03:21:51 UTC (rev 139248)
@@ -1,9 +1,11 @@
 post_install() {
   getent group shairport-sync &>/dev/null || groupadd --system shairport-sync >/dev/null
   getent passwd shairport-sync &> /dev/null || useradd --system -c 'ShairportSync AirPort receiver' -d /var/lib/shairport-sync -m -g shairport-sync -s /bin/false -G audio shairport-sync >/dev/null
+
+  [ -f /etc/conf.d/shairport-sync ] && echo "ShairportSync config has been moved to /etc/shairport-sync.conf. Please remove old config file /etc/conf.d/shairport-sync"
   true
 }
 
 post_upgrade() {
   post_install
-}
\ No newline at end of file
+}

Deleted: shairport-sync.service
===================================================================
--- shairport-sync.service	2015-09-06 00:43:14 UTC (rev 139247)
+++ shairport-sync.service	2015-09-06 03:21:51 UTC (rev 139248)
@@ -1,14 +0,0 @@
-[Unit]
-Description=ShairportSync AirTunes receiver
-After=sound.target
-Requires=avahi-daemon.service
-After=avahi-daemon.service
-
-[Service]
-EnvironmentFile=/etc/conf.d/shairport-sync
-ExecStart=/usr/bin/shairport-sync "$SHAIRPORT_ARGS"
-User=shairport-sync
-Group=shairport-sync
-
-[Install]
-WantedBy=multi-user.target