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

[Andreas Radke]

    Date: Wednesday, March 17, 2021 @ 16:03:23
  Author: andyrtr
Revision: 410168

upgpkg: dbus-python 1.2.16-4: drop python2-dbus - rename it back and merge -common pkg FS#70033

Modified:
  dbus-python/trunk/PKGBUILD

----------+
 PKGBUILD |   62 ++++++++++++-------------------------------------------------
 1 file changed, 13 insertions(+), 49 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-03-17 15:52:02 UTC (rev 410167)
+++ PKGBUILD	2021-03-17 16:03:23 UTC (rev 410168)
@@ -1,71 +1,35 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
-pkgbase=dbus-python
-pkgname=('python-dbus' 'python2-dbus' 'python-dbus-common')
+pkgname=dbus-python
 pkgver=1.2.16
-pkgrel=3
+pkgrel=4
 pkgdesc="Python bindings for DBUS"
 url="https://www.freedesktop.org/wiki/Software/DBusBindings"
 arch=(x86_64)
 license=('GPL' 'LGPL')
 depends=('dbus' 'glib2')
-makedepends=('python' 'python2' 'autoconf-archive' 'python-sphinx_rtd_theme' 'python-sphinx')
-source=(https://dbus.freedesktop.org/releases/${pkgbase}/${pkgbase}-${pkgver}.tar.gz{,.asc})
+makedepends=('python' 'autoconf-archive' 'python-sphinx_rtd_theme' 'python-sphinx')
+source=(https://dbus.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc})
 sha256sums=('11238f1d86c995d8aed2e22f04a1e3779f0d70e587caffeab4857f3c662ed5a4'
             'SKIP')
 validpgpkeys=('DA98F25C0871C49A59EAFF2C4DE8FF2A63C7CC90')
+replaces=('python-dbus' 'python-dbus-common')
+conflicts=('python-dbus' 'python-dbus-common')
+provides=("python-dbus=$pkgver" "python-dbus-common=$pkgver")
 
 prepare() {
-  mkdir build-python2 build-python3
-  cd $pkgbase-$pkgver
-  autoreconf -fi
+  cd $pkgname-$pkgver
+  autoreconf -vfi
 }
 
 build() {
-  cd build-python2
-  ../${pkgbase}-${pkgver}/configure --prefix=/usr PYTHON_VERSION=2
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
   make
-
-  cd ../build-python3
-  ../${pkgbase}-${pkgver}/configure --prefix=/usr
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-  make
 }
 
-package_python-dbus-common() {
-  pkgdesc="Common dbus-python files shared between python-dbus and python2-dbus"
-  depends=()
-  conflicts=('dbus-python<1.1.0')
-
-  cd build-python3
-  make DESTDIR="${pkgdir}" install-data
-  rm -r "${pkgdir}"/usr/lib/python*
-}
-
-package_python-dbus() {
-  depends+=('python-dbus-common' 'python')
-  pkgdesc="Python bindings for DBUS"
-
-  cd build-python3
+package() {
+  cd $pkgname-$pkgver
   make DESTDIR="${pkgdir}" install
-
-  rm -rf "${pkgdir}/usr/share"
-  rm -r "${pkgdir}/usr/include"
-  rm -r "${pkgdir}/usr/lib/pkgconfig"
 }
-
-package_python2-dbus() {
-  depends+=('python-dbus-common' 'python2')
-  pkgdesc="Python2 bindings for DBUS"
-  replaces=('dbus-python')
-  conflicts=('dbus-python')
-  provides=("dbus-python=$pkgver")
-
-  cd build-python2
-  make DESTDIR="${pkgdir}" install
-
-  rm -rf "${pkgdir}/usr/share"
-  rm -r "${pkgdir}/usr/include"
-  rm -r "${pkgdir}/usr/lib/pkgconfig"
-}