[arch-commits] Commit in translate-toolkit/trunk (PKGBUILD fix-locale.patch)

[Eric Bélanger]

    Date: Saturday, April 6, 2013 @ 02:13:17
  Author: eric
Revision: 182055

upgpkg: translate-toolkit 1.10.0-1

Upstream update, Remove old patch

Modified:
  translate-toolkit/trunk/PKGBUILD
Deleted:
  translate-toolkit/trunk/fix-locale.patch

------------------+
 PKGBUILD         |   15 +++++----------
 fix-locale.patch |   28 ----------------------------
 2 files changed, 5 insertions(+), 38 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-04-05 20:06:46 UTC (rev 182054)
+++ PKGBUILD	2013-04-06 00:13:17 UTC (rev 182055)
@@ -4,28 +4,23 @@
 # Contributor: Hugo Doria <hugodoria at gmail.com>
 
 pkgname=translate-toolkit
-pkgver=1.9.0
-pkgrel=4
+pkgver=1.10.0
+pkgrel=1
 pkgdesc="A toolkit to convert between various different translation formats, help process and validate localisations"
 arch=('any')
 url="http://translate.sourceforge.net/wiki/toolkit/index"
 license=('GPL')
 depends=('bash' 'python2-lxml')
 optdepends=('python2-iniparse: to use ini2po script')
-source=("http://downloads.sourceforge.net/translate/${pkgname}-${pkgver}.tar.bz2"
-        'fix-locale.patch')
-md5sums=('6106bb27887a77c056bfa7d2fd89204d'
-         'dc40fb26dd7905800abafad9041d98f3')
+source=("http://downloads.sourceforge.net/translate/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('91ef9ec6e997f8cd5379fb1e44ce2063')
 
 package() {
-  # FS#27907
-  cd "${srcdir}/${pkgname}-${pkgver}"/translate
-  patch -p0 -i "${srcdir}"/fix-locale.patch
-
   cd "${srcdir}/${pkgname}-${pkgver}"
   sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
     -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
     $(find . -name '*.py')
 
   python2 setup.py install --root="${pkgdir}" --optimize=1
+  mv "${pkgdir}"/usr/lib/python2.7/site-packages/{docs,share} "${pkgdir}"/usr/lib/python2.7/site-packages/translate
 }

Deleted: fix-locale.patch
===================================================================
--- fix-locale.patch	2013-04-05 20:06:46 UTC (rev 182054)
+++ fix-locale.patch	2013-04-06 00:13:17 UTC (rev 182055)
@@ -1,28 +0,0 @@
-Index: storage/statsdb.py
-===================================================================
---- storage/statsdb.py	(revision 17950)
-+++ storage/statsdb.py	(working copy)
-@@ -468,9 +468,10 @@
-         unconditionally."""
-         self.cur.execute("""DELETE FROM files WHERE
-             path=?;""", (realpath,))
--        self.cur.execute("""INSERT INTO files
-+        self.cur.execute("""iNSERT INTO files
-             (fileid, path, st_mtime, st_size, toolkitbuild) values (NULL, ?, ?, ?, ?);""",
-             (realpath, mod_info[0], mod_info[1], toolkitversion.build))
-+        # Unusual capitalisation intended. See bug 2073.
-         fileid = self.cur.lastrowid
-         self.cur.execute("""DELETE FROM units WHERE
-             fileid=?""", (fileid,))
-@@ -628,9 +629,10 @@
-         configid = self._getstoredcheckerconfig(checker)
-         if configid:
-             return configid
--        self.cur.execute("""INSERT INTO checkerconfigs
-+        self.cur.execute("""iNSERT INTO checkerconfigs
-             (configid, config) values (NULL, ?);""",
-             (str(checker.config.__dict__),))
-+        # Unusual capitalisation intended. See bug 2073.
-         return self.cur.lastrowid
- 
-     def filechecks(self, filename, checker, store=None):