uppkg -> 1.14.10-2

2 files changed, 29 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5c75a0450be6..ca12f13a998e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,18 @@
 pkgbase = dbus-xdg
 	pkgdesc = Freedesktop.org message bus system - without creating a ~/.dbus directory (for non-systemd systems)
 	pkgver = 1.14.10
-	pkgrel = 1
+	pkgrel = 2
 	url = https://wiki.freedesktop.org/www/Software/dbus/
 	arch = x86_64
-	license = GPL
-	license = custom
-	makedepends = autoconf-archive
+	license = AFL-2.1 OR GPL-2.0-or-later
 	makedepends = docbook-xsl
 	makedepends = doxygen
-	makedepends = git
 	makedepends = python
 	makedepends = elogind
 	makedepends = xmlto
 	makedepends = yelp-tools
 	depends = audit
+	depends = libcap-ng
 	depends = expat
 	depends = libelogind
 	depends = libx11
@@ -22,22 +20,26 @@ pkgbase = dbus-xdg
 	provides = dbus-docs
 	conflicts = dbus
 	conflicts = dbus-docs
-	source = git+https://gitlab.freedesktop.org/dbus/dbus.git?signed#tag=dbus-1.14.10
+	conflicts = systemd
+	source = https://dbus.freedesktop.org/releases/dbus/dbus-1.14.10.tar.xz
 	source = dbus-enable-elogind.patch
 	source = no-fatal-warnings.diff
 	source = dbus-launch-Move-dbus-autolaunch-stuff-to-runuser.patch
 	validpgpkeys = DA98F25C0871C49A59EAFF2C4DE8FF2A63C7CC90
-	b2sums = SKIP
+	b2sums = f605b0810dcde6a0753384927131e7f4675be737ad7506a51261717c2622e74b99ac33cc2c199b98e5aa6b9d7c68ef692b8ee9f684f6fdab8d06c6fa861a6f6b
 	b2sums = c9ef41ff7b31af6cbaf28ca16974fb62aa0f2492f1c6970b41216758768d1139d2ce9aabbb3aff952d625b0decd1e8c2b25f79bb0a13c146aa9453dd4f7b5c5a
 	b2sums = 1f14c134f0511b7bd8e2dc71f665a6e6e23f0addd944888c6f956d4f29c7caa962aa05fdbe9a10d500a28751ba635168248ae7609c269e03e00366b85d5d488f
 	b2sums = 1e956a19a10198c2c1588577cbdb1cb770abacc1766d3973623c327d55f6d3f43a7560370b523023c94e9b8af82090a4e8f270f97db748465ed7d004a8b01c22
 
 pkgname = dbus-xdg-elogind
 	depends = audit
+	depends = libcap-ng
 	depends = expat
 	depends = libelogind
 	depends = libx11
 	depends = libaudit.so
+	depends = libcap-ng.so
+	depends = libexpat.so
 	depends = libelogind.so
 	provides = libdbus
 	provides = libdbus-1.so
diff --git a/PKGBUILD b/PKGBUILD
index f3e7375902ba..6d97fe451a14 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,53 +10,48 @@ pkgname=(
   dbus-xdg-docs
 )
 pkgver=1.14.10
-pkgrel=1
+pkgrel=2
 pkgdesc="Freedesktop.org message bus system - without creating a ~/.dbus directory (for non-systemd systems)"
 url="https://wiki.freedesktop.org/www/Software/dbus/"
 arch=(x86_64)
-license=(
-  GPL
-  custom
-)
+license=("AFL-2.1 OR GPL-2.0-or-later")
 depends=(
   audit
+  libcap-ng
   expat
   libelogind
   libx11
 )
 makedepends=(
-  autoconf-archive
   docbook-xsl
   doxygen
-  git
   python
   elogind
   xmlto
   yelp-tools
 )
 source=(
-  "git+https://gitlab.freedesktop.org/dbus/dbus.git?signed#tag=dbus-$pkgver"
+  https://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.xz
   dbus-enable-elogind.patch
   no-fatal-warnings.diff
   dbus-launch-Move-dbus-autolaunch-stuff-to-runuser.patch
 )
-b2sums=('SKIP'
+b2sums=('f605b0810dcde6a0753384927131e7f4675be737ad7506a51261717c2622e74b99ac33cc2c199b98e5aa6b9d7c68ef692b8ee9f684f6fdab8d06c6fa861a6f6b'
         'c9ef41ff7b31af6cbaf28ca16974fb62aa0f2492f1c6970b41216758768d1139d2ce9aabbb3aff952d625b0decd1e8c2b25f79bb0a13c146aa9453dd4f7b5c5a'
         '1f14c134f0511b7bd8e2dc71f665a6e6e23f0addd944888c6f956d4f29c7caa962aa05fdbe9a10d500a28751ba635168248ae7609c269e03e00366b85d5d488f'
         '1e956a19a10198c2c1588577cbdb1cb770abacc1766d3973623c327d55f6d3f43a7560370b523023c94e9b8af82090a4e8f270f97db748465ed7d004a8b01c22')
 validpgpkeys=('DA98F25C0871C49A59EAFF2C4DE8FF2A63C7CC90') # Simon McVittie <simon.mcvittie@collabora.co.uk>
 
 provides=('dbus' 'dbus-docs')
-conflicts=('dbus' 'dbus-docs')
+conflicts=('dbus' 'dbus-docs' 'systemd')
 
 prepare() {
-  cd dbus
+  cd dbus-$pkgver
   patch -Np 1 -i ../dbus-enable-elogind.patch
   # Allow us to enable checks without them being fatal
   git apply -3 ../no-fatal-warnings.diff
   patch -p1 -i ../dbus-launch-Move-dbus-autolaunch-stuff-to-runuser.patch
 
-  NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
@@ -83,17 +78,20 @@ build() {
     --enable-x11-autolaunch
   )
 
-  cd dbus
+  cd dbus-$pkgver
   ./configure "${configure_options[@]}"
+  make
 }
 
 # check() {
-#   make -C dbus -j1 check
+#   make -C dbus-$pkgver -j1 check
 # }
 
 package_dbus-xdg-elogind() {
   depends+=(
     libaudit.so
+    libcap-ng.so
+    libexpat.so
     libelogind.so
   )
   provides=(
@@ -103,30 +101,27 @@ package_dbus-xdg-elogind() {
   conflicts=(libdbus)
   replaces=(libdbus)
 
-
-
-  DESTDIR="$pkgdir" make -C dbus install
+  cd dbus-$pkgver
+  DESTDIR="$pkgdir" make install
 
   rm -r "$pkgdir"/{etc,var}
 
+  # Split docs
+  mkdir -p docs/usr/share
+  mv {"$pkgdir",docs}/usr/share/docs || echo firstmv
+
   # We have a pre-assigned uid (81)
   echo 'u dbus 81 "System Message Bus"' |
     install -Dm644 /dev/stdin "$pkgdir/usr/lib/sysusers.d/dbus.conf"
 
-  # Split docs
-  mkdir -p doc/usr/share
-  mv {"$pkgdir",doc}/usr/share/doc
-
-  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 dbus/COPYING
+  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 COPYING
 }
 
 package_dbus-xdg-docs() {
   pkgdesc+=" - Documentation"
   depends=()
 
-  mv doc/* "$pkgdir"
-
-  install -Dt "$pkgdir/usr/share/licenses/$pkgname" -m644 dbus/COPYING
+  mv "$srcdir"/dbus-"$pkgver"/docs/* "$pkgdir"
 }
 
 # vim:set sw=2 et: