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

[Alexander Rødseth]

    Date: Monday, March 26, 2018 @ 13:38:46
  Author: arodseth
Revision: 312682

upgpkg: distcc 3.3-1

Modified:
  distcc/trunk/PKGBUILD

----------+
 PKGBUILD |   61 ++++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 36 insertions(+), 25 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-03-26 13:35:37 UTC (rev 312681)
+++ PKGBUILD	2018-03-26 13:38:46 UTC (rev 312682)
@@ -1,4 +1,3 @@
-# $Id$
 # Maintainer: Alexander F Rødseth <xyproto at archlinux.org>
 # Contributor: Sergej Pupykin <pupykin.s+arch at gmail.com>
 # Contributor: Judd Vinet <jvinet at zeroflux.org>
@@ -5,57 +4,69 @@
 # Contributor: Giovanni Scafora <giovanni at archlinux.org>
 
 pkgname=distcc
-pkgver=3.2rc1
-pkgrel=4
+pkgver=3.3
+pkgrel=1
 pkgdesc='Distributed C, C++ and Objective-C compiler'
 arch=('x86_64')
 url='https://github.com/distcc/distcc'
 license=('GPL')
-depends=('popt' 'avahi' 'dbus')
-makedepends=('gtk2' 'python2')
-optdepends=('gtk2: for distccmon-gnome'
-            'python2')
+depends=('avahi' 'popt')
+makedepends=('git' 'gtk2' 'python' 'setconf')
+optdepends=('gtk2: for distccmon-gnome' 'python')
 backup=('etc/conf.d/distccd'
         'etc/distcc/hosts')
-source=("$pkgname-$pkgver.tar.gz::$url/archive/v$pkgver.tar.gz"
-        distccd.conf.d
-        distccd.service)
-sha256sums=('33e85981ff6afd94efc38b23b2d8b9036b3dff2dc6eac6982b9ff0ae1de64caa'
+source=("git+https://github.com/distcc/distcc#tag=v$pkgver"
+        'distccd.conf.d'
+        'distccd.service')
+sha256sums=('SKIP'
             '43e02b461841ca2976816c244a0eca8b24820ca143f73cc0924403d75a8c012f'
             '0f18ffb58647eeba643f28e9029a5d307100df3470eb228097f2b3f4196d8098')
 prepare() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname"
 
   ./autogen.sh
+
+  setconf gnome/distccmon-gnome.desktop Name 'DistCC Monitor'
+  sed -i 's/ install-gnome-data//g' Makefile.in
 }
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname"
 
-  [ -f Makefile ] || PYTHON=/usr/bin/python2 \
-    ./configure \
+  ./configure \
     --prefix=/usr \
-    --with-gtk \
+    --enable-rfc2553 \
+    --mandir=/usr/share/man \
+    --sbindir=/usr/bin \
     --sysconfdir=/etc \
-    --mandir=/usr/share/man \
-    --enable-rfc2553
+    --with-gtk
 
-  make WERROR_CFLAGS= INCLUDESERVER_PYTHON=/usr/bin/python2
+  make WERROR_CFLAGS= INCLUDESERVER_PYTHON=/usr/bin/python
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  make -C "$pkgname" \
+    DESTDIR="$pkgdir" \
+    INCLUDESERVER_PYTHON=/usr/bin/python \
+    install
 
-  make DESTDIR="$pkgdir" INCLUDESERVER_PYTHON=/usr/bin/python2 install
+  # Configuration
+  install -Dm644 distccd.conf.d "$pkgdir/etc/conf.d/distccd"
+  install -Dm644 distccd.service \
+    "$pkgdir/usr/lib/systemd/system/distccd.service"
 
-  install -Dm644 "$srcdir/distccd.conf.d" "$pkgdir/etc/conf.d/distccd"
-  install -Dm644 "$srcdir/distccd.service" \
-    "$pkgdir/usr/lib/systemd/system/distccd.service"
+  # Desktop shortcut
+  install -Dm644 "$pkgname/gnome/distccmon-gnome-icon.png" \
+    "$pkgdir/usr/share/pixmaps/distccmon-gnome-icon.png"
+  install -Dm644 "$pkgname/gnome/distccmon-gnome.desktop" \
+    "$pkgdir/usr/share/applications/distccmon-gnome.desktop"
+
+  # Symlinks
   install -d "$pkgdir/usr/lib/$pkgname/bin"
   for bin in c++ cc cpp g++ gcc; do
     ln -sf "/usr/bin/$pkgname" "$pkgdir/usr/lib/$pkgname/bin/$bin"
   done
-
 }
 
+# getver: -u 3 raw.githubusercontent.com/distcc/distcc/master/configure.ac
 # vim: ts=2 sw=2 et: