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

[Jan Steffens]

    Date: Wednesday, January 22, 2020 @ 22:58:43
  Author: heftig
Revision: 554649

1.12.16-2

Modified:
  lib32-dbus/trunk/PKGBUILD

----------+
 PKGBUILD |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-01-22 22:23:06 UTC (rev 554648)
+++ PKGBUILD	2020-01-22 22:58:43 UTC (rev 554649)
@@ -1,16 +1,12 @@
 # Contributor : Ionut Biru <ibiru at archlinux.org>
 
 pkgname=lib32-dbus
-_pkgbasename=dbus
 pkgver=1.12.16
-pkgrel=1
+pkgrel=2
 pkgdesc="Freedesktop.org message bus system (32-bit)"
 url="https://wiki.freedesktop.org/www/Software/dbus/"
 arch=(x86_64)
 license=(GPL custom)
-provides=(lib32-libdbus)
-conflicts=(lib32-libdbus)
-replaces=(lib32-libdbus)
 depends=(lib32-systemd dbus)
 makedepends=(lib32-glib2 lib32-expat git autoconf-archive)
 _commit=23cc709db8fab94f11fa48772bff396b20aea8b0  # tags/dbus-1.12.16^0
@@ -32,7 +28,7 @@
 build() {
   export CC="gcc -m32"
   export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+  export PKG_CONFIG="i686-pc-linux-gnu-pkg-config"
 
   cd dbus
   ./configure \
@@ -63,10 +59,14 @@
 }
 
 package() {
+  provides=(lib32-libdbus libdbus-1.so)
+  conflicts=(lib32-libdbus)
+  replaces=(lib32-libdbus)
+
   DESTDIR="$pkgdir" make -C dbus install
 
+  rm -r "$pkgdir"/{etc,var}
   rm -r "$pkgdir"/usr/{bin,include,lib,share}
-  rm -r "$pkgdir"/{etc,var}
 
   install -d "$pkgdir/usr/share/licenses"
   ln -s dbus "$pkgdir/usr/share/licenses/$pkgname"