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

[Kyle Keen]

    Date: Tuesday, May 23, 2017 @ 21:01:35
  Author: kkeen
Revision: 229847

upgpkg: ufw 0.35-3 FS#54110

Modified:
  ufw/trunk/PKGBUILD

----------+
 PKGBUILD |   16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-05-23 20:54:41 UTC (rev 229846)
+++ PKGBUILD	2017-05-23 21:01:35 UTC (rev 229847)
@@ -7,7 +7,7 @@
 
 pkgname=ufw
 pkgver=0.35
-pkgrel=2
+pkgrel=3
 pkgdesc="Uncomplicated and easy to use CLI tool for managing a netfilter firewall"
 arch=('any')
 url="https://launchpad.net/ufw"
@@ -34,18 +34,22 @@
 # this /usr/lib/ufw/ rules were moved to /etc/ufw
 # remove /usr/lib from backup in O.36?
 
-package() {
+prepare() {
   cd "$pkgname-$pkgver"
-  
   # FS#28769 - move from /lib to /usr/lib
   sed -i -e 's|/lib|/usr/lib|' \
          -e 's|sbin|bin|g' setup.py
 
+  # FS#35458, FS#54110 - correct iptables location
+  sed -i -e 's|sbin|bin|g' setup.py
+  sed -i -e 's|sbin|bin|g' src/util.py
+}
+
+package() {
+  cd "$pkgname-$pkgver"
+  
   python2 setup.py install --root="$pkgdir"
 
-  # FS#35458 - correct iptables location
-  sed -i -e 's|sbin|bin|g' "$pkgdir/usr/lib/python2.7/site-packages/ufw/"*
-
   install -Dm644 "$srcdir/service" "$pkgdir/usr/lib/systemd/system/ufw.service"
   chmod 644 "$pkgdir/etc/ufw/"*.rules
 }