summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorozgursarier2016-02-29 00:33:17 +0200
committerozgursarier2016-02-29 00:33:17 +0200
commitb7bd5f5ff6e0753e89fdc2de1523b70ec444913f (patch)
tree0052ee9117b524a960a2387d7e80e355c76895aa
parent421c576c7e56cff3c2b7c722436b92ad642d9fc1 (diff)
downloadaur-b7bd5f5ff6e0753e89fdc2de1523b70ec444913f.tar.gz
New conflicts added.
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD4
2 files changed, 4 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 44d71541f8b8..ac4757996131 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Sun Feb 28 22:21:28 UTC 2016
+# Sun Feb 28 22:32:18 UTC 2016
pkgbase = img2pdf-git
pkgdesc = Losslessly convert images to PDF without unnecessarily increasing file size by re-encoding JPEG files.
pkgver = 0.2.0.r20.gc158585
@@ -13,6 +13,7 @@ pkgbase = img2pdf-git
depends = python-pillow
provides = img2pdf=0.2.0.r20.gc158585
conflicts = img2pdf
+ conflicts = python-img2pdf
options = !emptydirs
source = git+http://gitlab.mister-muffin.de/josch/img2pdf.git
md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 8d24dc5f706d..d77b30987062 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@ url="https://gitlab.mister-muffin.de/josch/img2pdf"
license=('LGPL3')
depends=('python' 'python-pillow')
makedepends=('git' 'python-setuptools')
-conflicts=("${pkgname%-*}")
+conflicts=("${pkgname%-*}" "python-${pkgname%-*}")
provides=("${pkgname%-*}=${pkgver}")
options=(!emptydirs)
source=("git+http://gitlab.mister-muffin.de/josch/img2pdf.git")
@@ -34,5 +34,5 @@ build() {
package() {
cd "${srcdir}/${pkgname%-*}"
- python setup.py install --prefix=/usr --root="$pkgdir" #--optimize=1
+ python setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
}