[arch-commits] Commit in python-pygments/trunk (3 files)

[Evangelos Foutras]

    Date: Wednesday, April 8, 2015 @ 18:02:03
  Author: foutrelis
Revision: 130928

upgpkg: python-pygments 2.0.2-2

Ship usr/bin/pygmentize in its own package (FS#29000).

Added:
  python-pygments/trunk/python2-pygments.install
Modified:
  python-pygments/trunk/PKGBUILD
Deleted:
  python-pygments/trunk/python-pygments.install

--------------------------+
 PKGBUILD                 |   24 ++++++++++++++++++++----
 python-pygments.install  |    7 -------
 python2-pygments.install |    7 +++++++
 3 files changed, 27 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-04-08 15:57:13 UTC (rev 130927)
+++ PKGBUILD	2015-04-08 16:02:03 UTC (rev 130928)
@@ -2,9 +2,9 @@
 # Maintainer: Evangelos Foutras <evangelos at foutrelis.com>
 # Contributor: Timm Preetz <timm at preetz.us>
 
-pkgname=('python-pygments' 'python2-pygments')
+pkgname=('python-pygments' 'python2-pygments' 'pygmentize')
 pkgver=2.0.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Python syntax highlighter"
 arch=('any')
 url="http://pygments.org/"
@@ -16,13 +16,12 @@
 
 package_python-pygments() {
   depends=('python-setuptools')
-  install=python-pygments.install
 
   cd "$srcdir/Pygments-$pkgver"
 
   python3 setup.py install --root="$pkgdir" -O1
 
-  # pygmentize has been moved to the python2-pygments package
+  # pygmentize is shipped in its own package
   rm "$pkgdir/usr/bin/pygmentize"
 
   install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
@@ -30,11 +29,28 @@
 
 package_python2-pygments() {
   depends=('python2-setuptools')
+  install=python2-pygments.install
 
   cd "$srcdir/Pygments-$pkgver"
 
   python2 setup.py install --root="$pkgdir" -O1
 
+  # pygmentize is shipped in its own package
+  rm "$pkgdir/usr/bin/pygmentize"
+
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+package_pygmentize() {
+  depends=('python-pygments')
+
+  cd "$srcdir/Pygments-$pkgver"
+
+  python3 setup.py install --root="$pkgdir" -O1
+
+  # Remove all files except for usr/bin/pygmentize
+  find "$pkgdir" -type f -not -name pygmentize -delete
+
   install -Dm644 external/pygments.bashcomp \
     "$pkgdir/usr/share/bash-completion/completions/pygmentize"
 

Deleted: python-pygments.install
===================================================================
--- python-pygments.install	2015-04-08 15:57:13 UTC (rev 130927)
+++ python-pygments.install	2015-04-08 16:02:03 UTC (rev 130928)
@@ -1,7 +0,0 @@
-post_upgrade() {
-  if (($(vercmp $2 1.4-5) < 0)); then
-    echo '/usr/bin/pygmentize has been moved to the python2-pygments package'
-  fi
-}
-
-# vim:set ts=2 sw=2 et:

Added: python2-pygments.install
===================================================================
--- python2-pygments.install	                        (rev 0)
+++ python2-pygments.install	2015-04-08 16:02:03 UTC (rev 130928)
@@ -0,0 +1,7 @@
+post_upgrade() {
+  if (($(vercmp $2 2.0.2-2) < 0)); then
+    echo ':: /usr/bin/pygmentize has been moved to the pygmentize package'
+  fi
+}
+
+# vim:set ts=2 sw=2 et: