summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorozgursarier2015-10-03 16:36:39 +0300
committerozgursarier2015-10-03 16:36:39 +0300
commit671eab6b8eaa26fb24d634cf67baf9c81ba1a772 (patch)
treefb95792e16f612fa2e3cab912c15181282d7a1f0
parent553b8909667df00369e188a7c5f22f07b661f667 (diff)
downloadaur-671eab6b8eaa26fb24d634cf67baf9c81ba1a772.tar.gz
Wrong python(3->2) deps fixed
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD16
2 files changed, 14 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b9e6f3badc4f..c7722e1e131d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,14 @@
pkgbase = img2pdf-git
- pkgdesc = Losslessly convert images to PDF without unnecessarily re-encoding JPEG and JPEG2000 files. Image quality is retained without unnecessarily increasing file size.
+ pkgdesc = Losslessly convert images to PDF without unnecessarily increasing file size by re-encoding JPEG files.
pkgver = 0.1.6
- pkgrel = 1
+ pkgrel = 2
url = https://gitlab.mister-muffin.de/josch/img2pdf
arch = any
license = LGPL3
makedepends = git
- depends = python
- depends = python-pillow
- depends = python-setuptools
+ makedepends = python2-setuptools
+ depends = python2
+ depends = python2-pillow
provides = img2pdf=0.1.6
conflicts = img2pdf
options = !emptydirs
diff --git a/PKGBUILD b/PKGBUILD
index 886662c7809d..5c75252b7ee2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,14 +1,15 @@
# Maintainer : Özgür Sarıer <echo b3pndXJzYXJpZXIxMDExNjAxMTE1QGdtYWlsLmNvbQo= | base64 -d>
+# Contributor: Brandon Invergo <brandon@invergo.net>
pkgname=img2pdf-git
pkgver=0.1.6
-pkgrel=1
-pkgdesc="Losslessly convert images to PDF without unnecessarily re-encoding JPEG and JPEG2000 files. Image quality is retained without unnecessarily increasing file size."
+pkgrel=2
+pkgdesc="Losslessly convert images to PDF without unnecessarily increasing file size by re-encoding JPEG files."
arch=('any')
url="https://gitlab.mister-muffin.de/josch/img2pdf"
license=('LGPL3')
-depends=('python' 'python-pillow' 'python-setuptools')
-makedepends=('git')
+depends=('python2' 'python2-pillow')
+makedepends=('git' 'python2-setuptools')
conflicts=("${pkgname%-*}")
provides=("${pkgname%-*}=${pkgver}")
options=(!emptydirs)
@@ -18,7 +19,8 @@ md5sums=('SKIP')
pkgver() {
cd "${srcdir}/${pkgname%-*}"
msg "Checking current version..."
- git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+ git_ver=`git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'`
+ echo "${git_ver/#${git_ver:0:5}/${pkgver:0:5}}"
}
build() {
@@ -27,11 +29,11 @@ build() {
msg "GIT checkout done or server timeout"
msg "Starting setup.py..."
- python setup.py build
+ python2 setup.py build
}
package() {
cd "${srcdir}/${pkgname%-*}"
- python setup.py install --prefix=/usr --root="$pkgdir"
+ python2 setup.py install --prefix=/usr --root="$pkgdir" #--optimize=1
}