conflicto con apmpkg-dev

2 files changed, 6 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6b2c5d19692c..a362d9fa941c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = apmpkg
 	pkgdesc = Un administrador de paquetes universal para linux como modelo: PKGBUILD
 	pkgver = 1.3.0
-	pkgrel = 3
+	pkgrel = 4
 	url = https://github.com/Kedap/apmpkg
 	arch = x86_64
 	license = Apache
@@ -17,6 +17,7 @@ pkgbase = apmpkg
 	optdepends = snapd: for install dependencies
 	optdepends = npm: for install dependencies
 	conflicts = apmpkg-git-dev
+	conflicts = apmpkg-dev
 	source = https://github.com/Kedap/apmpkg/archive/refs/tags/1.3.0.tar.gz
 	sha256sums = 56a1b7b21642556ace47850034c3af3394e7013174d7f18890eb86ebae239df4
 
diff --git a/PKGBUILD b/PKGBUILD
index d5e8f30b04c3..5b7d84f93c57 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=apmpkg
 pkgver=1.3.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Un administrador de paquetes universal para linux como modelo: PKGBUILD"
 arch=('x86_64')
 url="https://github.com/Kedap/apmpkg"
@@ -12,7 +12,7 @@ optdepends=('flatpak: for install dependencies'
   'npm: for install dependencies')
 depends=('git' 'python-pip' 'python2-pip' 'wget' 'fakeroot' 'ruby-bundler' 'rsync')
 makedepends=('cargo')
-conflicts=('apmpkg-git-dev')
+conflicts=('apmpkg-git-dev' 'apmpkg-dev')
 source=("https://github.com/Kedap/${pkgname}/archive/refs/tags/${pkgver}.tar.gz")
 sha256sums=('56a1b7b21642556ace47850034c3af3394e7013174d7f18890eb86ebae239df4')
 
@@ -32,6 +32,6 @@ package() {
 	mkdir -p ${pkgdir}/etc/apmpkg/iiabc
 	cp -r src/iiabc/ ${pkgdir}/etc/apmpkg/
 	mkdir -p ${pkgdir}/etc/apmpkg/paquetes
-    install -Dm 644 "man/${pkgname}.1" -t ${pkgdir}/usr/share/man/man1
-    install -Dm 644 "man/${pkgname}-en.1" -t ${pkgdir}/usr/share/man/man1
+        install -Dm 644 "man/${pkgname}.1" -t ${pkgdir}/usr/share/man/man1
+        install -Dm 644 "man/${pkgname}-en.1" -t ${pkgdir}/usr/share/man/man1
 }