[arch-commits] Commit in syncthing/trunk (3 files)

[Jaroslav Lichtblau]

    Date: Thursday, February 5, 2015 @ 20:39:00
  Author: jlichtblau
Revision: 127161

upgpkg: syncthing 0.10.21-2
FS#43673 fix

Modified:
  syncthing/trunk/PKGBUILD
Deleted:
  syncthing/trunk/syncthing.service
  syncthing/trunk/syncthing at .service

--------------------+
 PKGBUILD           |   10 +++-------
 syncthing.service  |   11 -----------
 syncthing at .service |   12 ------------
 3 files changed, 3 insertions(+), 30 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-02-05 19:38:24 UTC (rev 127160)
+++ PKGBUILD	2015-02-05 19:39:00 UTC (rev 127161)
@@ -7,7 +7,7 @@
 
 pkgname=syncthing
 pkgver=0.10.21
-pkgrel=1
+pkgrel=2
 pkgdesc="Open Source Continuous Replication / Cluster Synchronization Thing"
 url="http://syncthing.net/"
 license=('GPL3')
@@ -15,12 +15,8 @@
 depends=('glibc')
 makedepends=('git' 'go' 'godep' 'inetutils' 'sed')
 source=("$pkgname-$pkgver::git+https://github.com/syncthing/syncthing.git#tag=v${pkgver}"
-        "syncthing at .service"
-        "syncthing.service"
         "syncthing.1")
 sha1sums=('SKIP'
-          '204cad3823306c793a14a17a23220e26199160d4'
-          '2d3870eff21ad0724a48ba93e87064686693e3b9'
           '17be8b3f99c577e325765abc251f597e204d7711')
 install=${pkgname}.install
 
@@ -46,7 +42,7 @@
     cd "${srcdir}/src/github.com/syncthing/${pkgname}"
     install -D -m 755 ${pkgname} "${pkgdir}/usr/bin/${pkgname}"
     install -D -m 644 README.md "${pkgdir}/usr/share/doc/${pkgname}/README.md"
-    install -D -m 644 "${srcdir}/${pkgname}@.service" "${pkgdir}/usr/lib/systemd/system/${pkgname}@.service"
-    install -D -m 644 "${srcdir}/${pkgname}.service" "${pkgdir}/usr/lib/systemd/user/${pkgname}.service"
+    install -D -m 644 "etc/linux-systemd/system/${pkgname}@.service" "${pkgdir}/usr/lib/systemd/system/${pkgname}@.service"
+    install -D -m 644 "etc/linux-systemd/user/${pkgname}.service" "${pkgdir}/usr/lib/systemd/user/${pkgname}.service"
     install -D -m 644 "${srcdir}/${pkgname}.1" "${pkgdir}/usr/share/man/man1/${pkgname}.1"
 }

Deleted: syncthing.service
===================================================================
--- syncthing.service	2015-02-05 19:38:24 UTC (rev 127160)
+++ syncthing.service	2015-02-05 19:39:00 UTC (rev 127161)
@@ -1,11 +0,0 @@
-[Unit]
-Description=Syncthing service for %u
-After=network.target
-
-[Service]
-Environment=STNORESTART=yes
-ExecStart=/usr/bin/syncthing
-Restart=on-success
-
-[Install]
-WantedBy=default.target

Deleted: syncthing at .service
===================================================================
--- syncthing at .service	2015-02-05 19:38:24 UTC (rev 127160)
+++ syncthing at .service	2015-02-05 19:39:00 UTC (rev 127161)
@@ -1,12 +0,0 @@
-[Unit]
-Description=Syncthing service for %i
-After=network.target
-
-[Service]
-User=%i
-Environment=STNORESTART=yes
-ExecStart=/usr/bin/syncthing
-Restart=always
-
-[Install]
-WantedBy=multi-user.target