[arch-commits] Commit in pflask/repos/community-x86_64 (3 files)

[Eli Schwartz]

    Date: Monday, February 26, 2018 @ 16:09:51
  Author: eschwartz
Revision: 298441

archrelease: copy trunk to community-x86_64

Added:
  pflask/repos/community-x86_64/0001-Fix-manages-not-being-installed-in-the-correct-direc.patch
    (from rev 298440, pflask/trunk/0001-Fix-manages-not-being-installed-in-the-correct-direc.patch)
  pflask/repos/community-x86_64/PKGBUILD
    (from rev 298440, pflask/trunk/PKGBUILD)
Deleted:
  pflask/repos/community-x86_64/PKGBUILD

-----------------------------------------------------------------+
 0001-Fix-manages-not-being-installed-in-the-correct-direc.patch |   25 +++
 PKGBUILD                                                        |   81 +++++-----
 2 files changed, 69 insertions(+), 37 deletions(-)

Copied: pflask/repos/community-x86_64/0001-Fix-manages-not-being-installed-in-the-correct-direc.patch (from rev 298440, pflask/trunk/0001-Fix-manages-not-being-installed-in-the-correct-direc.patch)
===================================================================
--- 0001-Fix-manages-not-being-installed-in-the-correct-direc.patch	                        (rev 0)
+++ 0001-Fix-manages-not-being-installed-in-the-correct-direc.patch	2018-02-26 16:09:51 UTC (rev 298441)
@@ -0,0 +1,25 @@
+From 6f70b2c43d9d2f0acf224e7f93db54ff9456000c Mon Sep 17 00:00:00 2001
+From: Eli Schwartz <eschwartz93 at gmail.com>
+Date: Mon, 22 Jan 2018 13:14:54 -0500
+Subject: [PATCH] Fix manages not being installed in the correct directory.
+
+---
+ wscript | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/wscript b/wscript
+index 2819b59..187f518 100644
+--- a/wscript
++++ b/wscript
+@@ -165,7 +165,7 @@ def build(bld):
+ 			source = bld.path.ant_glob('docs/pflask.rst') +
+ 			         bld.path.ant_glob('build/docs/conf.py'),
+ 			target = 'docs/man/pflask.1 docs/man/pflask-debuild.1',
+-			install_path = bld.env.MANDIR
++			install_path = bld.env.MANDIR + '/man1'
+ 		)
+ 
+ 		bld(
+-- 
+2.16.1
+

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-02-26 16:09:32 UTC (rev 298440)
+++ PKGBUILD	2018-02-26 16:09:51 UTC (rev 298441)
@@ -1,37 +0,0 @@
-# $Id$
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-
-pkgname=pflask
-pkgver=0.2.20151217
-_commit=599418bb6453eaa0ccab493f9411f13726c1a636
-_wafver=1.8.6
-pkgrel=1
-pkgdesc="Lightweight process containers for Linux"
-arch=('i686' 'x86_64')
-url="http://ghedo.github.io/pflask/"
-license=('BSD')
-depends=('libdbus' 'bash')
-makedepends=('python-sphinx' 'git')
-source=("git+https://github.com/ghedo/pflask.git#commit=$_commit"
-        "http://ftp.waf.io/pub/release/waf-$_wafver")
-sha256sums=('SKIP'
-            '81c4e6a3144c7b2021a839e7277bdaf1cedbbc87302186897b4ae03f4effcbf5')
-
-prepare() {
-  install -Dm755 waf-$_wafver pflask/waf
-}
-
-build() {
-  cd pflask
-  PREFIX=/usr ./waf configure
-  ./waf build
-}
-
-package() {
-  cd pflask
-  DESTDIR="$pkgdir/" ./waf install
-
-  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-}
-
-# vim:set ts=2 sw=2 et:

Copied: pflask/repos/community-x86_64/PKGBUILD (from rev 298440, pflask/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-02-26 16:09:51 UTC (rev 298441)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+
+pkgname=pflask
+pkgver=0.2.20151217
+_commit=599418bb6453eaa0ccab493f9411f13726c1a636
+_wafver=1.8.6
+pkgrel=2
+pkgdesc="Lightweight process containers for Linux"
+arch=('x86_64')
+url="http://ghedo.github.io/pflask/"
+license=('BSD')
+depends=('libdbus' 'bash')
+makedepends=('python-sphinx' 'git')
+source=("git+https://github.com/ghedo/pflask.git#commit=$_commit"
+        "0001-Fix-manages-not-being-installed-in-the-correct-direc.patch"
+        "https://waf.io/waf-$_wafver")
+sha256sums=('SKIP'
+            '9358c387c5906942a709cd47d1e438c1439f8a21835740d14ea338f9bb73c025'
+            'f38dbe6e1b4aa9cb75c2a44d50202996e5d454e5260c5ff17de67c49a45fec9a'
+            '81c4e6a3144c7b2021a839e7277bdaf1cedbbc87302186897b4ae03f4effcbf5')
+
+prepare() {
+  cd pflask
+  install -Dm755 ../waf-$_wafver waf
+
+  # backport https://github.com/ghedo/pflask/pull/24
+  patch -p1 < ../0001-Fix-manages-not-being-installed-in-the-correct-direc.patch
+}
+
+build() {
+  cd pflask
+  PREFIX=/usr ./waf configure
+  ./waf build
+}
+
+package() {
+  cd pflask
+  DESTDIR="$pkgdir/" ./waf install
+
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+}
+
+# vim:set ts=2 sw=2 et: