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

[Maxime Gauduin]

    Date: Wednesday, June 12, 2019 @ 07:42:47
  Author: alucryd
Revision: 480582

upgpkg: firewalld 0.7.0-1

Modified:
  firewalld/trunk/PKGBUILD

----------+
 PKGBUILD |   22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-06-12 07:35:32 UTC (rev 480581)
+++ PKGBUILD	2019-06-12 07:42:47 UTC (rev 480582)
@@ -3,11 +3,11 @@
 # Contributor: speed145a <jonathan at tagchapter.com>
 
 pkgname=firewalld
-pkgver=0.6.4
+pkgver=0.7.0
 pkgrel=1
 pkgdesc='Firewall daemon with D-Bus interface'
 arch=(any)
-url='https://firewalld.org/'
+url=https://firewalld.org/
 license=(GPL2)
 depends=(
   dconf
@@ -50,11 +50,9 @@
 prepare() {
   cd firewalld
 
-  # Backport zsh completion
-  git cherry-pick -n b0d8723d85651cacbb21f2168d92f3c7052e909d
   patch -Np1 -i ../firewalld-sysconfigdir.patch
 
-  NOCONFIGURE='true' ./autogen.sh
+  NOCONFIGURE=true ./autogen.sh
 }
 
 build() {
@@ -61,10 +59,10 @@
   cd firewalld
 
   ./configure \
-    --prefix='/usr' \
-    --localstatedir='/var' \
-    --sbindir='/usr/bin' \
-    --sysconfdir='/etc' \
+    --prefix=/usr \
+    --localstatedir=/var \
+    --sbindir=/usr/bin \
+    --sysconfdir=/etc \
     --disable-schemas-compile \
     --disable-sysconfig
   make
@@ -71,11 +69,7 @@
 }
 
 package() {
-  cd firewalld
-
-  make DESTDIR="${pkgdir}" install
-  mv "${pkgdir}"/{etc,usr/share}/dbus-1
-  install -Dm 644 shell-completion/zsh/_firewalld -t "${pkgdir}"/usr/share/zsh/site-functions/
+  make DESTDIR="${pkgdir}" -C firewalld install
 }
 
 # vim: ts=2 sw=2 et: