summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado2016-06-24 14:33:21 -0300
committerAndré Fabian Silva Delgado2016-06-24 14:34:34 -0300
commit9f547831b6adc27f58d07ba8998952385a7052ed (patch)
tree54cb99d3f31203fcd0d2a56abb6d15995c1257c3
parentc7dfb40382165fa51ce9fef9dc7a6395c773ddb8 (diff)
downloadaur-9f547831b6adc27f58d07ba8998952385a7052ed.tar.gz
Update to 230-4.2
* fix packaging in systemd split package - Bug #1043 -> https://labs.parabola.nu/issues/1043
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD14
2 files changed, 10 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ddf78a4bc10d..c246a2d4616c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Fri Jun 17 04:31:06 UTC 2016
+# Fri Jun 24 17:32:53 UTC 2016
pkgbase = systemd-knock
pkgver = 230
- pkgrel = 4
+ pkgrel = 4.2
url = http://www.freedesktop.org/wiki/Software/systemd
arch = i686
arch = x86_64
@@ -165,7 +165,7 @@ pkgname = libudev-knock
depends = libcap
provides = libudev.so
provides = libudev=230
- conflicts = libudev-knock
+ conflicts = libudev
pkgname = nss-knock-myhostname
pkgdesc = NSS module providing hostname resolution for the locally configured system hostname
diff --git a/PKGBUILD b/PKGBUILD
index 8327810a4a5e..961d250ac5ae 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@ pkgbase=systemd-knock
pkgname=('systemd-knock' 'libsystemd-knock' 'systemd-knock-sysvcompat'
'libsystemd-knock-standalone' 'libudev-knock' 'nss-knock-myhostname' 'nss-knock-mymachines' 'nss-knock-resolve')
pkgver=230
-pkgrel=4
+pkgrel=4.2
arch=('i686' 'x86_64' 'armv7h')
url="http://www.freedesktop.org/wiki/Software/systemd"
makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf'
@@ -268,9 +268,9 @@ package_libudev-knock() {
depends=('glibc' 'libcap')
license=('GPL2')
provides=('libudev.so' "libudev=$pkgver")
- conflicts=('libudev-knock')
+ conflicts=('libudev')
- cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/$_pkgbase" "$pkgdir"
+ cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/${pkgname/-knock/}" "$pkgdir"
}
package_nss-knock-myhostname() {
@@ -280,7 +280,7 @@ package_nss-knock-myhostname() {
provides=("nss-myhostname=$pkgver")
conflicts=('nss-myhostname')
- cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/$_pkgbase" "$pkgdir"
+ cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/${pkgname/-knock/}" "$pkgdir"
}
package_nss-knock-mymachines() {
@@ -290,7 +290,7 @@ package_nss-knock-mymachines() {
provides=("nss-mymachines=$pkgver")
conflicts=('nss-mymachines')
- cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/$_pkgbase" "$pkgdir"
+ cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/${pkgname/-knock/}" "$pkgdir"
}
package_nss-knock-resolve() {
@@ -300,7 +300,7 @@ package_nss-knock-resolve() {
provides=("nss-resolve=$pkgver")
conflicts=('nss-resolve')
- cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/$_pkgbase" "$pkgdir"
+ cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/${pkgname/-knock/}" "$pkgdir"
}
package_systemd-knock-sysvcompat() {
@@ -310,7 +310,7 @@ package_systemd-knock-sysvcompat() {
conflicts=('sysvinit' 'systemd-sysvcompat')
depends=('systemd-knock')
- cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/$_pkgbase" "$pkgdir"
+ cp -rT -d --no-preserve=ownership,timestamp "$srcdir/dest/${pkgname/-knock/}" "$pkgdir"
install -dm755 "$pkgdir/usr/bin"
for tool in runlevel reboot shutdown poweroff halt telinit; do