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

[Maxime Gauduin]

    Date: Sunday, December 9, 2018 @ 08:57:09
  Author: alucryd
Revision: 413008

FS#60781: firewalld 0.6.3-2

Modified:
  firewalld/trunk/PKGBUILD

----------+
 PKGBUILD |   45 +++++++++++++++++++++++++++++++++------------
 1 file changed, 33 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-12-09 07:15:18 UTC (rev 413007)
+++ PKGBUILD	2018-12-09 08:57:09 UTC (rev 413008)
@@ -4,16 +4,28 @@
 
 pkgname=firewalld
 pkgver=0.6.3
-pkgrel=1
+pkgrel=2
 pkgdesc='Firewall daemon with D-Bus interface'
-arch=('any')
+arch=(any)
 url='https://firewalld.org/'
-license=('GPL2')
+license=(GPL2)
 depends=(
-  'dconf' 'glib2' 'hicolor-icon-theme' 'nftables' 'python-decorator'
-  'python-gobject' 'python-slip'
+  dconf
+  glib2
+  hicolor-icon-theme
+  nftables
+  python-decorator
+  python-gobject
+  python-slip
 )
-makedepends=('docbook-xsl' 'ebtables' 'git' 'intltool' 'ipset' 'iptables')
+makedepends=(
+  docbook-xsl
+  ebtables
+  git
+  intltool
+  ipset
+  iptables
+)
 optdepends=(
   'bash-completion: bash completion'
   'ebtables: old backend'
@@ -24,16 +36,24 @@
   'libnotify: firewall-applet'
   'python-pyqt5: firewall-applet'
 )
-backup=('etc/conf.d/firewalld'
-        'etc/firewalld/firewalld.conf')
-source=("git+https://github.com/firewalld/firewalld.git#tag=v${pkgver}"
-        'firewalld-sysconfigdir.patch')
-sha256sums=('SKIP'
-            'cf7d655230c43acf10a0f97dffdbcba136729967c8b9a25a930871d54a589834')
+backup=(
+  etc/conf.d/firewalld
+  etc/firewalld/firewalld.conf
+)
+source=(
+  git+https://github.com/firewalld/firewalld.git#tag=v${pkgver}
+  firewalld-sysconfigdir.patch
+)
+sha256sums=(
+  SKIP
+  cf7d655230c43acf10a0f97dffdbcba136729967c8b9a25a930871d54a589834
+)
 
 prepare() {
   cd firewalld
 
+  # Backport zsh completion
+  git cherry-pick -n b0d8723d85651cacbb21f2168d92f3c7052e909d
   patch -Np1 -i ../firewalld-sysconfigdir.patch
 
   NOCONFIGURE='true' ./autogen.sh
@@ -56,6 +76,7 @@
   cd firewalld
 
   make DESTDIR="${pkgdir}" install
+  install -Dm 644 shell-completion/zsh/_firewalld -t "${pkgdir}"/usr/share/zsh/site-functions/
 }
 
 # vim: ts=2 sw=2 et: