[arch-commits] Commit in python2-simplejson/trunk (3 files)

[spupykin at nymeria.archlinux.org]

    Date: Tuesday, January 22, 2013 @ 13:27:44
  Author: spupykin
Revision: 82646

upgpkg: python-simplejson 3.0.7-2

upd

Added:
  python2-simplejson/trunk/python-simplejson.changelog
    (from rev 82645, python2-simplejson/trunk/python2-simplejson.changelog)
Modified:
  python2-simplejson/trunk/PKGBUILD
Deleted:
  python2-simplejson/trunk/python2-simplejson.changelog

------------------------------+
 PKGBUILD                     |   35 ++++++++++++++++++++---------------
 python-simplejson.changelog  |   20 ++++++++++++++++++++
 python2-simplejson.changelog |   20 --------------------
 3 files changed, 40 insertions(+), 35 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-01-22 12:19:23 UTC (rev 82645)
+++ PKGBUILD	2013-01-22 12:27:44 UTC (rev 82646)
@@ -3,32 +3,37 @@
 # Contributor: Allan McRae <allan at archlinux.org>
 # Contributor: David Moore <davidm at sjsoft.com>
 
-pkgname=python2-simplejson
+pkgbase=python-simplejson
+pkgname=(python-simplejson python2-simplejson)
 pkgver=3.0.7
-pkgrel=1
+pkgrel=2
 pkgdesc="Simple, fast, extensible JSON encoder/decoder for Python"
 license=('MIT')
 arch=('i686' 'x86_64')
 url="http://undefined.org/python/#simplejson"
-depends=('python2')
-makedepends=('python2-distribute')
-provides=("python-simplejson=$pkgver")
-conflicts=('python-simplejson')
-replaces=('python-simplejson')
-changelog=$pkgname.changelog
+makedepends=('python' 'python2-distribute')
+changelog=python-simplejson.changelog
 source=($pkgname-$pkgver.tar.gz::https://github.com/simplejson/simplejson/tarball/v${pkgver})
-sha256sums=('484b4cf0a545fc59a19ea8eed3a957919a89be116804b53712ec63466d7c3a31')
-sha256sums=('c57ecbcbaf7013df2d555436838acd78c9bb05c3e34ebe3d4de4d8102a0ac2a5')
-sha256sums=('c57ecbcbaf7013df2d555436838acd78c9bb05c3e34ebe3d4de4d8102a0ac2a5')
-sha256sums=('c57ecbcbaf7013df2d555436838acd78c9bb05c3e34ebe3d4de4d8102a0ac2a5')
-sha256sums=('7a11040dafc00743052866cf3a9c8199e8301b37bb4c4b90041ae34e4ca8ca49')
+md5sums=('fc9013eab6330514196a7f19c2cff386')
 
 build() {
+  true
+}
+
+package_python-simplejson() {
+  depends=('python')
+
   cd ${srcdir}/simplejson-simplejson-*
+  python setup.py install --root=${pkgdir}
+  install -Dm644 ${srcdir}/simplejson-simplejson-*/LICENSE.txt \
+    ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
+}
 
+package_python2-simplejson() {
+  depends=('python2')
+
+  cd ${srcdir}/simplejson-simplejson-*
   python2 setup.py install --root=${pkgdir}
-
-  # License
   install -Dm644 ${srcdir}/simplejson-simplejson-*/LICENSE.txt \
     ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
 }

Copied: python2-simplejson/trunk/python-simplejson.changelog (from rev 82645, python2-simplejson/trunk/python2-simplejson.changelog)
===================================================================
--- python-simplejson.changelog	                        (rev 0)
+++ python-simplejson.changelog	2013-01-22 12:27:44 UTC (rev 82646)
@@ -0,0 +1,20 @@
+2012-07-09 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+	* python-simplejson 2.6.1-1
+
+2012-05-24 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+	* python-simplejson 2.5.2-1
+
+2012-03-08 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+	* python-simplejson 2.3.3-1
+
+2011-10-26 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+	* python-simplejson 2.2.1-1
+
+2011-05-01 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+	* python-simplejson 2.1.3-1
+
+2010-05-15 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+	* Update to major release 2.1.1
+
+2010-03-27 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
+	* Update to major release 2.1.0

Deleted: python2-simplejson.changelog
===================================================================
--- python2-simplejson.changelog	2013-01-22 12:19:23 UTC (rev 82645)
+++ python2-simplejson.changelog	2013-01-22 12:27:44 UTC (rev 82646)
@@ -1,20 +0,0 @@
-2012-07-09 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
-	* python-simplejson 2.6.1-1
-
-2012-05-24 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
-	* python-simplejson 2.5.2-1
-
-2012-03-08 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
-	* python-simplejson 2.3.3-1
-
-2011-10-26 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
-	* python-simplejson 2.2.1-1
-
-2011-05-01 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
-	* python-simplejson 2.1.3-1
-
-2010-05-15 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
-	* Update to major release 2.1.1
-
-2010-03-27 Jaroslav Lichtblau <dragonlord at aur.archlinux.org>
-	* Update to major release 2.1.0