Date: Monday, July 27, 2015 @ 11:57:53 Author: spupykin Revision: 137495
upgpkg: recoll 1.20.4-2 upd Modified: recoll/trunk/PKGBUILD ----------+ PKGBUILD | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-07-27 09:57:42 UTC (rev 137494) +++ PKGBUILD 2015-07-27 09:57:53 UTC (rev 137495) @@ -7,7 +7,7 @@ pkgname=recoll pkgver=1.20.4 -pkgrel=1 +pkgrel=2 pkgdesc="Full text search tool based on Xapian backend" arch=('i686' 'x86_64') url="http://www.lesbonscomptes.com/recoll/" @@ -33,20 +33,25 @@ source=("http://www.lesbonscomptes.com/$pkgname/$pkgname-${pkgver/_/}.tar.gz") md5sums=('bbe7fec46acc7e09de90f293cbf7b19c') -build() { +prepare() { cd "$srcdir/$pkgname-${pkgver/_/}" + export PYTHON=/usr/bin/python2 - msg2 "Python2 fix" - export PYTHON=/usr/bin/python2 - for file in filters/{rclchm,rclexecm.py,rclics,rclpython,rclzip,rclaudio,rclinfo,rclkar,rcllatinclass.py,rclwar,rclrar} \ - doc/user/usermanual.html; do - sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' "$file" + for file in rclchm rclexecm.py rclics rclpython rclzip rclaudio rclinfo rclkar \ + rcllatinclass.py rclwar rclrar ppt-dump.py rcldia rclepub rclmpdf \ + rcltar xls-dump.py xlsxmltocsv.py; do + sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' "filters/$file" done + sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' doc/user/usermanual.html sed -i 's_python$_python2_' desktop/hotrecoll.py sed -i 's_python _python2 _' python/recoll/Makefile recollinstall* sed -i '1,1i#include <unistd.h>' utils/rclionice.cpp +} +build() { + cd "$srcdir/$pkgname-${pkgver/_/}" + msg2 "Python2 fix" QMAKE=qmake-qt4 ./configure \ --prefix=/usr \ --mandir=/usr/share/man @@ -55,7 +60,6 @@ package() { cd "$srcdir/$pkgname-${pkgver/_/}" - make DESTDIR="$pkgdir" install }