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

Balló György bgyorgy at nymeria.archlinux.org
Wed Sep 4 21:14:45 UTC 2013


    Date: Wednesday, September 4, 2013 @ 23:14:44
  Author: bgyorgy
Revision: 96773

upgpkg: scribes 0.4.954-4

- Simplify and fix python fix (FS#33826)
- Move yelp to optdepends

Modified:
  scribes/trunk/PKGBUILD

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-09-04 21:09:27 UTC (rev 96772)
+++ PKGBUILD	2013-09-04 21:14:44 UTC (rev 96773)
@@ -6,14 +6,14 @@
 
 pkgname=scribes
 pkgver=0.4.954
-pkgrel=3
+pkgrel=4
 pkgdesc="An ultra minimalist text editor that combines simplicity with power"
 arch=('any')
 url='http://scribes.sourceforge.net'
 license=('GPL')
-depends=('dbus-python' 'yelp' 'pygtk' 'pygtksourceview2' 'python2-gtkspell'
-         'pyxdg')
+depends=('dbus-python' 'pygtksourceview2' 'python2-gtkspell' 'python2-xdg' 'hicolor-icon-theme' 'desktop-file-utils')
 makedepends=('intltool' 'gnome-doc-utils')
+optdepends=('yelp: open manual') 
 install=$pkgname.install
 source=(http://launchpad.net/scribes/${pkgver%.*}/scribes-milestone1/+download/${pkgname}-${pkgver%.*}-dev-build${pkgver##*.}.tar.bz2)
 sha256sums=('f4cb765d5690f7549eb0336ce23fd0648ba548b9a9e259876e5ee2c095a4b0f1')
@@ -21,17 +21,12 @@
 prepare() {
   cd ${srcdir}/${pkgname}-${pkgver%.*}-dev-build${pkgver##*.}
 
-  sed -i 's/python depcheck.py/python2 depcheck.py/' configure
-  sed -i 's/python removepyc.py/python2 removepyc.py/' Makefile.in
-  sed -i 's/python -OO compile.py/python2 -OO compile.py/' Makefile.in
-  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' LanguagePlugins/Sparkup/sparkup.py
-  sed -i 's|#! */usr/bin/env python|#!/usr/bin/env python2|' LanguagePlugins/PythonErrorChecker/ErrorCheckerProcess/{pychecker/checker.py,ScribesPylint/logilab/common/setup.py,ScribesPythonErrorChecker.py,ScribesPylint/logilab/astng/setup.py}
-  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' LanguagePlugins/zencoding/filters/{haml.py,comment.py,escape.py,format.py,format-css.py,html.py,xsl.py}
-  sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' LanguagePlugins/zencoding/{zen_actions.py,zen_core.py,html_matcher.py}
-  sed -i 's|#! */usr/bin/env python|#!/usr/bin/env python2|' GenericPlugins/{RecentOpen/ExternalProcess/ScribesRecentFilesIndexer.py,WordCompletion/SuggestionProcess/ScribesWordCompletionSuggestionGenerator.py} SCRIBES/SaveSystem/ExternalProcess/ScribesSaveProcess.py
-  sed -i 's|#! */usr/bin/env python|#!/usr/bin/env python2|' scribesmodule scribesplugin
-  sed -i 's|#! /usr/bin/python|#! /usr/bin/python2|' scribes.in
-  sed -i 's|return join(prefix, "bin", "python")|return join(prefix, "bin", "python2")|' SCRIBES/SaveProcessInitializer/Initializer.py
+  # Python2 fix
+  find . -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
+  find . -type f | xargs sed -i 's/join(prefix, "bin", "python")/join(prefix, "bin", "python2")/'
+  sed -i 's/python depcheck.py/python2 depcheck.py/' configure{,.ac}
+  sed -i 's/python removepyc.py/python2 removepyc.py/
+          s/python -OO compile.py/python2 -OO compile.py/' Makefile.{in,am}
 }
 
 build() {




More information about the arch-commits mailing list