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

[Felix Yan]

    Date: Sunday, March 21, 2021 @ 09:36:02
  Author: felixonmars
Revision: 410411

upgpkg: rrdtool 1.7.2-7: switch to python 3 binding (FS#69719)

Modified:
  rrdtool/trunk/PKGBUILD

----------+
 PKGBUILD |   11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-03-21 02:32:15 UTC (rev 410410)
+++ PKGBUILD	2021-03-21 09:36:02 UTC (rev 410411)
@@ -2,16 +2,16 @@
 
 pkgname=rrdtool
 pkgver=1.7.2
-pkgrel=6
+pkgrel=7
 pkgdesc="Data logging and graphing application"
 arch=('x86_64')
 url="https://www.rrdtool.org"
 license=('GPL' 'custom')
 depends=('libxml2' 'pango' 'ttf-dejavu')
-makedepends=('intltool' 'ruby' 'python2-setuptools' 'tcl' 'lua51' 'systemd')
+makedepends=('intltool' 'ruby' 'python-setuptools' 'tcl' 'lua51' 'systemd')
 optdepends=('perl: to use corresponding binding'
-	    'tcl: to use corresponding binding'
-            'python2: to use corresponding binding'
+            'tcl: to use corresponding binding'
+            'python: to use corresponding binding'
             'ruby: to use corresponding binding'
             'lua51: to use corresponding binding')
 options=('!emptydirs' '!makeflags')
@@ -20,7 +20,6 @@
 
 prepare() {
   cd ${pkgname}-${pkgver}
-  sed -i 's|/usr/bin/python|/usr/bin/python2|' examples/stripes.py
 
   # fix FS#28521 make ruby install to vendor_ruby instead of site_ruby
   sed -e 's/$(RUBY) ${abs_srcdir}\/ruby\/extconf.rb/& --vendor/' -i bindings/Makefile.am
@@ -30,7 +29,7 @@
 
 build() {
   cd ${pkgname}-${pkgver}
-  PYTHON=python2 LUA=/usr/bin/lua5.1 \
+  LUA=/usr/bin/lua5.1 \
     LUA_CFLAGS="-I/usr/include/lua5.1 -llua5.1" LUA_INSTALL_CMOD="/usr/lib/lua/5.1" \
     ./configure --prefix=/usr --localstatedir=/var --disable-rpath \
     --enable-perl --enable-perl-site-install --with-perl-options='INSTALLDIRS=vendor' \