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

[Sergej Pupykin]

    Date: Saturday, October 17, 2015 @ 22:14:09
  Author: spupykin
Revision: 144297

upgpkg: rubber 1.3-1

upd

Modified:
  rubber/trunk/PKGBUILD
Deleted:
  rubber/trunk/md5tohashlib.patch
  rubber/trunk/rubber-1.1-spaces.patch

-------------------------+
 PKGBUILD                |   18 +++++++-----------
 md5tohashlib.patch      |   20 --------------------
 rubber-1.1-spaces.patch |   27 ---------------------------
 3 files changed, 7 insertions(+), 58 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-10-17 20:07:35 UTC (rev 144296)
+++ PKGBUILD	2015-10-17 20:14:09 UTC (rev 144297)
@@ -3,7 +3,7 @@
 # Contributor: Baptiste Grenier <baptiste at bapt.name>
 
 pkgname=rubber
-pkgver=1.2
+pkgver=1.3
 pkgrel=1
 pkgdesc="A wrapper for LaTeX and friends"
 arch=('any')
@@ -11,24 +11,20 @@
 license=('GPL')
 depends=('python2')
 makedepends=('texinfo')
-source=("http://launchpad.net/rubber/trunk/$pkgver/+download/rubber-$pkgver.tar.gz"
-	"rubber-1.1-spaces.patch"
-	"md5tohashlib.patch")
-md5sums=('f553660164c8686b7155cdbce284adc9'
-         '743f644122ba27c783748ac33510e4e8'
-         '5478bafce24f09501d8c8d6075492a77')
+source=("http://launchpad.net/rubber/trunk/$pkgver/+download/rubber-$pkgver.tar.gz")
+md5sums=('8b27d1addf249b94f778d92db0f203d6')
 
 build() {
   cd "${srcdir}"
-#  patch -N -i "${srcdir}/rubber-1.1-spaces.patch" "${srcdir}/${pkgname}-${pkgver}/src/rules/latex/__init__.py"
-#  patch -N -i "${srcdir}/md5tohashlib.patch" "${srcdir}/${pkgname}-${pkgver}/src/util.py"
-  ./configure --prefix=/usr --mandir="${pkgdir}/usr/share/man" --infodir="${pkgdir}/usr/share/info"
+  ./configure --prefix=/usr \
+    --mandir="${pkgdir}/usr/share/man" \
+    --infodir="${pkgdir}/usr/share/info"
   make
 }
 
 package() {
   cd "${srcdir}"
-  make prefix="${pkgdir}/usr" install
+  python2 setup.py inst $pkgdir/usr
   mkdir -p $pkgdir/usr/share/bash-completion/completions/
   echo "complete -f -X '!*.tex' rubber" >$pkgdir/usr/share/bash-completion/completions/rubber
 }

Deleted: md5tohashlib.patch
===================================================================
--- md5tohashlib.patch	2015-10-17 20:07:35 UTC (rev 144296)
+++ md5tohashlib.patch	2015-10-17 20:14:09 UTC (rev 144297)
@@ -1,20 +0,0 @@
---- src/rubber-1.1/src/util.py	2009-11-09 23:40:06.000000000 +0100
-+++ src/rubber-1.1/src/util.py.old	2009-11-09 23:39:33.000000000 +0100
-@@ -5,7 +5,7 @@
- by the modules for various tasks.
- """
- 
--import md5
-+import hashlib
- import os, stat, time
- import imp
- import re, string
-@@ -19,7 +19,7 @@
- 	"""
- 	Compute the MD5 sum of a given file.
- 	"""
--	m = md5.new()
-+	m = hashlib.md5()
- 	file = open(fname)
- 	for line in file.readlines():
- 		m.update(line)

Deleted: rubber-1.1-spaces.patch
===================================================================
--- rubber-1.1-spaces.patch	2015-10-17 20:07:35 UTC (rev 144296)
+++ rubber-1.1-spaces.patch	2015-10-17 20:14:09 UTC (rev 144297)
@@ -1,27 +0,0 @@
---- __init__.py	2006-03-17 14:52:45.000000000 +0100
-+++ __init__.py.bob	2006-09-10 16:33:24.000000000 +0200
-@@ -1106,8 +1106,9 @@
- 		msg.progress(_("compiling %s") % msg.simplify(self.source()))
- 		
- 		file = self.source()
-+                fakefile = self.src_base  
- 		cmd = [self.vars["program"]]
--		cmd += map(lambda x: x.replace("%s",file), self.cmdline)
-+		cmd += map(lambda x: x.replace("%s",fakefile), self.cmdline)
- 		inputs = string.join(self.env.path, ":")
- 		if inputs == "":
- 			env = {}
-@@ -1120,6 +1121,13 @@
- 
- 		if self.log.read(self.src_base + ".log"):
- 			msg.error(_("Could not run %s.") % cmd[0])
-+			msg.error(_("path %s") % file)
-+			msg.error(_("cmd %s") % self.cmdline)
-+			msg.error(_("env %s") % env)
-+			msg.error(_("inputs %s") % inputs)
-+			msg.error(_("other %s") % self.src_base)
-+			msg.error(_("cmd1 %s") % cmd[1])
-+			msg.error(_("cmd2 %s") % cmd[2])
- 			return 1
- 		if self.log.errors():
- 			return 1