[arch-commits] Commit in ferm/trunk (PKGBUILD ferm.service)

[Sébastien Luttringer]

    Date: Monday, May 13, 2013 @ 01:41:52
  Author: seblu
Revision: 90510

upgpkg: ferm 2.1.2-4

https://www.archlinux.org/todo/move-files-to-usrbin-if-possible/

Modified:
  ferm/trunk/PKGBUILD
  ferm/trunk/ferm.service

--------------+
 PKGBUILD     |   14 ++++++++------
 ferm.service |    6 +++---
 2 files changed, 11 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-12 23:37:59 UTC (rev 90509)
+++ PKGBUILD	2013-05-12 23:41:52 UTC (rev 90510)
@@ -5,7 +5,7 @@
 
 pkgname=ferm
 pkgver=2.1.2
-pkgrel=3
+pkgrel=4
 pkgdesc='Tool to maintain complex firewalls'
 arch=('any')
 url='http://ferm.foo-projects.org/'
@@ -17,19 +17,21 @@
   "http://ferm.foo-projects.org/download/${pkgver:0:3}/$pkgname-$pkgver.tar.gz"
   "$pkgname.service")
 md5sums=('bcfeae169c4e8e9a702df19f453605ed'
-         '62b75692f4ce998497b2276bcda8eb05')
+         '24f425eda3de65ce15e7b013db3800bc')
 
 package() {
-  # software setup
-  pushd $pkgname-$pkgver
-  make PREFIX="${pkgdir}/usr" install
-  popd
   # systemd
   install -Dm 644 $pkgname.service \
     "$pkgdir/usr/lib/systemd/system/$pkgname.service"
+  # software setup
+  cd $pkgname-$pkgver
+  make PREFIX="$pkgdir/usr" install
   # setup default config
   install -D -m 644 "$pkgdir/usr/share/doc/ferm/examples/workstation.ferm" \
     "$pkgdir/etc/$pkgname.conf"
+  # /usr merge
+  cd "$pkgdir/usr"
+  mv sbin bin
 }
 
 # vim:set ts=2 sw=2 et:

Modified: ferm.service
===================================================================
--- ferm.service	2013-05-12 23:37:59 UTC (rev 90509)
+++ ferm.service	2013-05-12 23:41:52 UTC (rev 90510)
@@ -5,9 +5,9 @@
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-ExecStart=/usr/sbin/ferm /etc/ferm.conf
-ExecReload=/usr/sbin/ferm /etc/ferm.conf
-ExecStop=/usr/sbin/ferm -F /etc/ferm.conf
+ExecStart=/usr/bin/ferm /etc/ferm.conf
+ExecReload=/usr/bin/ferm /etc/ferm.conf
+ExecStop=/usr/bin/ferm -F /etc/ferm.conf
 
 [Install]
 WantedBy=multi-user.target