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

[Eli Schwartz]

    Date: Friday, July 6, 2018 @ 17:52:06
  Author: eschwartz
Revision: 353908

upgpkg: glusterfs 1:4.1.0-2

systemd 239 introduces runtime warnings for tmpfiles.d snippets trying to
create files in /var/run. See
https://github.com/systemd/systemd/commit/a2d1fb882c4308bc10362d971f333c5031d60069

Fix by using upstream-provided tmpfiles.d which did not have this issue.

Modified:
  glusterfs/trunk/PKGBUILD

----------+
 PKGBUILD |   12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-07-06 17:49:46 UTC (rev 353907)
+++ PKGBUILD	2018-07-06 17:52:06 UTC (rev 353908)
@@ -7,7 +7,7 @@
 pkgname=glusterfs
 epoch=1
 pkgver=4.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Is a cluster file-system capable of scaling to several peta-bytes.'
 arch=(x86_64)
 url='http://www.gluster.org/'
@@ -21,7 +21,7 @@
 	'etc/glusterfs/glusterfs-georep-logrotate'
 	'etc/glusterfs/glusterfs-logrotate')
 depends=(fuse python2 libxml2 libaio liburcu attr which rpcbind)
-makedepends=(flex bison rpcsvc-proto)
+makedepends=(rpcsvc-proto)
 optdepends=('glib2: qemu-block')
 #source=($pkgname-$pkgver.tar.gz::https://github.com/gluster/glusterfs/archive/v$pkgver.tar.gz)
 source=(https://bits.gluster.org/pub/gluster/glusterfs/src/glusterfs-$pkgver.tar.gz)
@@ -30,8 +30,8 @@
 prepare() {
   cd "$srcdir"/$pkgname-$pkgver
   find -type f -name '*.py' -exec sed -i \
-    -e 's:env\ python:env\ python2:' \
-    -e 's:/usr/bin/python:/usr/bin/python2:' {} \;
+    -e 's:env\ python$:env\ python2:' \
+    -e 's:/usr/bin/python$:/usr/bin/python2:' {} +
 }
 
 build() {
@@ -46,6 +46,7 @@
     --mandir=/usr/share/man \
     --libexecdir=/usr/lib/$pkgname \
     --with-systemddir=/usr/lib/systemd/system \
+    --with-tmpfilesdir=/usr/lib/tmpfiles.d \
     --enable-gnfs \
     PYTHON=python2 LEXLIB=
   make
@@ -56,9 +57,6 @@
 
   make -j1 DESTDIR="$pkgdir" install
 
-  mkdir -p "$pkgdir"/usr/lib/tmpfiles.d
-  echo "d /var/run/glusterfs 0755 root root -" >"$pkgdir"/usr/lib/tmpfiles.d/glusterfs.conf
-
   install -D -m 644 \
     "$srcdir"/$pkgname-$pkgver/{README.md,INSTALL,COPYING*} \
     "$pkgdir"/usr/share/doc/glusterfs/