|
@@ -4,7 +4,6 @@
|
|
# Contributor: Tom Gundersen <teg@jklm.no>
|
|
# Contributor: Tom Gundersen <teg@jklm.no>
|
|
# Contributor: Link Dupont <link@subpop.net>
|
|
# Contributor: Link Dupont <link@subpop.net>
|
|
|
|
|
|
-pkgbase=dbus
|
|
|
|
pkgname=(dbus-xdg-elogind dbus-docs)
|
|
pkgname=(dbus-xdg-elogind dbus-docs)
|
|
pkgver=1.12.20
|
|
pkgver=1.12.20
|
|
pkgrel=1
|
|
pkgrel=1
|
|
@@ -26,7 +25,7 @@ provides=('dbus')
|
|
conflicts=('dbus')
|
|
conflicts=('dbus')
|
|
|
|
|
|
prepare() {
|
|
prepare() {
|
|
- cd "$pkgbase-$pkgbase-$pkgver"
|
|
|
|
|
|
+ cd "dbus-dbus-$pkgver"
|
|
patch -Np 1 -i ../dbus-enable-elogind.patch
|
|
patch -Np 1 -i ../dbus-enable-elogind.patch
|
|
# Allow us to enable checks without them being fatal
|
|
# Allow us to enable checks without them being fatal
|
|
patch -Np1 -i ../no-fatal-warnings.diff
|
|
patch -Np1 -i ../no-fatal-warnings.diff
|
|
@@ -36,7 +35,7 @@ prepare() {
|
|
}
|
|
}
|
|
|
|
|
|
build() {
|
|
build() {
|
|
- cd "$pkgbase-$pkgbase-$pkgver"
|
|
|
|
|
|
+ cd "dbus-dbus-$pkgver"
|
|
./configure \
|
|
./configure \
|
|
--prefix=/usr \
|
|
--prefix=/usr \
|
|
--sysconfdir=/etc \
|
|
--sysconfdir=/etc \
|
|
@@ -61,7 +60,7 @@ build() {
|
|
}
|
|
}
|
|
|
|
|
|
check() {
|
|
check() {
|
|
- make -C "$pkgbase-$pkgbase-$pkgver" check
|
|
|
|
|
|
+ make -C "dbus-dbus-$pkgver" check
|
|
}
|
|
}
|
|
|
|
|
|
package_dbus-xdg-elogind() {
|
|
package_dbus-xdg-elogind() {
|
|
@@ -70,7 +69,7 @@ package_dbus-xdg-elogind() {
|
|
conflicts=(libdbus)
|
|
conflicts=(libdbus)
|
|
replaces=(libdbus)
|
|
replaces=(libdbus)
|
|
|
|
|
|
- DESTDIR="$pkgdir" make -C "$pkgbase-$pkgbase-$pkgver" install
|
|
|
|
|
|
+ DESTDIR="$pkgdir" make -C "dbus-dbus-$pkgver" install
|
|
|
|
|
|
rm -r "$pkgdir"/{etc,var}
|
|
rm -r "$pkgdir"/{etc,var}
|
|
|
|
|
|
@@ -78,7 +77,7 @@ package_dbus-xdg-elogind() {
|
|
echo 'u dbus 81 "System Message Bus"' |
|
|
echo 'u dbus 81 "System Message Bus"' |
|
|
install -Dm644 /dev/stdin "$pkgdir/usr/lib/sysusers.d/dbus.conf"
|
|
install -Dm644 /dev/stdin "$pkgdir/usr/lib/sysusers.d/dbus.conf"
|
|
|
|
|
|
- install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 "$pkgbase-$pkgbase-$pkgver"/COPYING
|
|
|
|
|
|
+ install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 "dbus-dbus-$pkgver"/COPYING
|
|
|
|
|
|
# Split docs
|
|
# Split docs
|
|
mv "$pkgdir/usr/share/doc" "$srcdir"
|
|
mv "$pkgdir/usr/share/doc" "$srcdir"
|
|
@@ -88,7 +87,7 @@ package_dbus-docs() {
|
|
pkgdesc+=" (documentation)"
|
|
pkgdesc+=" (documentation)"
|
|
depends=()
|
|
depends=()
|
|
|
|
|
|
- install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 "$pkgbase-$pkgbase-$pkgver"/COPYING
|
|
|
|
|
|
+ install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 "dbus-dbus-$pkgver"/COPYING
|
|
mv doc "$pkgdir/usr/share"
|
|
mv doc "$pkgdir/usr/share"
|
|
}
|
|
}
|
|
|
|
|