summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenoit Landrieu2020-04-26 21:59:59 +0200
committerBenoit Landrieu2020-04-26 21:59:59 +0200
commitf380555ebbea02d84f323f7cf2aedb1144118540 (patch)
tree8a8f6fb88304a4d03334910c40cabca945a41f2a
parentc6f4cc2b15813fa3d8c7697a3de3be0485c5ae15 (diff)
downloadaur-f380555ebbea02d84f323f7cf2aedb1144118540.tar.gz
resolv conflict its works
-rw-r--r--PKGBUILD14
1 files changed, 7 insertions, 7 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 2606b0b3eedb..9ec3136131c3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
# Maintainer: Benoit Landrieu (ben@gresille.org)
pkgname=scribus
pkgver=1.4.8
-pkgrel=1
+pkgrel=0
epoch=
pkgdesc="scribus-stable"
arch=('i686' 'x86_64')
@@ -18,8 +18,8 @@ depends=('hunspell' 'podofo' 'libcups' 'graphicsmagick' 'poppler'
'desktop-file-utils' 'libzmf' 'libfreehand')
makedepends=('cmake' 'qt5-tools')
optdepends=('lib2geom: for mesh distortion')
-conflicts=('scribus-svn')
-provides=('scribus-stable')
+conflicts=('scribus')
+provides=('scribus')
replaces=()
backup=()
options=()
@@ -40,10 +40,10 @@ build() {
make
}
-check() {
- cd "$pkgname-$pkgver"
- make -k check
-}
+#check() {
+ #cd "$pkgname-$pkgver"
+ #make -k check
+#}
package() {
cd "$pkgname-$pkgver"