[arch-commits] Commit in boinc/trunk (PKGBUILD boinc.install boinc.service)

[Felix Yan]

    Date: Wednesday, June 27, 2018 @ 16:58:46
  Author: felixonmars
Revision: 346555

upgpkg: boinc 7.10.3-1

Modified:
  boinc/trunk/PKGBUILD
  boinc/trunk/boinc.install
Deleted:
  boinc/trunk/boinc.service

---------------+
 PKGBUILD      |   10 ++--------
 boinc.install |    7 +++++++
 boinc.service |   10 ----------
 3 files changed, 9 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-06-27 16:49:41 UTC (rev 346554)
+++ PKGBUILD	2018-06-27 16:58:46 UTC (rev 346555)
@@ -18,12 +18,10 @@
 source=("$pkgbase-$pkgver.tar.gz::https://github.com/BOINC/boinc/archive/$_tag.tar.gz"
         boinc.bash
         boinc.desktop
-        boinc.service
         boinc.sysusers)
 sha512sums=('06232f4cfa95d2769ee2a3b624883b7e695b3e0b4ef249802510c1a131858c675971ca3750b7b9842c66709c1f2e21325e5b788d683d0ea598cf6a37f9fa023e'
             'dec4bb6e571c2d99e1f57295149399eee03a8ec41b07ec3f7f197b910d246dcd6a5eb880301c9cd3a039d8c5aa6b07babf6ab4cae5f242c419c8cd71f56b90f5'
             'b3fcd703a6f683d246242543c2f7b5fcfe403cb95b7786f1418b24c3dfb7c54c6b8c4816c0e9ae56b5ee4e4cae63f153ec522b04bf02f4f835dd90ac0e0ae204'
-            '395343369cc02da33a0d61bdc45fd8812f4f881a2efbb684b07f8d727d1896ef558c875d42e93e7743004e1efe6226361b53c0ea1cb1e8323ec605caa833774e'
             '85804d7e6b7e07f06e93e8c42507f5cd0b9415257d6ac7421603a2b6084699d847ae9720c1cf9e9793b750dfb768375116843b988b287ee7c66c1374e18f7934')
 
 prepare() {
@@ -45,6 +43,7 @@
   cd "$srcdir"/$pkgbase-$pkgver
   LDFLAGS='-lX11' ./configure \
     --prefix=/usr \
+    --sysconfdir=/etc \
     --enable-libraries \
     --enable-unicode \
     --enable-shared \
@@ -63,6 +62,7 @@
   cd "$srcdir"/$pkgbase-$pkgver-nox
   PKG_CONFIG=/usr/bin/pkg-config ./configure \
     --prefix=/usr \
+    --sysconfdir=/etc \
     --enable-libraries \
     --enable-unicode \
     --enable-shared \
@@ -85,9 +85,6 @@
 
   make DESTDIR="$pkgdir" install
 
-  #install systemd unit
-  install -Dm644 "${srcdir}/$pkgbase.service" "${pkgdir}/usr/lib/systemd/system/$pkgbase.service"
-
   #install sysusers conf
   install -Dm644 "${srcdir}/$pkgbase.sysusers" "${pkgdir}/usr/lib/sysusers.d/$pkgbase.conf"
 
@@ -114,9 +111,6 @@
 
   make DESTDIR="$pkgdir" install
 
-  #install systemd unit
-  install -Dm644 "${srcdir}/$pkgbase.service" "${pkgdir}/usr/lib/systemd/system/$pkgbase.service"
-
   #install sysusers conf
   install -Dm644 "${srcdir}/$pkgbase.sysusers" "${pkgdir}/usr/lib/sysusers.d/$pkgbase.conf"
 

Modified: boinc.install
===================================================================
--- boinc.install	2018-06-27 16:49:41 UTC (rev 346554)
+++ boinc.install	2018-06-27 16:58:46 UTC (rev 346555)
@@ -6,3 +6,10 @@
   mkdir -p var/lib/boinc
   chown -R boinc:boinc var/lib/boinc
 }
+
+post_upgrade() {
+  if (( $(vercmp $2 7.10.3) < 0)); then
+    echo "Since 7.10.3, upstream provided boinc-client.service is used instead of our own one."
+    echo "Please enable/start the new boinc-client.service if desired."
+  fi
+}

Deleted: boinc.service
===================================================================
--- boinc.service	2018-06-27 16:49:41 UTC (rev 346554)
+++ boinc.service	2018-06-27 16:58:46 UTC (rev 346555)
@@ -1,10 +0,0 @@
-[Unit]
-Description=BOINC Daemon
-
-[Service]
-User=boinc
-Nice=19
-ExecStart=/usr/bin/boinc_client --dir /var/lib/boinc --redirectio
-
-[Install]
-WantedBy=multi-user.target